Rebase java 8 onto gwt 2.6.0

WeTheInternet · Feb 18, 2014 · 23af92c · 23af92c
1 parent 48dcff7
commit 23af92c
Show file tree

Hide file tree

Showing 38 changed files with 352 additions and 248 deletions.
diff --git a/common.ant.xml b/common.ant.xml
@@ -55,8 +55,8 @@
   <property name="javac.debug" value="true" />
   <property name="javac.debuglevel" value="lines,vars,source" />
   <property name="javac.encoding" value="utf-8" />
-  <property name="javac.source" value="1.6" />
-  <property name="javac.target" value="1.6" />
+  <property name="javac.source" value="1.8" />
+  <property name="javac.target" value="1.8" />
   <property name="javac.nowarn" value="true" />
   <property name="junit.out" location="${project.build}/test" />
   <property name="emma.dir" value="${gwt.tools.redist}/emma" />

diff --git a/dev/build.xml b/dev/build.xml
@@ -56,8 +56,8 @@
         <fileset dir="${gwt.tools.lib}">
           <include name="apache/tapestry-util-text-4.0.2.jar" />
           <include name="apache/ant-1.6.5.jar" />
-          <include name="eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar" />
-          <include name="eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar" />
+          <include name="eclipse/org.eclipse.jdt.core-3.9.1-SNAPSHOT.jar" />
+          <include name="eclipse/jdtCompilerAdapter-3.9.1-SNAPSHOT.jar" />
           <include name="guava/guava-15.0/guava-15.0-rebased.jar" />
           <include name="icu4j/50.1.1/icu4j.jar" />
           <include name="jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar" />
@@ -107,8 +107,8 @@
         <gwt.jar destfile="${alldeps.jar}">
           <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" />
           <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
-          <zipfileset src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar" />
-          <zipfileset src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar" />
+          <zipfileset src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core-3.9.1-SNAPSHOT.jar" />
+          <zipfileset src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.9.1-SNAPSHOT.jar" />
           <zipfileset src="${gwt.tools.lib}/guava/guava-15.0/guava-15.0-rebased.jar" />
           <zipfileset src="${gwt.tools.lib}/icu4j/50.1.1/icu4j.jar" />
           <zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar" />
@@ -185,8 +185,8 @@
       <classpath>
           <pathelement location="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
           <pathelement location="${gwt.tools.lib}/apache/commons/commons-collections-3.2.1.jar" />
-          <pathelement location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.8.3.v20130121-145325.jar" />
-          <pathelement location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.8.3.v20130121-145325.jar" />
+          <pathelement location="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core-3.9.1-SNAPSHOT.jar" />
+          <pathelement location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-3.9.1-SNAPSHOT.jar" />
           <pathelement location="${gwt.tools.lib}/guava/guava-15.0/guava-15.0-rebased.jar" />
           <pathelement location="${gwt.tools.lib}/jscomp/20131014/compiler-rebased.jar" />
           <pathelement location="${gwt.tools.lib}/jscomp/20131014/sourcemap-rebased.jar" />

