# HG changeset patch # User Doug Simon # Date 1386192678 -3600 # Node ID ff43107fd697a44d2c61e6a950f9aaea4642749a # Parent f89188646695e1185bf1a0b70364f07aca971283 addressed compilation issue in Eclipse with JDT BETA_JAVA8 diff -r f89188646695 -r ff43107fd697 graal/com.oracle.graal.api.meta.jdk8.test/src/com/oracle/graal/api/meta/jdk8/test/TestResolvedJavaMethodJDK8.java --- a/graal/com.oracle.graal.api.meta.jdk8.test/src/com/oracle/graal/api/meta/jdk8/test/TestResolvedJavaMethodJDK8.java Wed Dec 04 17:11:33 2013 +0100 +++ b/graal/com.oracle.graal.api.meta.jdk8.test/src/com/oracle/graal/api/meta/jdk8/test/TestResolvedJavaMethodJDK8.java Wed Dec 04 22:31:18 2013 +0100 @@ -46,7 +46,7 @@ ResolvedJavaMethod m = e.getValue(); assertEquals(e.getKey().isDefault(), m.isDefault()); } - for (Map.Entry e : constructors.entrySet()) { + for (Map.Entry, ResolvedJavaMethod> e : constructors.entrySet()) { ResolvedJavaMethod m = e.getValue(); assertFalse(m.isDefault()); } diff -r f89188646695 -r ff43107fd697 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/MethodUniverse.java --- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/MethodUniverse.java Wed Dec 04 17:11:33 2013 +0100 +++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/MethodUniverse.java Wed Dec 04 22:31:18 2013 +0100 @@ -33,7 +33,7 @@ public class MethodUniverse extends TypeUniverse { public final Map methods = new HashMap<>(); - public final Map constructors = new HashMap<>(); + public final Map, ResolvedJavaMethod> constructors = new HashMap<>(); public MethodUniverse() { for (Class c : classes) { diff -r f89188646695 -r ff43107fd697 graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaMethod.java --- a/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaMethod.java Wed Dec 04 17:11:33 2013 +0100 +++ b/graal/com.oracle.graal.api.meta.test/src/com/oracle/graal/api/meta/test/TestResolvedJavaMethod.java Wed Dec 04 22:31:18 2013 +0100 @@ -113,7 +113,7 @@ ResolvedJavaMethod m = e.getValue(); assertFalse(m.isClassInitializer()); } - for (Map.Entry e : constructors.entrySet()) { + for (Map.Entry, ResolvedJavaMethod> e : constructors.entrySet()) { ResolvedJavaMethod m = e.getValue(); assertFalse(m.isClassInitializer()); } @@ -125,7 +125,7 @@ ResolvedJavaMethod m = e.getValue(); assertFalse(m.isConstructor()); } - for (Map.Entry e : constructors.entrySet()) { + for (Map.Entry, ResolvedJavaMethod> e : constructors.entrySet()) { ResolvedJavaMethod m = e.getValue(); assertTrue(m.isConstructor()); } @@ -137,7 +137,7 @@ ResolvedJavaMethod m = e.getValue(); assertEquals(e.getKey().isSynthetic(), m.isSynthetic()); } - for (Map.Entry e : constructors.entrySet()) { + for (Map.Entry, ResolvedJavaMethod> e : constructors.entrySet()) { ResolvedJavaMethod m = e.getValue(); assertEquals(e.getKey().isSynthetic(), m.isSynthetic()); } @@ -149,7 +149,7 @@ ResolvedJavaMethod m = e.getValue(); assertEquals(m.canBeStaticallyBound(), canBeStaticallyBound(e.getKey().getModifiers())); } - for (Map.Entry e : constructors.entrySet()) { + for (Map.Entry, ResolvedJavaMethod> e : constructors.entrySet()) { ResolvedJavaMethod m = e.getValue(); assertEquals(m.canBeStaticallyBound(), canBeStaticallyBound(e.getKey().getModifiers())); }