Reviewers: zundel,
Description:
Remove dependency on CastableTypeMap from deRPC
Please review this at http://gwt-code-reviews.appspot.com/943803/show
Affected files:
M user/src/com/google/gwt/rpc/linker/CastableTypeDataImpl.java
M user/src/com/google/gwt/rpc/linker/ClientOracleLinker.java
Index: user/src/com/google/gwt/rpc/linker/CastableTypeDataImpl.java
===================================================================
--- user/src/com/google/gwt/rpc/linker/CastableTypeDataImpl.java (revision
8936)
+++ user/src/com/google/gwt/rpc/linker/CastableTypeDataImpl.java (working
copy)
@@ -16,7 +16,6 @@
package com.google.gwt.rpc.linker;
-import com.google.gwt.core.ext.linker.CastableTypeMap;
import com.google.gwt.rpc.server.CastableTypeData;
/**
@@ -24,14 +23,14 @@
*/
public class CastableTypeDataImpl implements CastableTypeData {
- private final CastableTypeMap castableTypeMap;
+ private final String castableTypeMapJs;
- public CastableTypeDataImpl(CastableTypeMap castableTypeMap) {
- this.castableTypeMap = castableTypeMap;
+ public CastableTypeDataImpl(String castableTypeMapJs) {
+ this.castableTypeMapJs = castableTypeMapJs;
}
public String toJs() {
- return castableTypeMap.toJs();
+ return castableTypeMapJs;
}
}
Index: user/src/com/google/gwt/rpc/linker/ClientOracleLinker.java
===================================================================
--- user/src/com/google/gwt/rpc/linker/ClientOracleLinker.java (revision
8936)
+++ user/src/com/google/gwt/rpc/linker/ClientOracleLinker.java (working
copy)
@@ -69,10 +69,15 @@
}
for (SymbolData symbolData : result.getSymbolMap()) {
+
+ String castableTypeMapString =
+ (symbolData.getCastableTypeMap() == null) ? null :
+ symbolData.getCastableTypeMap().toJs();
+
builder.add(symbolData.getSymbolName(),
symbolData.getJsniIdent(),
symbolData.getClassName(), symbolData.getMemberName(),
symbolData.getQueryId(),
- new CastableTypeDataImpl(symbolData.getCastableTypeMap()));
+ new CastableTypeDataImpl(castableTypeMapString));
}
ByteArrayOutputStream out = new ByteArrayOutputStream();
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors