commit a80259979f535e973382fa9a41bc2fda0a4553b7
author Ian Rogers <irogers@google.com> Tue May 03 17:12:29 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 17:12:29 2016 +0000
tree a83570202c27bef31f026c416070a87c8746893b
parent f31b2fcfcfba4a5c6d13a4a2147567c08c72b034
parent 0a780cb8b9de02975a556837a88de6ad1b9b19a0

Merge "Extra generic type information to aid certain javacs." am: 9a62c01586
am: 0a780cb8b9

* commit '0a780cb8b9de02975a556837a88de6ad1b9b19a0':
  Extra generic type information to aid certain javacs.

Change-Id: I088d7743f128e61fae7c0f7291a455b7146cd712

library/src/org/hamcrest/Matchers.java

diff --git a/library/src/org/hamcrest/Matchers.java b/library/src/org/hamcrest/Matchers.java
index b78864a..ce550b5 100644
--- a/library/src/org/hamcrest/Matchers.java
+++ b/library/src/org/hamcrest/Matchers.java
@@ -70,7 +70,7 @@
      * Evaluates to true only if ALL of the passed in matchers evaluate to true.
      */
     public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<? extends T>... matchers) {
-        return org.hamcrest.core.AllOf.allOf(matchers);
+        return org.hamcrest.core.AllOf.<T>allOf(matchers);
     }
 
     /**
@@ -84,7 +84,7 @@
      * Evaluates to true if ANY of the passed in matchers evaluate to true.
      */
     public static <T> org.hamcrest.Matcher<T> anyOf(org.hamcrest.Matcher<? extends T>... matchers) {
-        return org.hamcrest.core.AnyOf.anyOf(matchers);
+        return org.hamcrest.core.AnyOf.<T>anyOf(matchers);
     }
 
     /**
@@ -175,11 +175,11 @@
     }
 
     public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItem(org.hamcrest.Matcher<? extends T> elementMatcher) {
-        return org.hamcrest.collection.IsCollectionContaining.hasItem(elementMatcher);
+        return org.hamcrest.collection.IsCollectionContaining.<T>hasItem(elementMatcher);
     }
 
     public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(org.hamcrest.Matcher<? extends T>... elementMatchers) {
-        return org.hamcrest.collection.IsCollectionContaining.hasItems(elementMatchers);
+        return org.hamcrest.collection.IsCollectionContaining.<T>hasItems(elementMatchers);
     }
 
     public static <T> org.hamcrest.Matcher<java.lang.Iterable<T>> hasItems(T... elements) {

src/org/hamcrest/CoreMatchers.java

diff --git a/src/org/hamcrest/CoreMatchers.java b/src/org/hamcrest/CoreMatchers.java
index fac3acf..dd36acb 100644
--- a/src/org/hamcrest/CoreMatchers.java
+++ b/src/org/hamcrest/CoreMatchers.java
@@ -70,7 +70,7 @@
    * Evaluates to true only if ALL of the passed in matchers evaluate to true.
    */
   public static <T> org.hamcrest.Matcher<T> allOf(org.hamcrest.Matcher<? extends T>... matchers) {
-    return org.hamcrest.core.AllOf.allOf(matchers);
+    return org.hamcrest.core.AllOf.<T>allOf(matchers);
   }
 
   /**
@@ -84,7 +84,7 @@
    * Evaluates to true if ANY of the passed in matchers evaluate to true.
    */
   public static <T> org.hamcrest.Matcher<T> anyOf(org.hamcrest.Matcher<? extends T>... matchers) {
-    return org.hamcrest.core.AnyOf.anyOf(matchers);
+    return org.hamcrest.core.AnyOf.<T>anyOf(matchers);
   }
 
   /**