fix for issue 18, sprinkled more magic question marks around

nat.pryce · nat.pryce · commit 275d8289067d · 2007-07-30T15:21:14.000Z
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java
@@ -13,9 +13,9 @@
  * matcher returns <code>false</code>.
  */
 public class AllOf<T> extends BaseMatcher<T> {
-    private final Iterable<Matcher<? extends T>> matchers;
+    private final Iterable<? extends Matcher<? extends T>> matchers;
 
-    public AllOf(Iterable<Matcher<? extends T>> matchers) {
+    public AllOf(Iterable<? extends Matcher<? extends T>> matchers) {
         this.matchers = matchers;
     }
 
@@ -44,8 +44,7 @@ public static <T> Matcher<T> allOf(Matcher<? extends T>... matchers) {
      * Evaluates to true only if ALL of the passed in matchers evaluate to true.
      */
     @Factory
-    public static <T> Matcher<T> allOf(Iterable<Matcher<? extends T>> matchers) {
+    public static <T> Matcher<T> allOf(Iterable<? extends Matcher<? extends T>> matchers) {
         return new AllOf<T>(matchers);
     }
-
 }
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java
@@ -14,9 +14,9 @@
  */
 public class AnyOf<T> extends BaseMatcher<T> {
 
-    private final Iterable<Matcher<? extends T>> matchers;
+    private final Iterable<? extends Matcher<? extends T>> matchers;
 
-    public AnyOf(Iterable<Matcher<? extends T>> matchers) {
+    public AnyOf(Iterable<? extends Matcher<? extends T>> matchers) {
         this.matchers = matchers;
     }
 
@@ -45,7 +45,7 @@ public static <T> Matcher<T> anyOf(Matcher<? extends T>... matchers) {
      * Evaluates to true if ANY of the passed in matchers evaluate to true.
      */
     @Factory
-    public static <T> Matcher<T> anyOf(Iterable<Matcher<? extends T>> matchers) {
+    public static <T> Matcher<T> anyOf(Iterable<? extends Matcher<? extends T>> matchers) {
         return new AnyOf<T>(matchers);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@`
`13`	`13`	`* matcher returns <code>false</code>.`
`14`	`14`	`*/`
`15`	`15`	`public class AllOf<T> extends BaseMatcher<T> {`
`16`		`- private final Iterable<Matcher<? extends T>> matchers;`
	`16`	`+ private final Iterable<? extends Matcher<? extends T>> matchers;`
`17`	`17`
`18`		`- public AllOf(Iterable<Matcher<? extends T>> matchers) {`
	`18`	`+ public AllOf(Iterable<? extends Matcher<? extends T>> matchers) {`
`19`	`19`	`this.matchers = matchers;`
`20`	`20`	`}`
`21`	`21`
`@@ -44,8 +44,7 @@ public static <T> Matcher<T> allOf(Matcher<? extends T>... matchers) {`
`44`	`44`	`* Evaluates to true only if ALL of the passed in matchers evaluate to true.`
`45`	`45`	`*/`
`46`	`46`	`@Factory`
`47`		`- public static <T> Matcher<T> allOf(Iterable<Matcher<? extends T>> matchers) {`
	`47`	`+ public static <T> Matcher<T> allOf(Iterable<? extends Matcher<? extends T>> matchers) {`
`48`	`48`	`return new AllOf<T>(matchers);`
`49`	`49`	`}`
`50`		`-`
`51`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@`
`14`	`14`	`*/`
`15`	`15`	`public class AnyOf<T> extends BaseMatcher<T> {`
`16`	`16`
`17`		`- private final Iterable<Matcher<? extends T>> matchers;`
	`17`	`+ private final Iterable<? extends Matcher<? extends T>> matchers;`
`18`	`18`
`19`		`- public AnyOf(Iterable<Matcher<? extends T>> matchers) {`
	`19`	`+ public AnyOf(Iterable<? extends Matcher<? extends T>> matchers) {`
`20`	`20`	`this.matchers = matchers;`
`21`	`21`	`}`
`22`	`22`
`@@ -45,7 +45,7 @@ public static <T> Matcher<T> anyOf(Matcher<? extends T>... matchers) {`
`45`	`45`	`* Evaluates to true if ANY of the passed in matchers evaluate to true.`
`46`	`46`	`*/`
`47`	`47`	`@Factory`
`48`		`- public static <T> Matcher<T> anyOf(Iterable<Matcher<? extends T>> matchers) {`
	`48`	`+ public static <T> Matcher<T> anyOf(Iterable<? extends Matcher<? extends T>> matchers) {`
`49`	`49`	`return new AnyOf<T>(matchers);`
`50`	`50`	`}`
`51`	`51`	`}`