Author: r...@google.com Date: Thu Jul 2 19:58:31 2009 New Revision: 5663 Removed: trunk/user/src/com/google/gwt/core/client/WeakMapping.java trunk/user/src/com/google/gwt/user/rebind/rpc/ClientDataSerializer.java trunk/user/src/com/google/gwt/user/rebind/rpc/JdoDetachedStateClientDataSerializer.java trunk/user/src/com/google/gwt/user/server/Base64Utils.java trunk/user/src/com/google/gwt/user/server/rpc/impl/JdoDetachedStateServerDataSerializer.java trunk/user/src/com/google/gwt/user/server/rpc/impl/ServerDataSerializer.java trunk/user/super/com/google/gwt/user/translatable/com/google/gwt/core/ trunk/user/test/com/google/gwt/core/client/WeakMappingTest.java trunk/user/test/com/google/gwt/user/server/Base64Test.java Modified: trunk/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java trunk/user/src/com/google/gwt/user/rebind/rpc/FieldSerializerCreator.java trunk/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java trunk/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java trunk/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamWriter.java trunk/user/super/com/google/gwt/emul/java/lang/Object.java trunk/user/test/com/google/gwt/core/CoreSuite.java trunk/user/test/com/google/gwt/user/RPCSuite.java
Log: Roll back r5662. The overlay of WeakMapping is confusing the apicheck-nobuild target. TBR: bobv Modified: trunk/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java ============================================================================== --- trunk/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java (original) +++ trunk/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaScriptAST.java Thu Jul 2 19:58:31 2009 @@ -1949,7 +1949,6 @@ specialObfuscatedIdents.put("finalize", "fZ"); // Object fields - specialObfuscatedIdents.put("expando", "eX"); specialObfuscatedIdents.put("typeId", "tI"); specialObfuscatedIdents.put("typeMarker", "tM"); Modified: trunk/user/src/com/google/gwt/user/rebind/rpc/FieldSerializerCreator.java ============================================================================== --- trunk/user/src/com/google/gwt/user/rebind/rpc/FieldSerializerCreator.java (original) +++ trunk/user/src/com/google/gwt/user/rebind/rpc/FieldSerializerCreator.java Thu Jul 2 19:58:31 2009 @@ -16,7 +16,6 @@ package com.google.gwt.user.rebind.rpc; import com.google.gwt.core.client.UnsafeNativeLong; -import com.google.gwt.core.client.WeakMapping; import com.google.gwt.core.ext.GeneratorContext; import com.google.gwt.core.ext.TreeLogger; import com.google.gwt.core.ext.typeinfo.JArrayType; @@ -47,8 +46,6 @@ * fully qualified type names everywhere */ public class FieldSerializerCreator { - - private final static String WEAK_MAPPING_CLASS_NAME = WeakMapping.class.getName(); private final JClassType serializableClass; @@ -351,13 +348,6 @@ writeEnumDeserializationStatements(serializableClass.isEnum()); } else { writeClassDeserializationStatements(); - - for (ClientDataSerializer serializer : ClientDataSerializer.getSerializers()) { - if (serializer.shouldSerialize(serializableClass)) { - sourceWriter.println(WEAK_MAPPING_CLASS_NAME + ".set(instance, " - + "\"" + serializer.getName() + "\", streamReader.readString());"); - } - } } sourceWriter.outdent(); sourceWriter.println("}"); @@ -465,14 +455,6 @@ writeEnumSerializationStatements(serializableClass.isEnum()); } else { writeClassSerializationStatements(); - - for (ClientDataSerializer serializer : ClientDataSerializer.getSerializers()) { - if (serializer.shouldSerialize(serializableClass)) { - sourceWriter.println("streamWriter.writeString((String) " - + WEAK_MAPPING_CLASS_NAME + ".get(instance, \"" - + serializer.getName() + "\"));"); - } - } } sourceWriter.outdent(); Modified: trunk/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java ============================================================================== --- trunk/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java (original) +++ trunk/user/src/com/google/gwt/user/server/rpc/impl/SerializabilityUtil.java Thu Jul 2 19:58:31 2009 @@ -250,13 +250,6 @@ } private static boolean fieldQualifiesForSerialization(Field field) { - // Check if the field will be handled by a ServerDataSerializer; if so, skip it here. - for (ServerDataSerializer serializer : ServerDataSerializer.getSerializers()) { - if (serializer.shouldSkipField(field)) { - return false; - } - } - if (Throwable.class == field.getDeclaringClass()) { /** * Only serialize Throwable's detailMessage field; all others are ignored. @@ -318,7 +311,7 @@ private static boolean isNotStaticTransientOrFinal(Field field) { /* - * Only serialize fields that are not static, transient or final. + * Only serialize fields that are not static, transient and final. */ int fieldModifiers = field.getModifiers(); return !Modifier.isStatic(fieldModifiers) Modified: trunk/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java ============================================================================== --- trunk/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java (original) +++ trunk/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java Thu Jul 2 19:58:31 2009 @@ -18,7 +18,6 @@ import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.impl.AbstractSerializationStreamReader; -import com.google.gwt.user.server.Base64Utils; import com.google.gwt.user.server.rpc.RPC; import com.google.gwt.user.server.rpc.SerializationPolicy; import com.google.gwt.user.server.rpc.SerializationPolicyProvider; @@ -602,18 +601,6 @@ if (serializationPolicy.shouldDeserializeFields(superClass)) { deserializeImpl(SerializabilityUtil.hasCustomFieldSerializer(superClass), superClass, instance); - } - - /* - * Iterate through all ServerDataSerializers, in name order, allowing each - * to perform custom deserialization. - */ - for (ServerDataSerializer serializer : ServerDataSerializer.getSerializers()) { - if (serializer.shouldSerialize(instanceClass)) { - String encodedData = readString(); - byte[] serializedData = Base64Utils.fromBase64(encodedData); - serializer.deserializeServerData(serializedData, instance); - } } } Modified: trunk/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamWriter.java ============================================================================== --- trunk/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamWriter.java (original) +++ trunk/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamWriter.java Thu Jul 2 19:58:31 2009 @@ -17,7 +17,6 @@ import com.google.gwt.user.client.rpc.SerializationException; import com.google.gwt.user.client.rpc.impl.AbstractSerializationStreamWriter; -import com.google.gwt.user.server.Base64Utils; import com.google.gwt.user.server.rpc.SerializationPolicy; import java.lang.reflect.Field; @@ -657,18 +656,6 @@ Class<?> superClass = instanceClass.getSuperclass(); if (serializationPolicy.shouldSerializeFields(superClass)) { serializeImpl(instance, superClass); - } - - /* - * Iterate through all ServerDataSerializers, in name order, allowing each - * to perform custom serialization. - */ - for (ServerDataSerializer serializer : ServerDataSerializer.getSerializers()) { - if (serializer.shouldSerialize(instanceClass)) { - byte[] serializedData = serializer.serializeServerData(instance); - String encodedData = Base64Utils.toBase64(serializedData); - writeString(encodedData); - } } } Modified: trunk/user/super/com/google/gwt/emul/java/lang/Object.java ============================================================================== --- trunk/user/super/com/google/gwt/emul/java/lang/Object.java (original) +++ trunk/user/super/com/google/gwt/emul/java/lang/Object.java Thu Jul 2 19:58:31 2009 @@ -15,7 +15,6 @@ */ package java.lang; -import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.core.client.impl.Impl; /** @@ -24,15 +23,6 @@ * limitations. The methods documented here are the only ones available. */ public class Object { - - /** - * Used by {...@link com.google.gwt.core.client.WeakMapping} in web mode - * to store an expando containing a String -> Object mapping. - * - * @skip - */ - @SuppressWarnings("unused") - private transient JavaScriptObject expando; /** * magic magic magic. Modified: trunk/user/test/com/google/gwt/core/CoreSuite.java ============================================================================== --- trunk/user/test/com/google/gwt/core/CoreSuite.java (original) +++ trunk/user/test/com/google/gwt/core/CoreSuite.java Thu Jul 2 19:58:31 2009 @@ -19,7 +19,6 @@ import com.google.gwt.core.client.HttpThrowableReporterTest; import com.google.gwt.core.client.JavaScriptExceptionTest; import com.google.gwt.core.client.JsArrayTest; -import com.google.gwt.core.client.WeakMappingTest; import com.google.gwt.core.client.impl.StackTraceCreatorTest; import com.google.gwt.junit.tools.GWTTestSuite; @@ -38,7 +37,6 @@ suite.addTestSuite(JsArrayTest.class); suite.addTestSuite(GWTTest.class); suite.addTestSuite(StackTraceCreatorTest.class); - suite.addTestSuite(WeakMappingTest.class); // $JUnit-END$ return suite; Modified: trunk/user/test/com/google/gwt/user/RPCSuite.java ============================================================================== --- trunk/user/test/com/google/gwt/user/RPCSuite.java (original) +++ trunk/user/test/com/google/gwt/user/RPCSuite.java Thu Jul 2 19:58:31 2009 @@ -36,7 +36,6 @@ import com.google.gwt.user.client.rpc.ValueTypesTestWithTypeObfuscation; import com.google.gwt.user.rebind.rpc.SerializableTypeOracleBuilderTest; import com.google.gwt.user.rebind.rpc.TypeHierarchyUtilsTest; -import com.google.gwt.user.server.Base64Test; import com.google.gwt.user.server.rpc.RPCRequestTest; import com.google.gwt.user.server.rpc.RPCServletUtilsTest; import com.google.gwt.user.server.rpc.RPCTest; @@ -76,7 +75,6 @@ suite.addTestSuite(RPCRequestTest.class); suite.addTestSuite(FailedRequestTest.class); suite.addTestSuite(FailingRequestBuilderTest.class); - suite.addTestSuite(Base64Test.class); // GWTTestCases suite.addTestSuite(ValueTypesTest.class); --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---