Narrowed templating on IsEqual. Added java 1.5 target to compilation.

smgfreeman · smgfreeman · commit c70825ccee72 · 2009-10-01T11:26:12.000Z
diff --git a/build.xml b/build.xml
@@ -227,7 +227,7 @@
         <attribute name="classpath" description="Anything additional to add on the classpath" default=""/>
         <sequential>
             <mkdir dir="build/temp/@{destjar}.contents"/>
-            <javac srcdir="@{srcdir}" destdir="build/temp/@{destjar}.contents" debug="${debug}">
+            <javac srcdir="@{srcdir}" destdir="build/temp/@{destjar}.contents" debug="${debug}" target="1.5">
                 <classpath>
                     <fileset dir="lib/integration">
                         <include name="*.jar"/>
diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/IsEqual.java b/hamcrest-core/src/main/java/org/hamcrest/core/IsEqual.java
@@ -41,7 +41,7 @@ private static boolean areEqual(Object o1, Object o2) {
 
     private static boolean areArraysEqual(Object o1, Object o2) {
         return areArrayLengthsEqual(o1, o2)
-                && areArrayElementsEqual(o1, o2);
+            && areArrayElementsEqual(o1, o2);
     }
 
     private static boolean areArrayLengthsEqual(Object o1, Object o2) {
@@ -64,7 +64,7 @@ private static boolean isArray(Object o) {
      * {@link java.lang.Object#equals} invokedMethod?
      */
     @Factory
-    public static <T> Matcher<? super T> equalTo(T operand) {
+    public static <T> Matcher<T> equalTo(T operand) {
         return new IsEqual<T>(operand);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private static boolean areEqual(Object o1, Object o2) {`
`41`	`41`
`42`	`42`	`private static boolean areArraysEqual(Object o1, Object o2) {`
`43`	`43`	`return areArrayLengthsEqual(o1, o2)`
`44`		`- && areArrayElementsEqual(o1, o2);`
	`44`	`+ && areArrayElementsEqual(o1, o2);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`private static boolean areArrayLengthsEqual(Object o1, Object o2) {`
`@@ -64,7 +64,7 @@ private static boolean isArray(Object o) {`
`64`	`64`	`* {@link java.lang.Object#equals} invokedMethod?`
`65`	`65`	`*/`
`66`	`66`	`@Factory`
`67`		`- public static <T> Matcher<? super T> equalTo(T operand) {`
	`67`	`+ public static <T> Matcher<T> equalTo(T operand) {`
`68`	`68`	`return new IsEqual<T>(operand);`
`69`	`69`	`}`
`70`	`70`	`}`