Genericized a number of raw types and cleaned up unused imports

neildunn · neildunn · commit 9909d68059d0 · 2007-08-01T10:00:41.000Z
diff --git a/hamcrest-library/src/main/java/org/hamcrest/TypeSafeMatcher.java b/hamcrest-library/src/main/java/org/hamcrest/TypeSafeMatcher.java
@@ -10,7 +10,7 @@
  */
 public abstract class TypeSafeMatcher<T> extends BaseMatcher<T> {
 
-    private Class expectedType;
+    private Class<?> expectedType;
 
     /**
      * Subclasses should implement this. The item will already have been checked for
diff --git a/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java b/hamcrest-library/src/main/java/org/hamcrest/collection/IsMapContaining.java
@@ -4,7 +4,6 @@
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
-import org.hamcrest.core.IsAnything;
 
 import static org.hamcrest.core.IsEqual.equalTo;
 
diff --git a/hamcrest-library/src/main/java/org/hamcrest/object/IsEventFrom.java b/hamcrest-library/src/main/java/org/hamcrest/object/IsEventFrom.java
@@ -14,10 +14,10 @@
  * Tests if the value is an event announced by a specific object.
  */
 public class IsEventFrom extends TypeSafeMatcher<EventObject> {
-    private final Class eventClass;
+    private final Class<?> eventClass;
     private final Object source;
 
-    public IsEventFrom(Class eventClass, Object source) {
+    public IsEventFrom(Class<?> eventClass, Object source) {
         this.eventClass = eventClass;
         this.source = source;
     }
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/core/AnyOfTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/core/AnyOfTest.java
@@ -7,7 +7,6 @@
 import org.hamcrest.introspection.Combination;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.AllOf.allOf;
 import static org.hamcrest.core.AnyOf.anyOf;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.IsNot.not;
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/core/IsNullTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/core/IsNullTest.java
@@ -8,8 +8,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsNull.nullValue;
 import static org.hamcrest.core.IsNull.notNullValue;
-import static org.hamcrest.core.IsNull.*;
-import static org.hamcrest.core.IsAnything.any;
+
 
 public class IsNullTest extends AbstractMatcherTest {
 
diff --git a/hamcrest-unit-test/src/main/java/org/hamcrest/object/HasToStringTest.java b/hamcrest-unit-test/src/main/java/org/hamcrest/object/HasToStringTest.java
@@ -29,12 +29,12 @@ public void testPassesResultOfToStringToNestedMatcher() {
 
     public void testHasReadableDescription() {
         Matcher<String> toStringMatcher = equalTo(TO_STRING_RESULT);
-        Matcher matcher = hasToString(toStringMatcher);
+        Matcher<Matcher<String>> matcher = hasToString(toStringMatcher);
 
         assertEquals("asString(" + descriptionOf(toStringMatcher) + ")", descriptionOf(matcher));
     }
 
-    private String descriptionOf(Matcher matcher) {
+    private String descriptionOf(Matcher<?> matcher) {
     	return StringDescription.asString(matcher);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ public void testPassesResultOfToStringToNestedMatcher() {`
`29`	`29`
`30`	`30`	`public void testHasReadableDescription() {`
`31`	`31`	`Matcher<String> toStringMatcher = equalTo(TO_STRING_RESULT);`
`32`		`- Matcher matcher = hasToString(toStringMatcher);`
	`32`	`+ Matcher<Matcher<String>> matcher = hasToString(toStringMatcher);`
`33`	`33`
`34`	`34`	`assertEquals("asString(" + descriptionOf(toStringMatcher) + ")", descriptionOf(matcher));`
`35`	`35`	`}`
`36`	`36`
`37`		`- private String descriptionOf(Matcher matcher) {`
	`37`	`+ private String descriptionOf(Matcher<?> matcher) {`
`38`	`38`	`return StringDescription.asString(matcher);`
`39`	`39`	`}`
`40`	`40`	`}`