removing some ? super generic bounds on return types

nat.pryce · nat.pryce · commit adeff7508374 · 2010-10-06T22:13:15.000Z
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsNot.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsNot.java
@@ -2,13 +2,13 @@
  */
 package org.hamcrest.core;
 
-import static org.hamcrest.core.IsEqual.equalTo;
-
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 
+import static org.hamcrest.core.IsEqual.equalTo;
+
 
 /**
  * Calculates the logical negation of a matcher.
@@ -44,7 +44,7 @@ public static <T> Matcher<T> not(Matcher<T> matcher) {
      *          vs.  assertThat(cheese, is(not(smelly)))
      */
     @Factory
-    public static <T> Matcher<? super T> not(T value) {
+    public static <T> Matcher<T> not(T value) {
         return not(equalTo(value));
     }
 }
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsCollectionWithSize.java
@@ -1,13 +1,13 @@
 package org.hamcrest.collection;
 
-import static org.hamcrest.core.IsEqual.equalTo;
-
-import java.util.Collection;
-
 import org.hamcrest.Factory;
 import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
 
+import java.util.Collection;
+
+import static org.hamcrest.core.IsEqual.equalTo;
+
 /**
  * Matches if collection size satisfies a nested matcher.
  */
@@ -25,7 +25,7 @@ protected Integer featureValueOf(Collection<? extends E> actual) {
      * Does collection size satisfy a given matcher?
      */
     @Factory
-    public static <E> Matcher<? super Collection<? extends E>> hasSize(Matcher<? super Integer> size) {
+    public static <E> Matcher<Collection<? extends E>> hasSize(Matcher<? super Integer> size) {
         return new IsCollectionWithSize<E>(size);
     }
 
@@ -37,7 +37,7 @@ public static <E> Matcher<? super Collection<? extends E>> hasSize(Matcher<? sup
      *          vs.  assertThat(hasSize(x))
      */
     @Factory
-    public static <E> Matcher<? super Collection<? extends E>> hasSize(int size) {
+    public static <E> Matcher<Collection<? extends E>> hasSize(int size) {
         Matcher<? super Integer> matcher = equalTo(size);
         return IsCollectionWithSize.<E>hasSize(matcher);
     }
diff --git a/hamcrest-unit-test/src/main/hamcrest-unit-tests.iml b/hamcrest-unit-test/src/main/hamcrest-unit-tests.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="hamcrest-generator" />
     <orderEntry type="module" module-name="hamcrest-integration" />
     <orderEntry type="library" name="integration" level="project" />
+    <orderEntry type="library" scope="TEST" name="ant-output" level="project" />
   </component>
 </module>
 
