Moving StandardGeneratorContext out of hosted mode code; it's not hosted-mode specific. Review by: bobv git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5828 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/Precompile.java b/dev/core/src/com/google/gwt/dev/Precompile.java index 5c28b9e..23bf485 100644 --- a/dev/core/src/com/google/gwt/dev/Precompile.java +++ b/dev/core/src/com/google/gwt/dev/Precompile.java
@@ -28,6 +28,7 @@ import com.google.gwt.dev.cfg.StaticPropertyOracle; import com.google.gwt.dev.javac.CompilationState; import com.google.gwt.dev.javac.CompilationUnit; +import com.google.gwt.dev.javac.StandardGeneratorContext; import com.google.gwt.dev.jdt.RebindOracle; import com.google.gwt.dev.jdt.RebindPermutationOracle; import com.google.gwt.dev.jjs.JJSOptions; @@ -36,7 +37,6 @@ import com.google.gwt.dev.jjs.JsOutputOption; import com.google.gwt.dev.jjs.UnifiedAst; import com.google.gwt.dev.shell.CheckForUpdates; -import com.google.gwt.dev.shell.StandardGeneratorContext; import com.google.gwt.dev.shell.StandardRebindOracle; import com.google.gwt.dev.shell.CheckForUpdates.UpdateResult; import com.google.gwt.dev.util.Memory;
diff --git a/dev/core/src/com/google/gwt/dev/cfg/RuleGenerateWith.java b/dev/core/src/com/google/gwt/dev/cfg/RuleGenerateWith.java index 40b4527..c79e7ef 100644 --- a/dev/core/src/com/google/gwt/dev/cfg/RuleGenerateWith.java +++ b/dev/core/src/com/google/gwt/dev/cfg/RuleGenerateWith.java
@@ -19,7 +19,7 @@ import com.google.gwt.core.ext.GeneratorContext; import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.core.ext.UnableToCompleteException; -import com.google.gwt.dev.shell.StandardGeneratorContext; +import com.google.gwt.dev.javac.StandardGeneratorContext; /** * A rule to replace the type being rebound with a class whose name is
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationState.java b/dev/core/src/com/google/gwt/dev/javac/CompilationState.java index 684192e..5c025ad 100644 --- a/dev/core/src/com/google/gwt/dev/javac/CompilationState.java +++ b/dev/core/src/com/google/gwt/dev/javac/CompilationState.java
@@ -18,11 +18,11 @@ import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.core.ext.typeinfo.TypeOracle; import com.google.gwt.dev.javac.CompilationUnit.State; +import com.google.gwt.dev.javac.StandardGeneratorContext.Generated; import com.google.gwt.dev.javac.impl.SourceFileCompilationUnit; import com.google.gwt.dev.js.ast.JsProgram; import com.google.gwt.dev.resource.Resource; import com.google.gwt.dev.resource.ResourceOracle; -import com.google.gwt.dev.shell.StandardGeneratorContext.Generated; import com.google.gwt.dev.util.PerfLogger; import java.util.Collection;
diff --git a/dev/core/src/com/google/gwt/dev/shell/StandardGeneratorContext.java b/dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java similarity index 98% rename from dev/core/src/com/google/gwt/dev/shell/StandardGeneratorContext.java rename to dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java index d35fb2d..d5420f2 100644 --- a/dev/core/src/com/google/gwt/dev/shell/StandardGeneratorContext.java +++ b/dev/core/src/com/google/gwt/dev/javac/StandardGeneratorContext.java
@@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.google.gwt.dev.shell; +package com.google.gwt.dev.javac; import com.google.gwt.core.ext.Generator; import com.google.gwt.core.ext.GeneratorContext; @@ -27,8 +27,6 @@ import com.google.gwt.core.ext.typeinfo.JClassType; import com.google.gwt.core.ext.typeinfo.TypeOracle; import com.google.gwt.dev.cfg.ModuleDef; -import com.google.gwt.dev.javac.CompilationState; -import com.google.gwt.dev.javac.CompilationUnit; import com.google.gwt.dev.javac.impl.FileCompilationUnit; import com.google.gwt.dev.resource.ResourceOracle; import com.google.gwt.dev.util.DiskCache;
diff --git a/dev/core/src/com/google/gwt/dev/jdt/RebindPermutationOracle.java b/dev/core/src/com/google/gwt/dev/jdt/RebindPermutationOracle.java index c1c9baf..f2cd3ec 100644 --- a/dev/core/src/com/google/gwt/dev/jdt/RebindPermutationOracle.java +++ b/dev/core/src/com/google/gwt/dev/jdt/RebindPermutationOracle.java
@@ -17,7 +17,7 @@ import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.core.ext.UnableToCompleteException; -import com.google.gwt.dev.shell.StandardGeneratorContext; +import com.google.gwt.dev.javac.StandardGeneratorContext; /** * Abstract the process of determining all of the possible deferred binding
diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentLoaderCreator.java b/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentLoaderCreator.java index a71c4e5..adc86db 100644 --- a/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentLoaderCreator.java +++ b/dev/core/src/com/google/gwt/dev/jjs/impl/FragmentLoaderCreator.java
@@ -22,8 +22,8 @@ import com.google.gwt.dev.cfg.BindingProperty; import com.google.gwt.dev.cfg.ConfigurationProperty; import com.google.gwt.dev.cfg.StaticPropertyOracle; +import com.google.gwt.dev.javac.StandardGeneratorContext; import com.google.gwt.dev.jdt.FindDeferredBindingSitesVisitor; -import com.google.gwt.dev.shell.StandardGeneratorContext; import java.io.PrintWriter; import java.util.List;
diff --git a/dev/core/src/com/google/gwt/dev/shell/ShellModuleSpaceHost.java b/dev/core/src/com/google/gwt/dev/shell/ShellModuleSpaceHost.java index 04d6967..4f80175 100644 --- a/dev/core/src/com/google/gwt/dev/shell/ShellModuleSpaceHost.java +++ b/dev/core/src/com/google/gwt/dev/shell/ShellModuleSpaceHost.java
@@ -21,6 +21,7 @@ import com.google.gwt.core.ext.typeinfo.TypeOracle; import com.google.gwt.dev.cfg.ModuleDef; import com.google.gwt.dev.cfg.Rules; +import com.google.gwt.dev.javac.StandardGeneratorContext; import java.io.File;
diff --git a/dev/core/src/com/google/gwt/dev/shell/StandardRebindOracle.java b/dev/core/src/com/google/gwt/dev/shell/StandardRebindOracle.java index d466458..3a3d22f 100644 --- a/dev/core/src/com/google/gwt/dev/shell/StandardRebindOracle.java +++ b/dev/core/src/com/google/gwt/dev/shell/StandardRebindOracle.java
@@ -21,6 +21,7 @@ import com.google.gwt.core.ext.linker.ArtifactSet; import com.google.gwt.dev.cfg.Rule; import com.google.gwt.dev.cfg.Rules; +import com.google.gwt.dev.javac.StandardGeneratorContext; import com.google.gwt.dev.jdt.RebindOracle; import com.google.gwt.dev.util.Util;
diff --git a/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java b/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java index 716591a..dfd7071 100644 --- a/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java +++ b/dev/core/test/com/google/gwt/dev/javac/CompilationStateTest.java
@@ -17,12 +17,12 @@ import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.dev.javac.CompilationUnit.State; +import com.google.gwt.dev.javac.StandardGeneratorContext.Generated; import com.google.gwt.dev.javac.impl.JavaResourceBase; import com.google.gwt.dev.javac.impl.MockJavaResource; import com.google.gwt.dev.javac.impl.MockResourceOracle; import com.google.gwt.dev.javac.impl.SourceFileCompilationUnit; import com.google.gwt.dev.resource.Resource; -import com.google.gwt.dev.shell.StandardGeneratorContext.Generated; import com.google.gwt.dev.util.Util; import com.google.gwt.dev.util.log.AbstractTreeLogger; import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
diff --git a/dev/core/test/com/google/gwt/dev/shell/StandardGeneratorContextTest.java b/dev/core/test/com/google/gwt/dev/shell/StandardGeneratorContextTest.java index d160776..5ec9238 100644 --- a/dev/core/test/com/google/gwt/dev/shell/StandardGeneratorContextTest.java +++ b/dev/core/test/com/google/gwt/dev/shell/StandardGeneratorContextTest.java
@@ -28,6 +28,7 @@ import com.google.gwt.core.ext.linker.GeneratedResource; import com.google.gwt.dev.cfg.ModuleDef; import com.google.gwt.dev.javac.CompilationState; +import com.google.gwt.dev.javac.StandardGeneratorContext; import com.google.gwt.dev.javac.impl.MockResourceOracle; import com.google.gwt.dev.resource.Resource; import com.google.gwt.dev.util.Util;