[gwt-contrib] [google-web-toolkit] r8715 committed - Rolled back r8701 due to test problems....

[codesite-noreply]

Revision: 8715
Author: to...@google.com
Date: Fri Sep  3 07:25:36 2010
Log: Rolled back r8701 due to test problems.
Was: Support adding code-gen/runtime related classes directly to the  
secondary JDT compilation for the GWT AST.

http://code.google.com/p/google-web-toolkit/source/detail?r=8715

Modified:
 /trunk/dev/core/src/com/google/gwt/dev/jdt/BasicWebModeCompiler.java
 /trunk/dev/core/src/com/google/gwt/dev/jdt/WebModeCompilerFrontEnd.java
 /trunk/dev/core/src/com/google/gwt/dev/jjs/UnifiedAst.java

=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/jdt/BasicWebModeCompiler.java	 
Thu Sep  2 07:29:17 2010
+++ /trunk/dev/core/src/com/google/gwt/dev/jdt/BasicWebModeCompiler.java	 
Fri Sep  3 07:25:36 2010
@@ -30,7 +30,6 @@
 import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;

 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -65,8 +64,8 @@
    * Build the initial set of compilation units.
    */
   public CompilationResults getCompilationUnitDeclarations(
-      TreeLogger logger, String[] seedTypeNames,
-      ICompilationUnit... additionalUnits) throws  
UnableToCompleteException {
+      TreeLogger logger, String[] seedTypeNames)
+      throws UnableToCompleteException {

     TypeOracle oracle = compilationState.getTypeOracle();
     Set<JClassType> intfTypes = oracle.getSingleJsoImplInterfaces();
@@ -81,9 +80,7 @@
     Set<CompilationUnit> alreadyAdded = new HashSet<CompilationUnit>();

     List<ICompilationUnit> icus = new ArrayList<ICompilationUnit>(
-        seedTypeNames.length + intfTypes.size() + additionalUnits.length);
-
-    Collections.addAll(icus, additionalUnits);
+        seedTypeNames.length + intfTypes.size());

     for (String seedTypeName : seedTypeNames) {
       CompilationUnit unit = getUnitForType(logger, classMapBySource,
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/jdt/WebModeCompilerFrontEnd.java	 
Thu Sep  2 07:29:17 2010
+++ /trunk/dev/core/src/com/google/gwt/dev/jdt/WebModeCompilerFrontEnd.java	 
Fri Sep  3 07:25:36 2010
@@ -27,7 +27,6 @@
 import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;

 import org.eclipse.jdt.internal.compiler.ast.CompilationUnitDeclaration;
-import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
 import org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
 import org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
 import org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
@@ -47,13 +46,12 @@

   public static CompilationResults getCompilationUnitDeclarations(
       TreeLogger logger, String[] seedTypeNames,
-      RebindPermutationOracle rebindPermOracle, TypeLinker linker,
-      ICompilationUnit... additionalUnits) throws  
UnableToCompleteException {
+      RebindPermutationOracle rebindPermOracle, TypeLinker linker)
+      throws UnableToCompleteException {
     Event getCompilationUnitsEvent =
         SpeedTracerLogger.start(CompilerEventType.GET_COMPILATION_UNITS);
     CompilationResults results = new  
WebModeCompilerFrontEnd(rebindPermOracle,
-        linker).getCompilationUnitDeclarations(logger, seedTypeNames,
-        additionalUnits);
+        linker).getCompilationUnitDeclarations(logger, seedTypeNames);
     getCompilationUnitsEvent.end();
     return results;
   }
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/jjs/UnifiedAst.java	Thu Sep  2  
07:29:17 2010
+++ /trunk/dev/core/src/com/google/gwt/dev/jjs/UnifiedAst.java	Fri Sep  3  
07:25:36 2010
@@ -54,7 +54,7 @@
       return jProgram;
     }

-    public JsProgram getJsProgram() {
+    JsProgram getJsProgram() {
       return jsProgram;
     }
   }

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors