Removed unnecessary lambda wrappers from generated type serializers. This would break Windows hosted mode before, but now hosted mode is fixed.
Review by: bruce
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@2001 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/user/rebind/rpc/TypeSerializerCreator.java b/user/src/com/google/gwt/user/rebind/rpc/TypeSerializerCreator.java
index b6bb303..65a842d 100644
--- a/user/src/com/google/gwt/user/rebind/rpc/TypeSerializerCreator.java
+++ b/user/src/com/google/gwt/user/rebind/rpc/TypeSerializerCreator.java
@@ -276,7 +276,7 @@
String serializerName = serializationOracle.getFieldSerializerName(type);
{
// First the initialization method
- srcWriter.print("function(x){ return @");
+ srcWriter.print("@");
if (needsCreateMethod(type)) {
srcWriter.print(serializationOracle.getTypeSerializerQualifiedName(getServiceInterface()));
srcWriter.print("::");
@@ -285,31 +285,28 @@
srcWriter.print(serializerName);
srcWriter.print("::instantiate");
}
- srcWriter.println("(L"
+ srcWriter.print("(L"
+ SerializationStreamReader.class.getName().replace('.', '/')
- + ";)(x);},");
+ + ";)");
+ srcWriter.println(",");
}
String jsniSignature = type.getJNISignature();
{
// Now the deserialization method
- srcWriter.print("function(x,y){");
srcWriter.print("@" + serializerName);
srcWriter.print("::deserialize(L"
+ SerializationStreamReader.class.getName().replace('.', '/')
+ ";" + jsniSignature + ")");
- srcWriter.print("(x,y);}");
srcWriter.println(",");
}
{
// Now the serialization method
- srcWriter.print("function(x,y){");
srcWriter.print("@" + serializerName);
srcWriter.print("::serialize(L"
+ SerializationStreamWriter.class.getName().replace('.', '/')
+ ";" + jsniSignature + ")");
- srcWriter.print("(x,y);}");
srcWriter.println();
}
srcWriter.outdent();
