Move InternalsJsMap inner classes to outer classes.
Since j2cl can not super source internal classes
these need to be outter classes.
Change-Id: Ic20d33f6d5a27f8b6af6f54f2a2ce73300c382d8
diff --git a/user/super/com/google/gwt/emul/java/util/InternalHashCodeMap.java b/user/super/com/google/gwt/emul/java/util/InternalHashCodeMap.java
index 1422114..cc1c8ca 100644
--- a/user/super/com/google/gwt/emul/java/util/InternalHashCodeMap.java
+++ b/user/super/com/google/gwt/emul/java/util/InternalHashCodeMap.java
@@ -18,9 +18,6 @@
import static java.util.ConcurrentModificationDetector.structureChanged;
import java.util.AbstractMap.SimpleEntry;
-import java.util.InternalJsMapFactory.InternalJsIterator;
-import java.util.InternalJsMapFactory.InternalJsIteratorEntry;
-import java.util.InternalJsMapFactory.InternalJsMap;
import java.util.Map.Entry;
import javaemul.internal.ArrayHelper;
diff --git a/user/super/com/google/gwt/emul/java/util/InternalJsIterator.java b/user/super/com/google/gwt/emul/java/util/InternalJsIterator.java
new file mode 100644
index 0000000..accaee5
--- /dev/null
+++ b/user/super/com/google/gwt/emul/java/util/InternalJsIterator.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package java.util;
+
+import com.google.gwt.core.client.JavaScriptObject;
+
+class InternalJsIterator<V> extends JavaScriptObject {
+ protected InternalJsIterator() { }
+ public final native InternalJsIteratorEntry<V> next() /*-{ return this.next(); }-*/;
+}
\ No newline at end of file
diff --git a/user/super/com/google/gwt/emul/java/util/InternalJsIteratorEntry.java b/user/super/com/google/gwt/emul/java/util/InternalJsIteratorEntry.java
new file mode 100644
index 0000000..129ece5
--- /dev/null
+++ b/user/super/com/google/gwt/emul/java/util/InternalJsIteratorEntry.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package java.util;
+
+import com.google.gwt.core.client.JavaScriptObject;
+
+class InternalJsIteratorEntry<V> extends JavaScriptObject {
+ protected InternalJsIteratorEntry() { }
+ public final native boolean done() /*-{ return this.done; }-*/;
+ public final native String getKey() /*-{ return this.value[0]; }-*/;
+ public final native V getValue() /*-{ return this.value[1]; }-*/;
+}
\ No newline at end of file
diff --git a/user/super/com/google/gwt/emul/java/util/InternalJsMap.java b/user/super/com/google/gwt/emul/java/util/InternalJsMap.java
new file mode 100644
index 0000000..e7a1ab1
--- /dev/null
+++ b/user/super/com/google/gwt/emul/java/util/InternalJsMap.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package java.util;
+
+import com.google.gwt.core.client.JavaScriptObject;
+
+class InternalJsMap<V> extends JavaScriptObject {
+ protected InternalJsMap() { }
+ public final native V get(int key) /*-{ return this.get(key); }-*/;
+ public final native V get(String key) /*-{ return this.get(key); }-*/;
+ public final native void set(int key, V value) /*-{ this.set(key, value); }-*/;
+ public final native void set(String key, V value) /*-{ this.set(key, value); }-*/;
+ // Calls delete via brackets to be workable with polyfills
+ public final native void delete(int key) /*-{ this['delete'](key); }-*/;
+ public final native void delete(String key) /*-{ this['delete'](key); }-*/;
+ public final native InternalJsIterator<V> entries() /*-{ return this.entries(); }-*/;
+}
\ No newline at end of file
diff --git a/user/super/com/google/gwt/emul/java/util/InternalJsMapFactory.java b/user/super/com/google/gwt/emul/java/util/InternalJsMapFactory.java
index 63f98ba..ba8c6d4 100644
--- a/user/super/com/google/gwt/emul/java/util/InternalJsMapFactory.java
+++ b/user/super/com/google/gwt/emul/java/util/InternalJsMapFactory.java
@@ -162,30 +162,6 @@
return true;
}-*/;
- static class InternalJsIterator<V> extends JavaScriptObject {
- protected InternalJsIterator() { }
- public final native InternalJsIteratorEntry<V> next() /*-{ return this.next(); }-*/;
- }
-
- static class InternalJsIteratorEntry<V> extends JavaScriptObject {
- protected InternalJsIteratorEntry() { }
- public final native boolean done() /*-{ return this.done; }-*/;
- public final native String getKey() /*-{ return this.value[0]; }-*/;
- public final native V getValue() /*-{ return this.value[1]; }-*/;
- }
-
- static class InternalJsMap<V> extends JavaScriptObject {
- protected InternalJsMap() { }
- public final native V get(int key) /*-{ return this.get(key); }-*/;
- public final native V get(String key) /*-{ return this.get(key); }-*/;
- public final native void set(int key, V value) /*-{ this.set(key, value); }-*/;
- public final native void set(String key, V value) /*-{ this.set(key, value); }-*/;
- // Calls delete via brackets to be workable with polyfills
- public final native void delete(int key) /*-{ this['delete'](key); }-*/;
- public final native void delete(String key) /*-{ this['delete'](key); }-*/;
- public final native InternalJsIterator<V> entries() /*-{ return this.entries(); }-*/;
- }
-
private InternalJsMapFactory() {
// Hides the constructor.
}
diff --git a/user/super/com/google/gwt/emul/java/util/InternalStringMap.java b/user/super/com/google/gwt/emul/java/util/InternalStringMap.java
index a81253e..c1db5d8 100644
--- a/user/super/com/google/gwt/emul/java/util/InternalStringMap.java
+++ b/user/super/com/google/gwt/emul/java/util/InternalStringMap.java
@@ -17,9 +17,6 @@
import static java.util.ConcurrentModificationDetector.structureChanged;
-import java.util.InternalJsMapFactory.InternalJsIterator;
-import java.util.InternalJsMapFactory.InternalJsIteratorEntry;
-import java.util.InternalJsMapFactory.InternalJsMap;
import java.util.Map.Entry;
import javaemul.internal.JsUtils;