diff --git a/dev/core/src/com/google/gwt/dev/cfg/DynamicPropertyOracle.java b/dev/core/src/com/google/gwt/dev/cfg/DynamicPropertyOracle.java
@@ -43,7 +43,7 @@ public class DynamicPropertyOracle implements PropertyOracle {
   private static SelectionProperty createSelectionProperty(
       String value, BindingProperty bindingProperty) {
     SortedSet<String> possibleValues =
-        Sets.newTreeSet(Arrays.asList(bindingProperty.getDefinedValues()));
+        Sets.<String>newTreeSet(Arrays.asList(bindingProperty.getDefinedValues()));
     return new DefaultSelectionProperty(value, bindingProperty.getFallback(),
         bindingProperty.getName(), possibleValues, bindingProperty.getFallbackValuesMap());
   }

diff --git a/dev/core/src/com/google/gwt/dev/cfg/PropertyProviderRegistratorGenerator.java b/dev/core/src/com/google/gwt/dev/cfg/PropertyProviderRegistratorGenerator.java
@@ -205,7 +205,7 @@ private String generateValue(TreeLogger logger, BindingProperty bindingProperty)
 
     try {
       return propertyProviderGenerator.generate(logger,
-          Sets.newTreeSet(Arrays.asList(bindingProperty.getDefinedValues())),
+          Sets.<String>newTreeSet(Arrays.asList(bindingProperty.getDefinedValues())),
           bindingProperty.getFallback(), configurationProperties);
 
     } catch (UnableToCompleteException e) {

diff --git a/dev/core/src/com/google/gwt/dev/javac/BytecodeSignatureMaker.java b/dev/core/src/com/google/gwt/dev/javac/BytecodeSignatureMaker.java
@@ -15,19 +15,18 @@
  */
 package com.google.gwt.dev.javac;
 
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.Attribute;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import com.google.gwt.dev.util.Util;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.google.gwt.dev.asm.AnnotationVisitor;
+import com.google.gwt.dev.asm.Attribute;
+import com.google.gwt.dev.asm.ClassReader;
+import com.google.gwt.dev.asm.ClassVisitor;
+import com.google.gwt.dev.asm.FieldVisitor;
+import com.google.gwt.dev.asm.Opcodes;
+import com.google.gwt.dev.util.Util;
+
 /**
  * Creates string hashes for various purposes from walking bytecode.
  */
@@ -130,7 +129,7 @@ public void visitInnerClass(String name, String outerName, String innerName, int
       // ignored
     }
 
-    public MethodVisitor visitMethod(int access, String name, String desc, String signature,
+    public com.google.gwt.dev.asm.MethodVisitor visitMethod(int access, String name, String desc, String signature,
         String[] exceptions) {
       // We don't care about synthetic methods
       if ((access & (Opcodes.ACC_SYNTHETIC)) == 0) {

diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java b/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java
@@ -15,19 +15,6 @@
  */
 package com.google.gwt.dev.javac;
 
-import com.google.gwt.core.ext.TreeLogger;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import com.google.gwt.dev.javac.asmbridge.EmptyVisitor;
-import com.google.gwt.dev.jjs.ast.JDeclaredType;
-import com.google.gwt.dev.jjs.ast.JProgram;
-import com.google.gwt.dev.util.DiskCache;
-import com.google.gwt.dev.util.Util;
-import com.google.gwt.dev.util.collect.HashMap;
-
-import org.eclipse.jdt.core.compiler.CategorizedProblem;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -42,6 +29,19 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import org.eclipse.jdt.core.compiler.CategorizedProblem;
+
+import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.dev.asm.ClassReader;
+import com.google.gwt.dev.asm.MethodVisitor;
+import com.google.gwt.dev.asm.Opcodes;
+import com.google.gwt.dev.javac.asmbridge.EmptyVisitor;
+import com.google.gwt.dev.jjs.ast.JDeclaredType;
+import com.google.gwt.dev.jjs.ast.JProgram;
+import com.google.gwt.dev.util.DiskCache;
+import com.google.gwt.dev.util.Util;
+import com.google.gwt.dev.util.collect.HashMap;
+
 /**
  * Encapsulates the state of a single active compilation unit in a particular
  * module. State is accumulated throughout the life cycle of the containing

diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitTypeOracleUpdater.java b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitTypeOracleUpdater.java
@@ -15,15 +15,29 @@
  */
 package com.google.gwt.dev.javac;
 
+import java.io.PrintWriter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Array;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.typeinfo.JPrimitiveType;
 import com.google.gwt.core.ext.typeinfo.JType;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.signature.SignatureReader;
-import org.objectweb.asm.util.TraceClassVisitor;
+import com.google.gwt.dev.asm.ClassReader;
+import com.google.gwt.dev.asm.ClassVisitor;
+import com.google.gwt.dev.asm.Opcodes;
+import com.google.gwt.dev.asm.Type;
+import com.google.gwt.dev.asm.signature.SignatureReader;
+import com.google.gwt.dev.asm.util.TraceClassVisitor;
 import com.google.gwt.dev.javac.asm.CollectAnnotationData;
 import com.google.gwt.dev.javac.asm.CollectAnnotationData.AnnotationData;
 import com.google.gwt.dev.javac.asm.CollectClassData;
@@ -54,20 +68,6 @@
 import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
 import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
 
-import java.io.PrintWriter;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Builds or rebuilds a {@link com.google.gwt.core.ext.typeinfo.TypeOracle} from
  * a set of compilation units.

diff --git a/dev/core/src/com/google/gwt/dev/javac/asm/CollectAnnotationData.java b/dev/core/src/com/google/gwt/dev/javac/asm/CollectAnnotationData.java
@@ -15,16 +15,16 @@
  */
 package com.google.gwt.dev.javac.asm;
 
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.Opcodes;
-import com.google.gwt.dev.javac.asm.CollectClassData.AnnotationEnum;
-import com.google.gwt.dev.util.StringInterner;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.google.gwt.dev.asm.AnnotationVisitor;
+import com.google.gwt.dev.asm.Opcodes;
+import com.google.gwt.dev.javac.asm.CollectClassData.AnnotationEnum;
+import com.google.gwt.dev.util.StringInterner;
+
 /**
  * Collects data from (possibly nested) annotations on a single entity.
  */

diff --git a/dev/core/src/com/google/gwt/dev/javac/asm/CollectClassData.java b/dev/core/src/com/google/gwt/dev/javac/asm/CollectClassData.java
@@ -15,17 +15,17 @@
  */
 package com.google.gwt.dev.javac.asm;
 
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gwt.dev.asm.AnnotationVisitor;
+import com.google.gwt.dev.asm.FieldVisitor;
+import com.google.gwt.dev.asm.MethodVisitor;
+import com.google.gwt.dev.asm.Opcodes;
 import com.google.gwt.dev.javac.asmbridge.EmptyVisitor;
 import com.google.gwt.dev.util.Name;
 import com.google.gwt.dev.util.StringInterner;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Reads the bytecode for a class and collects data needed for building
  * TypeOracle structures.

diff --git a/dev/core/src/com/google/gwt/dev/javac/asm/CollectFieldData.java b/dev/core/src/com/google/gwt/dev/javac/asm/CollectFieldData.java
@@ -15,13 +15,13 @@
  */
 package com.google.gwt.dev.javac.asm;
 
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.Opcodes;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import com.google.gwt.dev.asm.AnnotationVisitor;
+import com.google.gwt.dev.asm.FieldVisitor;
+import com.google.gwt.dev.asm.Opcodes;
+
 /**
  * Collect data from a single field.
  */

diff --git a/dev/core/src/com/google/gwt/dev/javac/asm/CollectMethodData.java b/dev/core/src/com/google/gwt/dev/javac/asm/CollectMethodData.java
@@ -15,15 +15,15 @@
  */
 package com.google.gwt.dev.javac.asm;
 
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import com.google.gwt.dev.asm.AnnotationVisitor;
+import com.google.gwt.dev.asm.Label;
+import com.google.gwt.dev.asm.MethodVisitor;
+import com.google.gwt.dev.asm.Opcodes;
+import com.google.gwt.dev.asm.Type;
+
 /**
  * Collects data from a single method.
  */

diff --git a/dev/core/src/com/google/gwt/dev/javac/asm/CollectReferencesVisitor.java b/dev/core/src/com/google/gwt/dev/javac/asm/CollectReferencesVisitor.java
@@ -15,18 +15,18 @@
  */
 package com.google.gwt.dev.javac.asm;
 
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import com.google.gwt.dev.javac.asmbridge.EmptyVisitor;
-import org.objectweb.asm.signature.SignatureReader;
-import org.objectweb.asm.signature.SignatureVisitor;
-
 import java.util.HashSet;
 import java.util.Set;
 
+import com.google.gwt.dev.asm.AnnotationVisitor;
+import com.google.gwt.dev.asm.FieldVisitor;
+import com.google.gwt.dev.asm.MethodVisitor;
+import com.google.gwt.dev.asm.Opcodes;
+import com.google.gwt.dev.asm.Type;
+import com.google.gwt.dev.asm.signature.SignatureReader;
+import com.google.gwt.dev.asm.signature.SignatureVisitor;
+import com.google.gwt.dev.javac.asmbridge.EmptyVisitor;
+
 /**
  * Collect all the types which are referenced by a particular class.
  */

diff --git a/dev/core/src/com/google/gwt/dev/javac/asm/EmptySignatureVisitor.java b/dev/core/src/com/google/gwt/dev/javac/asm/EmptySignatureVisitor.java
@@ -15,8 +15,8 @@
  */
 package com.google.gwt.dev.javac.asm;
 
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.signature.SignatureVisitor;
+import com.google.gwt.dev.asm.Opcodes;
+import com.google.gwt.dev.asm.signature.SignatureVisitor;
 
 /**
  * Signature visitor that does nothing.

diff --git a/dev/core/src/com/google/gwt/dev/javac/asm/ResolveClassSignature.java b/dev/core/src/com/google/gwt/dev/javac/asm/ResolveClassSignature.java
@@ -15,19 +15,19 @@
  */
 package com.google.gwt.dev.javac.asm;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.typeinfo.JType;
-import org.objectweb.asm.signature.SignatureVisitor;
+import com.google.gwt.dev.asm.signature.SignatureVisitor;
 import com.google.gwt.dev.javac.Resolver;
 import com.google.gwt.dev.javac.TypeParameterLookup;
 import com.google.gwt.dev.javac.typemodel.JClassType;
 import com.google.gwt.dev.javac.typemodel.JRealClassType;
 import com.google.gwt.dev.javac.typemodel.JTypeParameter;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Signature visitor that resolves all the type variables and their bounds for a
  * given class.

diff --git a/dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java b/dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java
@@ -15,23 +15,23 @@
  */
 package com.google.gwt.dev.javac.asm;
 
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.typeinfo.JType;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.signature.SignatureVisitor;
+import com.google.gwt.dev.asm.Type;
+import com.google.gwt.dev.asm.signature.SignatureVisitor;
 import com.google.gwt.dev.javac.MethodArgNamesLookup;
 import com.google.gwt.dev.javac.Resolver;
 import com.google.gwt.dev.javac.TypeParameterLookup;
 import com.google.gwt.dev.javac.typemodel.JAbstractMethod;
 import com.google.gwt.dev.javac.typemodel.JClassType;
 import com.google.gwt.dev.javac.typemodel.JTypeParameter;
 
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Resolve a method given its generic signature, including return type,
  * parameter types, and exceptions thrown.