Fixing the build process for Java8

testdata/src/main/java/issue34/InnerEnum.java

@@ -13,10 +13,17 @@ public class InnerEnum {
 	@SuppressWarnings("unused")
 	public static void main(String[] args) {
 		System.out.println("Hello World!");
-		Map<String, String> map = new TreeMap<String, String>(sorters.string);
+		Object o = sorters.string;
+//		Map<String, String> map = new TreeMap<String, String>(sorters.string);
+	}
+	
+	// May be able to switch back to using Comparator (and the TreeMap line above) once AspectJ 1.8.0 is out
+	interface MyComparator<T> {
+		int compare(T a,T b);
+		boolean equals(Object o);
 	}
 
-	private static enum sorters implements Comparator<String> {
+	private static enum sorters implements MyComparator<String> {
 		string {
 			private static final long serialVersionUID = 1L;
 
@@ -24,6 +31,7 @@ public class InnerEnum {
 			public int compare(String o1, String o2) {
 				return o1.compareTo(o2);
 			}
+			
 		}
 	}
 }

testdata/src/main/java/reflection/generics/GenericClass002.java

@@ -6,7 +6,7 @@ public class GenericClass002<K extends Comparable<K>> implements GenericInterfac
 	
 	//what we need in this v002 class...
 
-	// Same as in original class, but also with methods added (fore these cases)
+	// Same as in original class, but also with methods added (for these cases)
 
 	public Iterator<K> iterator() {
 		return null;