Moves RuntimeRebind classes out of the public interface.
Change-Id: If3cab423489172ce491bfff278519f214016380c
diff --git a/dev/core/src/com/google/gwt/dev/cfg/RuntimeRebindRegistratorGenerator.java b/dev/core/src/com/google/gwt/dev/cfg/RuntimeRebindRegistratorGenerator.java
index c13f4c4..4ba034d 100644
--- a/dev/core/src/com/google/gwt/dev/cfg/RuntimeRebindRegistratorGenerator.java
+++ b/dev/core/src/com/google/gwt/dev/cfg/RuntimeRebindRegistratorGenerator.java
@@ -31,7 +31,7 @@
*/
public class RuntimeRebindRegistratorGenerator extends Generator {
- private static final String PACKAGE_PATH = "com.google.gwt.core.client";
+ private static final String PACKAGE_PATH = "com.google.gwt.lang";
/**
* The extension for all generated runtime rebind registrator classes. Is exposed publicly so
diff --git a/user/src/com/google/gwt/core/client/RuntimeRebindRule.java b/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/RuntimeRebindRule.java
similarity index 97%
rename from user/src/com/google/gwt/core/client/RuntimeRebindRule.java
rename to dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/RuntimeRebindRule.java
index 50a79e4..f1265e7 100644
--- a/user/src/com/google/gwt/core/client/RuntimeRebindRule.java
+++ b/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/RuntimeRebindRule.java
@@ -11,7 +11,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.core.client;
+package com.google.gwt.lang;
/**
* A base for rule classes that can judge conditions and create object instances as part of the
diff --git a/user/src/com/google/gwt/core/client/RuntimeRebinder.java b/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/RuntimeRebinder.java
similarity index 98%
rename from user/src/com/google/gwt/core/client/RuntimeRebinder.java
rename to dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/RuntimeRebinder.java
index a828d91..9a51f1e 100644
--- a/user/src/com/google/gwt/core/client/RuntimeRebinder.java
+++ b/dev/core/super/com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang/RuntimeRebinder.java
@@ -11,7 +11,7 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-package com.google.gwt.core.client;
+package com.google.gwt.lang;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/dev/core/test/com/google/gwt/dev/cfg/ZipLibrariesTest.java b/dev/core/test/com/google/gwt/dev/cfg/ZipLibrariesTest.java
index 5afb0b5..3b00acc 100644
--- a/dev/core/test/com/google/gwt/dev/cfg/ZipLibrariesTest.java
+++ b/dev/core/test/com/google/gwt/dev/cfg/ZipLibrariesTest.java
@@ -57,14 +57,14 @@
Set<String> expectedLocaleConfigurationValues = Sets.newHashSet("en", "fr");
Set<String> expectedDependencyLibraryNames = Sets.newHashSet("FooLib", "BarLib");
MockCompilationUnit expectedCompilationUnit =
- new MockCompilationUnit("com.google.gwt.core.client.RuntimeRebinder", "blah");
- MockCompilationUnit expectedSuperSourceCompilationUnit =
- new MockCompilationUnit("com.google.gwt.core.client.SuperRuntimeRebinder", "superblah") {
- @Override
- public boolean isSuperSource() {
- return true;
- }
- };
+ new MockCompilationUnit("com.google.gwt.lang.RuntimeRebinder", "blah");
+ MockCompilationUnit expectedSuperSourceCompilationUnit = new MockCompilationUnit(
+ "com.google.gwt.lang.SuperRuntimeRebinder", "superblah") {
+ @Override
+ public boolean isSuperSource() {
+ return true;
+ }
+ };
// Put data in the library and save it.
ZipLibraryWriter zipLibraryWriter = new ZipLibraryWriter(zipFile.getPath());
@@ -93,9 +93,9 @@
// Read data back from disk.
ZipLibrary zipLibrary = new ZipLibrary(zipFile.getPath());
CompilationUnit actualCompilationUnit =
- zipLibrary.getCompilationUnitByTypeName("com.google.gwt.core.client.RuntimeRebinder");
+ zipLibrary.getCompilationUnitByTypeName("com.google.gwt.lang.RuntimeRebinder");
CompilationUnit actualSuperSourceCompilationUnit =
- zipLibrary.getCompilationUnitByTypeName("com.google.gwt.core.client.SuperRuntimeRebinder");
+ zipLibrary.getCompilationUnitByTypeName("com.google.gwt.lang.SuperRuntimeRebinder");
// Compare it.
assertEquals(expectedLibraryName, zipLibrary.getLibraryName());
diff --git a/dev/core/test/com/google/gwt/dev/jjs/LibraryJavaToJavaScriptCompilerTest.java b/dev/core/test/com/google/gwt/dev/jjs/LibraryJavaToJavaScriptCompilerTest.java
index db2dfa4..f7a0191 100644
--- a/dev/core/test/com/google/gwt/dev/jjs/LibraryJavaToJavaScriptCompilerTest.java
+++ b/dev/core/test/com/google/gwt/dev/jjs/LibraryJavaToJavaScriptCompilerTest.java
@@ -353,7 +353,7 @@
// JProgram was informed of the newly created PropertyProviderRegistrator type and its name
// reflects the name of the module currently being processed.
- assertEquals("com.google.gwt.core.client.mock_RuntimeRebindRegistrator",
+ assertEquals("com.google.gwt.lang.mock_RuntimeRebindRegistrator",
compiler.jprogram.getRuntimeRebindRegistratorTypeName());
// The allRootTypes list was augmented to know about this newly created type.
assertTrue(allRootTypes.contains(compiler.jprogram.getRuntimeRebindRegistratorTypeName()));
