[gwt-contrib] [google-web-toolkit] r10410 committed - Use CompilationUnitBuilder.create factory method. Remove unneeded...

[codesite-noreply]

Revision: 10410
Author:   zun...@google.com
Date:     Tue Jun 28 01:02:19 2011
Log:      Use CompilationUnitBuilder.create factory method.  Remove unneeded
constructor and make single arg constructor private in
ResourceCompilationUnitBuilder and GeneratedCompilationUnitBuilder.
Patch by: stephen.haberman
Review by: zundel
Review at: http://gwt-code-reviews.appspot.com/1465801/

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

Modified:
 /trunk/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
 /trunk/dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java
 /trunk/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java

=======================================
---  
/trunk/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java	 
Thu Jun 23 16:28:29 2011
+++  
/trunk/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java	 
Tue Jun 28 01:02:19 2011
@@ -16,8 +16,6 @@
 package com.google.gwt.dev.javac;

 import com.google.gwt.core.ext.TreeLogger;
-import  
com.google.gwt.dev.javac.CompilationUnitBuilder.GeneratedCompilationUnitBuilder;
-import  
com.google.gwt.dev.javac.CompilationUnitBuilder.ResourceCompilationUnitBuilder;
 import com.google.gwt.dev.javac.JdtCompiler.AdditionalTypeProviderDelegate;
 import com.google.gwt.dev.javac.JdtCompiler.UnitProcessor;
 import com.google.gwt.dev.jjs.CorrelationFactory.DummyCorrelationFactory;
@@ -411,10 +409,8 @@

     // For each incoming Java source file...
     for (Resource resource : resources) {
-      String typeName = Shared.toTypeName(resource.getPath());
       // Create a builder for all incoming units.
-      ResourceCompilationUnitBuilder builder =
-          new ResourceCompilationUnitBuilder(typeName, resource);
+      CompilationUnitBuilder builder =  
CompilationUnitBuilder.create(resource);

       CompilationUnit cachedUnit = unitCache.find(resource.getPathPrefix()  
+ resource.getPath());

@@ -474,13 +470,10 @@
     // For each incoming generated Java source file...
     for (GeneratedUnit generatedUnit : generatedUnits) {
       // Create a builder for all incoming units.
-      GeneratedCompilationUnitBuilder builder = new  
GeneratedCompilationUnitBuilder(generatedUnit);
-      // Try to get an existing unit from the cache.
-      ContentId contentId =
-          new ContentId(generatedUnit.getTypeName(),  
generatedUnit.getStrongHash());
+      CompilationUnitBuilder builder =  
CompilationUnitBuilder.create(generatedUnit);

       // Look for units previously compiled
-      CompilationUnit cachedUnit = unitCache.find(contentId);
+      CompilationUnit cachedUnit = unitCache.find(builder.getContentId());
       if (cachedUnit != null) {
         cachedUnits.put(builder, cachedUnit);
         compileMoreLater.addValidUnit(cachedUnit);
=======================================
---  
/trunk/dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java	 
Mon Jun 27 09:39:39 2011
+++  
/trunk/dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java	 
Tue Jun 28 01:02:19 2011
@@ -35,7 +35,7 @@
   static class GeneratedCompilationUnitBuilder extends  
CompilationUnitBuilder {
     private final GeneratedUnit generatedUnit;

-    public GeneratedCompilationUnitBuilder(GeneratedUnit generatedUnit) {
+    private GeneratedCompilationUnitBuilder(GeneratedUnit generatedUnit) {
       this.generatedUnit = generatedUnit;
     }

@@ -86,14 +86,9 @@

     private final String typeName;

-    public ResourceCompilationUnitBuilder(Resource resource) {
-      this(Shared.toTypeName(resource.getPath()), resource);
-    }
-
-    public ResourceCompilationUnitBuilder(String typeName, Resource  
resource) {
+    private ResourceCompilationUnitBuilder(Resource resource) {
+      this.typeName = Shared.toTypeName(resource.getPath());
       this.resource = resource;
-      this.typeName = typeName;
-      assert typeName.equals(Shared.toTypeName(resource.getPath()));
     }

     @Override
=======================================
--- /trunk/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java	Thu  
Apr 21 07:48:58 2011
+++ /trunk/dev/core/test/com/google/gwt/dev/javac/JdtCompilerTest.java	Tue  
Jun 28 01:02:19 2011
@@ -72,7 +72,7 @@
   private void addAll(Collection<CompilationUnitBuilder> units,
       Resource... sourceFiles) {
     for (Resource sourceFile : sourceFiles) {
-      units.add(new ResourceCompilationUnitBuilder(sourceFile));
+      units.add(CompilationUnitBuilder.create(sourceFile));
     }
   }
 }

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