[gwt-contrib] Use CompilationUnitBuilder.create factory method. (issue1465801)

Fri, 17 Jun 2011 10:08:47 -0700 

Reviewers: zundel,


http://gwt-code-reviews.appspot.com/1465801/diff/1/dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java
File dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java
(left):

http://gwt-code-reviews.appspot.com/1465801/diff/1/dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java#oldcode96
dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java:96:
assert typeName.equals(Shared.toTypeName(resource.getPath()));
This constructor was only used once, and the typeName parameter was
calculated the same way as in the 1-arg constructor, so it seemed like a
safe simplification to remove this 2-arg cstr and not have the caller
create an unneeded typeName local variable.

Description:
Use CompilationUnitBuilder.create factory method.

Please review this at http://gwt-code-reviews.appspot.com/1465801/

Affected files:
  M dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
  M dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java


Index: dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java b/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java index 02da55194d8ccba411066862f12e24a38271d204..36d073fac5844e004800e65244ee29d569ec28ac 100644 
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
@@ -17,7 +17,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 +410,8 @@ public class CompilationStateBuilder {

     // 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()); 

Index: dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java index 48986cd1efe34d68ed81b346c2b990e95e096276..6983c8b429ede775996714565118ffaf788d6898 100644 
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationUnitBuilder.java
@@ -87,13 +87,8 @@ public abstract class CompilationUnitBuilder {
     private final String typeName;

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

     @Override


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

Reply via email to