Cleanup after 1.5 merge.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@3595 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/eclipse/lang/.classpath b/eclipse/lang/.classpath
index 2c076cc..18d86da 100644
--- a/eclipse/lang/.classpath
+++ b/eclipse/lang/.classpath
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="dev/super/com/google/gwt/dev/jjs/intrinsic"/>
+ <classpathentry kind="src" path="user/super/com/google/gwt/user/translatable"/>
<classpathentry kind="src" path="user/super/com/google/gwt/benchmarks/translatable"/>
<classpathentry kind="src" path="user/super/com/google/gwt/emul"/>
<classpathentry kind="src" path="user/super/com/google/gwt/junit/translatable"/>
diff --git a/user/src/com/google/gwt/dom/client/IFrameElement.java b/user/src/com/google/gwt/dom/client/IFrameElement.java
index ac92c8a..7368cd0 100644
--- a/user/src/com/google/gwt/dom/client/IFrameElement.java
+++ b/user/src/com/google/gwt/dom/client/IFrameElement.java
@@ -42,7 +42,7 @@
* null otherwise.
*/
public final native Document getContentDocument() /*-{
- // This is known to work on all modern browsers.
+ // This is known to work on all modern browsers.
return this.contentWindow.document;
}-*/;
diff --git a/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplIE6.java b/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplIE6.java
index feaebb8..569695c 100644
--- a/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplIE6.java
+++ b/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplIE6.java
@@ -48,8 +48,8 @@
var elem = _this.@com.google.gwt.user.client.ui.impl.RichTextAreaImpl::elem;
var doc = elem.contentWindow.document;
if (!doc.body) {
- // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower
- // would increase the probability of a user-visible delay.
+ // Retry in 50 ms. Faster would run the risk of pegging the CPU. Slower
+ // would increase the probability of a user-visible delay.
setTimeout(arguments.callee, 50);
return;
}
diff --git a/user/super/com/google/gwt/user/translatable/com/google/gwt/user/client/rpc/core/java/util/LinkedHashMap_CustomFieldSerializer.java b/user/super/com/google/gwt/user/translatable/com/google/gwt/user/client/rpc/core/java/util/LinkedHashMap_CustomFieldSerializer.java
index f242d28..1129ce4 100644
--- a/user/super/com/google/gwt/user/translatable/com/google/gwt/user/client/rpc/core/java/util/LinkedHashMap_CustomFieldSerializer.java
+++ b/user/super/com/google/gwt/user/translatable/com/google/gwt/user/client/rpc/core/java/util/LinkedHashMap_CustomFieldSerializer.java
@@ -1,53 +1,50 @@
-/*
- * Copyright 2008 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 com.google.gwt.user.client.rpc.core.java.util;
-
-import com.google.gwt.user.client.rpc.SerializationException;
-import com.google.gwt.user.client.rpc.SerializationStreamReader;
-import com.google.gwt.user.client.rpc.SerializationStreamWriter;
-import com.google.gwt.user.client.rpc.core.java.util.Map_CustomFieldSerializerBase;
-
-import java.util.LinkedHashMap;
-import java.util.Set;
-import java.util.Map.Entry;
-
-/**
- * Custom field serializer for {@link java.util.LinkedHashMap}, which uses
- * JSNI.
- */
-public final class LinkedHashMap_CustomFieldSerializer {
-
- public static void deserialize(SerializationStreamReader streamReader,
- LinkedHashMap instance) throws SerializationException {
- Map_CustomFieldSerializerBase.deserialize(streamReader, instance);
- }
-
- public static LinkedHashMap instantiate(SerializationStreamReader streamReader)
- throws SerializationException {
- boolean accessOrder = streamReader.readBoolean();
- return new LinkedHashMap(16, .75f, accessOrder);
- }
-
- public static void serialize(SerializationStreamWriter streamWriter,
- LinkedHashMap instance) throws SerializationException {
- streamWriter.writeBoolean(getAccessOrder(instance));
- Map_CustomFieldSerializerBase.serialize(streamWriter, instance);
- }
-
- private static native boolean getAccessOrder(LinkedHashMap instance) /*-{
- return instance.@java.util.LinkedHashMap::accessOrder;
- }-*/;
-}
+/*
+ * Copyright 2008 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 com.google.gwt.user.client.rpc.core.java.util;
+
+import com.google.gwt.user.client.rpc.SerializationException;
+import com.google.gwt.user.client.rpc.SerializationStreamReader;
+import com.google.gwt.user.client.rpc.SerializationStreamWriter;
+
+import java.util.LinkedHashMap;
+
+/**
+ * Custom field serializer for {@link java.util.LinkedHashMap}, which uses
+ * JSNI.
+ */
+public final class LinkedHashMap_CustomFieldSerializer {
+
+ public static void deserialize(SerializationStreamReader streamReader,
+ LinkedHashMap instance) throws SerializationException {
+ Map_CustomFieldSerializerBase.deserialize(streamReader, instance);
+ }
+
+ public static LinkedHashMap instantiate(SerializationStreamReader streamReader)
+ throws SerializationException {
+ boolean accessOrder = streamReader.readBoolean();
+ return new LinkedHashMap(16, .75f, accessOrder);
+ }
+
+ public static void serialize(SerializationStreamWriter streamWriter,
+ LinkedHashMap instance) throws SerializationException {
+ streamWriter.writeBoolean(getAccessOrder(instance));
+ Map_CustomFieldSerializerBase.serialize(streamWriter, instance);
+ }
+
+ private static native boolean getAccessOrder(LinkedHashMap instance) /*-{
+ return instance.@java.util.LinkedHashMap::accessOrder;
+ }-*/;
+}
diff --git a/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java b/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java
index e72c6ec..b5bc215 100644
--- a/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java
+++ b/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java
@@ -234,9 +234,9 @@
private static SerializableTypeOracleBuilder createSerializableTypeOracleBuilder(
TreeLogger logger, TypeOracle to) throws UnableToCompleteException {
- StaticPropertyOracle propertyOracle = new StaticPropertyOracle();
- // PropertyOracle has no values.
- propertyOracle.setPropertyValues(new Property[0], new String[0]);
+ // Make an empty property oracle.
+ StaticPropertyOracle propertyOracle = new StaticPropertyOracle(
+ new Property[0], new String[0]);
return new SerializableTypeOracleBuilder(logger, propertyOracle, to);
}
