Revision: 9949
Author: b...@google.com
Date: Wed Apr 6 04:44:12 2011
Log: Reformat autobeans package to cut down on diff churn for lazy
reification patch.
Patch by: bobv
Review by: rice
Review at http://gwt-code-reviews.appspot.com/1407801
http://code.google.com/p/google-web-toolkit/source/detail?r=9949
Modified:
/trunk/user/src/com/google/gwt/autobean/client/impl/AbstractAutoBeanFactory.java
/trunk/user/src/com/google/gwt/autobean/client/impl/ClientPropertyContext.java
/trunk/user/src/com/google/gwt/autobean/client/impl/JsniCreatorMap.java
/trunk/user/src/com/google/gwt/autobean/client/impl/JsoSplittable.java
/trunk/user/src/com/google/gwt/autobean/rebind/AutoBeanFactoryGenerator.java
/trunk/user/src/com/google/gwt/autobean/server/AutoBeanFactoryMagic.java
/trunk/user/src/com/google/gwt/autobean/server/Configuration.java
/trunk/user/src/com/google/gwt/autobean/shared/AutoBeanCodex.java
/trunk/user/src/com/google/gwt/autobean/shared/AutoBeanUtils.java
/trunk/user/src/com/google/gwt/autobean/shared/AutoBeanVisitor.java
=======================================
---
/trunk/user/src/com/google/gwt/autobean/client/impl/AbstractAutoBeanFactory.java
Thu Mar 3 07:14:17 2011
+++
/trunk/user/src/com/google/gwt/autobean/client/impl/AbstractAutoBeanFactory.java
Wed Apr 6 04:44:12 2011
@@ -26,8 +26,7 @@
/**
* Provides base implementations of AutoBeanFactory methods.
*/
-public abstract class AbstractAutoBeanFactory implements AutoBeanFactory,
- EnumMap {
+public abstract class AbstractAutoBeanFactory implements AutoBeanFactory,
EnumMap {
protected Map<Enum<?>, String> enumToStringMap;
// This map is almost always one-to-one
=======================================
---
/trunk/user/src/com/google/gwt/autobean/client/impl/ClientPropertyContext.java
Mon Mar 21 12:22:19 2011
+++
/trunk/user/src/com/google/gwt/autobean/client/impl/ClientPropertyContext.java
Wed Apr 6 04:44:12 2011
@@ -64,8 +64,7 @@
this.paramCounts = null;
}
- public ClientPropertyContext(Object instance, Setter setter,
- Class<?>[] types, int[] paramCounts) {
+ public ClientPropertyContext(Object instance, Setter setter, Class<?>[]
types, int[] paramCounts) {
this.instance = instance;
this.setter = setter;
this.simpleType = null;
@@ -77,14 +76,14 @@
* plus one for the root type, equals the total number of types passed
in.
*/
if (ClientPropertyContext.class.desiredAssertionStatus()) {
- assert types.length == paramCounts.length : "Length mismatch "
- + types.length + " != " + paramCounts.length;
+ assert types.length == paramCounts.length : "Length mismatch " +
types.length + " != "
+ + paramCounts.length;
int count = 1;
for (int i = 0, j = paramCounts.length; i < j; i++) {
count += paramCounts[i];
}
- assert count == types.length : "Mismatch in total parameter count "
- + count + " != " + types.length;
+ assert count == types.length : "Mismatch in total parameter count "
+ count + " != "
+ + types.length;
}
}
=======================================
--- /trunk/user/src/com/google/gwt/autobean/client/impl/JsniCreatorMap.java
Thu Mar 3 07:14:17 2011
+++ /trunk/user/src/com/google/gwt/autobean/client/impl/JsniCreatorMap.java
Wed Apr 6 04:44:12 2011
@@ -48,8 +48,7 @@
return null;
}
- public <T> AutoBean<T> create(Class<T> clazz,
- AbstractAutoBeanFactory factory, Object delegate) {
+ public <T> AutoBean<T> create(Class<T> clazz, AbstractAutoBeanFactory
factory, Object delegate) {
JsArray<JavaScriptObject> arr = get(clazz.getName());
if (arr != null) {
assert arr.get(1) != null : "No delegate-based constructor";
@@ -62,8 +61,7 @@
return this[key];
}-*/;
- private native <T> AutoBean<T> invoke(JavaScriptObject fn, Object arg1,
- Object arg2)/*-{
+ private native <T> AutoBean<T> invoke(JavaScriptObject fn, Object arg1,
Object arg2)/*-{
return fn(arg1, arg2);
}-*/;
=======================================
--- /trunk/user/src/com/google/gwt/autobean/client/impl/JsoSplittable.java
Wed Nov 24 12:33:58 2010
+++ /trunk/user/src/com/google/gwt/autobean/client/impl/JsoSplittable.java
Wed Apr 6 04:44:12 2011
@@ -109,8 +109,7 @@
}
public String getPayload() {
- throw new UnsupportedOperationException(
- "Cannot convert JsoSplittable to payload");
+ throw new UnsupportedOperationException("Cannot convert JsoSplittable
to payload");
}
public List<String> getPropertyKeys() {
@@ -136,7 +135,7 @@
}-*/;
public native boolean isString() /*-{
- return typeof(this) == 'string' || this instanceof String;
+ return typeof (this) == 'string' || this instanceof String;
}-*/;
public native int size() /*-{
=======================================
---
/trunk/user/src/com/google/gwt/autobean/rebind/AutoBeanFactoryGenerator.java
Thu Mar 3 07:14:17 2011
+++
/trunk/user/src/com/google/gwt/autobean/rebind/AutoBeanFactoryGenerator.java
Wed Apr 6 04:44:12 2011
@@ -67,8 +67,8 @@
private AutoBeanFactoryModel model;
@Override
- public String generate(TreeLogger logger, GeneratorContext context,
- String typeName) throws UnableToCompleteException {
+ public String generate(TreeLogger logger, GeneratorContext context,
String typeName)
+ throws UnableToCompleteException {
this.context = context;
this.logger = logger;
@@ -88,8 +88,8 @@
model = new AutoBeanFactoryModel(logger, toGenerate);
- ClassSourceFileComposerFactory factory = new
ClassSourceFileComposerFactory(
- packageName, simpleSourceName);
+ ClassSourceFileComposerFactory factory =
+ new ClassSourceFileComposerFactory(packageName, simpleSourceName);
factory.setSuperclass(AbstractAutoBeanFactory.class.getCanonicalName());
factory.addImplementedInterface(typeName);
SourceWriter sw = factory.createSourceWriter(context, pw);
@@ -121,9 +121,8 @@
// Foo foo, Bar bar, Baz baz
StringBuilder parameters = new StringBuilder();
for (JParameter param : jmethod.getParameters()) {
- parameters.append(",").append(
-
ModelUtils.getQualifiedBaseSourceName(param.getType())).append(" ").append(
- param.getName());
+
parameters.append(",").append(ModelUtils.getQualifiedBaseSourceName(param.getType())).append(
+ " ").append(param.getName());
}
if (parameters.length() > 0) {
parameters = parameters.deleteCharAt(0);
@@ -132,16 +131,15 @@
StringBuilder throwsDeclaration = new StringBuilder();
if (jmethod.getThrows().length > 0) {
for (JType thrown : jmethod.getThrows()) {
- throwsDeclaration.append(". ").append(
- ModelUtils.getQualifiedBaseSourceName(thrown));
+
throwsDeclaration.append(". ").append(ModelUtils.getQualifiedBaseSourceName(thrown));
}
throwsDeclaration.deleteCharAt(0);
throwsDeclaration.insert(0, "throws ");
}
String returnName =
ModelUtils.getQualifiedBaseSourceName(jmethod.getReturnType());
assert !returnName.contains("extends");
- return String.format("%s %s(%s) %s", returnName, jmethod.getName(),
- parameters, throwsDeclaration);
+ return String.format("%s %s(%s) %s", returnName, jmethod.getName(),
parameters,
+ throwsDeclaration);
}
/**
@@ -156,23 +154,20 @@
return methodName.equals("hashCode") ||
methodName.equals("toString");
case 1:
return methodName.equals("equals")
- && parameters[0].getType().equals(
- context.getTypeOracle().getJavaLangObject());
+ &&
parameters[0].getType().equals(context.getTypeOracle().getJavaLangObject());
}
return false;
}
- private void writeAutoBean(AutoBeanType type)
- throws UnableToCompleteException {
- PrintWriter pw = context.tryCreate(logger, type.getPackageNome(),
- type.getSimpleSourceName());
+ private void writeAutoBean(AutoBeanType type) throws
UnableToCompleteException {
+ PrintWriter pw = context.tryCreate(logger, type.getPackageNome(),
type.getSimpleSourceName());
if (pw == null) {
// Previously-created
return;
}
- ClassSourceFileComposerFactory factory = new
ClassSourceFileComposerFactory(
- type.getPackageNome(), type.getSimpleSourceName());
+ ClassSourceFileComposerFactory factory =
+ new ClassSourceFileComposerFactory(type.getPackageNome(),
type.getSimpleSourceName());
factory.setSuperclass(AbstractAutoBean.class.getCanonicalName() + "<"
+ type.getPeerType().getQualifiedSourceName() + ">");
SourceWriter sw = factory.createSourceWriter(context, pw);
@@ -180,34 +175,31 @@
writeShim(sw, type);
// Instance initializer code to set the shim's association
- sw.println("{ %s.set(shim, %s.class.getName(), this); }",
- WeakMapping.class.getCanonicalName(),
AutoBean.class.getCanonicalName());
+ sw.println("{ %s.set(shim, %s.class.getName(), this); }",
WeakMapping.class.getCanonicalName(),
+ AutoBean.class.getCanonicalName());
// Only simple wrappers have a default constructor
if (type.isSimpleBean()) {
// public FooIntfAutoBean(AutoBeanFactory factory) {}
- sw.println("public %s(%s factory) {super(factory);}",
- type.getSimpleSourceName(),
AutoBeanFactory.class.getCanonicalName());
+ sw.println("public %s(%s factory) {super(factory);}",
type.getSimpleSourceName(),
+ AutoBeanFactory.class.getCanonicalName());
}
// Clone constructor
// public FooIntfAutoBean(FooIntfoAutoBean toClone, boolean deepClone)
{
- sw.println("public %1$s(%1$s toClone, boolean deep) {",
- type.getSimpleSourceName());
+ sw.println("public %1$s(%1$s toClone, boolean deep) {",
type.getSimpleSourceName());
sw.indentln("super(toClone, deep);");
sw.println("}");
// Wrapping constructor
// public FooIntfAutoBean(AutoBeanFactory factory, FooIntfo wrapped) {
- sw.println("public %s(%s factory, %s wrapped) {",
- type.getSimpleSourceName(),
AutoBeanFactory.class.getCanonicalName(),
- type.getPeerType().getQualifiedSourceName());
+ sw.println("public %s(%s factory, %s wrapped) {",
type.getSimpleSourceName(),
+ AutoBeanFactory.class.getCanonicalName(),
type.getPeerType().getQualifiedSourceName());
sw.indentln("super(factory, wrapped);");
sw.println("}");
// public FooIntf as() {return shim;}
- sw.println("public %s as() {return shim;}",
- type.getPeerType().getQualifiedSourceName());
+ sw.println("public %s as() {return shim;}",
type.getPeerType().getQualifiedSourceName());
// public FooIntfAutoBean clone(boolean deep) {
sw.println("public %s clone(boolean deep) {",
type.getQualifiedSourceName());
@@ -216,8 +208,8 @@
sw.println("}");
// public Class<Intf> getType() {return Intf.class;}
- sw.println("public Class<%1$s> getType() {return %1$s.class;}",
-
ModelUtils.ensureBaseType(type.getPeerType()).getQualifiedSourceName());
+ sw.println("public Class<%1$s> getType() {return %1$s.class;}",
ModelUtils.ensureBaseType(
+ type.getPeerType()).getQualifiedSourceName());
if (type.isSimpleBean()) {
writeCreateSimpleBean(sw, type);
@@ -232,8 +224,8 @@
* state to be easily consumed.
*/
private void writeCreateSimpleBean(SourceWriter sw, AutoBeanType type) {
- sw.println("@Override protected %s createSimplePeer() {",
- type.getPeerType().getQualifiedSourceName());
+ sw.println("@Override protected %s createSimplePeer() {",
type.getPeerType()
+ .getQualifiedSourceName());
sw.indent();
// return new FooIntf() {
sw.println("return new %s() {",
type.getPeerType().getQualifiedSourceName());
@@ -248,22 +240,18 @@
JPrimitiveType primitive = jmethod.getReturnType().isPrimitive();
if (primitive != null) {
// Object toReturn = values.get("foo");
- sw.println("Object toReturn = values.get(\"%s\");",
- method.getPropertyName());
+ sw.println("Object toReturn = values.get(\"%s\");",
method.getPropertyName());
sw.println("if (toReturn == null) {");
// return 0;
- sw.indentln("return %s;",
- primitive.getUninitializedFieldExpression());
+ sw.indentln("return %s;",
primitive.getUninitializedFieldExpression());
sw.println("} else {");
// return (BoxedType) toReturn;
- sw.indentln("return (%s) toReturn;",
- primitive.getQualifiedBoxedSourceName());
+ sw.indentln("return (%s) toReturn;",
primitive.getQualifiedBoxedSourceName());
sw.println("}");
} else {
// return (ReturnType) values.get(\"foo\");
- sw.println("return (%s) values.get(\"%s\");",
-
ModelUtils.getQualifiedBaseSourceName(jmethod.getReturnType()),
- method.getPropertyName());
+ sw.println("return (%s) values.get(\"%s\");", ModelUtils
+ .getQualifiedBaseSourceName(jmethod.getReturnType()),
method.getPropertyName());
}
}
break;
@@ -283,8 +271,7 @@
if (!jmethod.getReturnType().equals(JPrimitiveType.VOID)) {
sw.print("return ");
}
- sw.print("%s.%s(%s.this",
- staticImpl.getEnclosingType().getQualifiedSourceName(),
+ sw.print("%s.%s(%s.this",
staticImpl.getEnclosingType().getQualifiedSourceName(),
staticImpl.getName(), type.getSimpleSourceName());
for (JParameter param : jmethod.getParameters()) {
sw.print(", %s", param.getName());
@@ -308,8 +295,8 @@
*/
private void writeDynamicMethods(SourceWriter sw) {
List<JClassType> privatePeers = new ArrayList<JClassType>();
- sw.println("@Override protected void initializeCreatorMap(%s map) {",
- JsniCreatorMap.class.getCanonicalName());
+ sw.println("@Override protected void initializeCreatorMap(%s map) {",
JsniCreatorMap.class
+ .getCanonicalName());
sw.indent();
for (AutoBeanType type : model.getAllTypes()) {
if (type.isNoWrap()) {
@@ -325,8 +312,8 @@
classLiteralAccessor = "classLit_" + peerName.replace('.', '_')
+ "()";
}
// map.add(Foo.class, getConstructors_com_foo_Bar());
- sw.println("map.add(%s, getConstructors_%s());",
classLiteralAccessor,
- peerName.replace('.', '_'));
+ sw.println("map.add(%s, getConstructors_%s());",
classLiteralAccessor, peerName.replace('.',
+ '_'));
}
sw.outdent();
sw.println("}");
@@ -337,17 +324,17 @@
*/
for (JClassType peer : privatePeers) {
String peerName =
ModelUtils.ensureBaseType(peer).getQualifiedSourceName();
- sw.println(
- "private native Class<?> classLit_%s() /*-{return
@%s::class;}-*/;",
- peerName.replace('.', '_'), peerName);
+ sw.println("private native Class<?> classLit_%s() /*-{return
@%s::class;}-*/;", peerName
+ .replace('.', '_'), peerName);
}
/*
* Create a method that returns an array containing references to the
* constructors.
*/
- String factoryJNIName = context.getTypeOracle().findType(
- AutoBeanFactory.class.getCanonicalName()).getJNISignature();
+ String factoryJNIName =
+
context.getTypeOracle().findType(AutoBeanFactory.class.getCanonicalName())
+ .getJNISignature();
for (AutoBeanType type : model.getAllTypes()) {
String peerName =
ModelUtils.ensureBaseType(type.getPeerType()).getQualifiedSourceName();
String peerJNIName =
ModelUtils.ensureBaseType(type.getPeerType()).getJNISignature();
@@ -359,19 +346,17 @@
* ];
* }
*/
- sw.println("private native %s<%s> getConstructors_%s() /*-{",
- JsArray.class.getCanonicalName(),
- JavaScriptObject.class.getCanonicalName(),
peerName.replace('.', '_'));
+ sw.println("private native %s<%s> getConstructors_%s() /*-{",
JsArray.class
+ .getCanonicalName(), JavaScriptObject.class.getCanonicalName(),
peerName
+ .replace('.', '_'));
sw.indent();
sw.println("return [");
if (type.isSimpleBean()) {
- sw.indentln("@%s::new(%s),", type.getQualifiedSourceName(),
- factoryJNIName);
+ sw.indentln("@%s::new(%s),", type.getQualifiedSourceName(),
factoryJNIName);
} else {
sw.indentln(",");
}
- sw.indentln("@%s::new(%s%s)", type.getQualifiedSourceName(),
- factoryJNIName, peerJNIName);
+ sw.indentln("@%s::new(%s%s)", type.getQualifiedSourceName(),
factoryJNIName, peerJNIName);
sw.println("];");
sw.outdent();
sw.println("}-*/;");
@@ -394,32 +379,30 @@
sw.indent();
for (Map.Entry<JEnumConstant, String> entry :
model.getEnumTokenMap().entrySet()) {
// enumToStringMap.put(Enum.FOO, "FOO");
- sw.println("enumToStringMap.put(%s.%s, \"%s\");",
- entry.getKey().getEnclosingType().getQualifiedSourceName(),
- entry.getKey().getName(), entry.getValue());
+ sw.println("enumToStringMap.put(%s.%s, \"%s\");",
entry.getKey().getEnclosingType()
+ .getQualifiedSourceName(), entry.getKey().getName(),
entry.getValue());
}
for (Map.Entry<String, List<JEnumConstant>> entry : map.entrySet()) {
String listExpr;
if (entry.getValue().size() == 1) {
JEnumConstant e = entry.getValue().get(0);
// Collections.singletonList(Enum.FOO)
- listExpr = String.format("%s.<%s<?>> singletonList(%s.%s)",
- Collections.class.getCanonicalName(),
- Enum.class.getCanonicalName(),
- e.getEnclosingType().getQualifiedSourceName(), e.getName());
+ listExpr =
+ String.format("%s.<%s<?>> singletonList(%s.%s)",
Collections.class.getCanonicalName(),
+ Enum.class.getCanonicalName(),
e.getEnclosingType().getQualifiedSourceName(), e
+ .getName());
} else {
// Arrays.asList(Enum.FOO, OtherEnum.FOO, ThirdEnum,FOO)
StringBuilder sb = new StringBuilder();
boolean needsComma = false;
- sb.append(String.format("%s.<%s<?>> asList(",
- Arrays.class.getCanonicalName(),
Enum.class.getCanonicalName()));
+ sb.append(String.format("%s.<%s<?>> asList(",
Arrays.class.getCanonicalName(), Enum.class
+ .getCanonicalName()));
for (JEnumConstant e : entry.getValue()) {
if (needsComma) {
sb.append(",");
}
needsComma = true;
-
sb.append(e.getEnclosingType().getQualifiedSourceName()).append(".").append(
- e.getName());
+
sb.append(e.getEnclosingType().getQualifiedSourceName()).append(".").append(e.getName());
}
sb.append(")");
listExpr = sb.toString();
@@ -434,33 +417,30 @@
for (AutoBeanFactoryMethod method : model.getMethods()) {
AutoBeanType autoBeanType = method.getAutoBeanType();
// public AutoBean<Foo> foo(FooSubtype wrapped) {
- sw.println("public %s %s(%s) {",
- method.getReturnType().getQualifiedSourceName(),
method.getName(),
- method.isWrapper()
- ? (method.getWrappedType().getQualifiedSourceName() + "
wrapped")
- : "");
+ sw.println("public %s %s(%s) {",
method.getReturnType().getQualifiedSourceName(), method
+ .getName(), method.isWrapper()
+ ? (method.getWrappedType().getQualifiedSourceName() + "
wrapped") : "");
if (method.isWrapper()) {
sw.indent();
// AutoBean<Foo> toReturn = AutoBeanUtils.getAutoBean(wrapped);
- sw.println("%s toReturn = %s.getAutoBean(wrapped);",
- method.getReturnType().getParameterizedQualifiedSourceName(),
- AutoBeanUtils.class.getCanonicalName());
+ sw.println("%s toReturn = %s.getAutoBean(wrapped);",
method.getReturnType()
+ .getParameterizedQualifiedSourceName(),
AutoBeanUtils.class.getCanonicalName());
sw.println("if (toReturn != null) {return toReturn;}");
// return new FooAutoBean(Factory.this, wrapped);
- sw.println("return new %s(%s.this, wrapped);",
- autoBeanType.getQualifiedSourceName(), simpleSourceName);
+ sw.println("return new %s(%s.this, wrapped);",
autoBeanType.getQualifiedSourceName(),
+ simpleSourceName);
sw.outdent();
} else {
// return new FooAutoBean(Factory.this);
- sw.indentln("return new %s(%s.this);",
- autoBeanType.getQualifiedSourceName(), simpleSourceName);
+ sw.indentln("return new %s(%s.this);",
autoBeanType.getQualifiedSourceName(),
+ simpleSourceName);
}
sw.println("}");
}
}
- private void writeReturnWrapper(SourceWriter sw, AutoBeanType type,
- AutoBeanMethod method) throws UnableToCompleteException {
+ private void writeReturnWrapper(SourceWriter sw, AutoBeanType type,
AutoBeanMethod method)
+ throws UnableToCompleteException {
if (!method.isValueType() && !method.isNoWrap()) {
JMethod jmethod = method.getMethod();
JClassType returnClass =
jmethod.getReturnType().isClassOrInterface();
@@ -468,16 +448,13 @@
sw.println("if (toReturn != null) {");
sw.indent();
- sw.println("if (%s.this.isWrapped(toReturn)) {",
- type.getSimpleSourceName());
- sw.indentln("toReturn = %s.this.getFromWrapper(toReturn);",
- type.getSimpleSourceName());
+ sw.println("if (%s.this.isWrapped(toReturn)) {",
type.getSimpleSourceName());
+ sw.indentln("toReturn = %s.this.getFromWrapper(toReturn);",
type.getSimpleSourceName());
sw.println("} else {");
sw.indent();
if (peer != null) {
// toReturn = new FooAutoBean(getFactory(), toReturn).as();
- sw.println("toReturn = new %s(getFactory(), toReturn).as();",
- peer.getQualifiedSourceName());
+ sw.println("toReturn = new %s(getFactory(), toReturn).as();",
peer.getQualifiedSourceName());
}
sw.outdent();
sw.println("}");
@@ -489,9 +466,8 @@
JMethod interceptor = type.getInterceptor();
if (interceptor != null) {
// toReturn = FooCategory.__intercept(FooAutoBean.this, toReturn);
- sw.println("toReturn = %s.%s(%s.this, toReturn);",
- interceptor.getEnclosingType().getQualifiedSourceName(),
- interceptor.getName(), type.getSimpleSourceName());
+ sw.println("toReturn = %s.%s(%s.this, toReturn);",
interceptor.getEnclosingType()
+ .getQualifiedSourceName(), interceptor.getName(),
type.getSimpleSourceName());
}
}
@@ -502,11 +478,10 @@
* between methods in the peer type and methods declared in the AutoBean
* implementation.
*/
- private void writeShim(SourceWriter sw, AutoBeanType type)
- throws UnableToCompleteException {
+ private void writeShim(SourceWriter sw, AutoBeanType type) throws
UnableToCompleteException {
// private final FooImpl shim = new FooImpl() {
- sw.println("private final %1$s shim = new %1$s() {",
- type.getPeerType().getQualifiedSourceName());
+ sw.println("private final %1$s shim = new %1$s() {", type.getPeerType()
+ .getQualifiedSourceName());
sw.indent();
for (AutoBeanMethod method : type.getMethods()) {
JMethod jmethod = method.getMethod();
@@ -541,10 +516,9 @@
* definitely wrapped by an AutoBean instance.
*/
// Foo toReturn=FooAutoBean.this.get("getFoo",
getWrapped().getFoo());
- sw.println(
- "%s toReturn = %3$s.this.get(\"%2$s\",
getWrapped().%2$s());",
-
ModelUtils.getQualifiedBaseSourceName(jmethod.getReturnType()),
- methodName, type.getSimpleSourceName());
+ sw.println("%s toReturn = %3$s.this.get(\"%2$s\",
getWrapped().%2$s());", ModelUtils
+ .getQualifiedBaseSourceName(jmethod.getReturnType()),
methodName, type
+ .getSimpleSourceName());
// Non-value types might need to be wrapped
writeReturnWrapper(sw, type, method);
@@ -554,11 +528,11 @@
case SET_BUILDER:
sw.println("%s.this.checkFrozen();", type.getSimpleSourceName());
// getWrapped().setFoo(foo);
- sw.println("%s.this.getWrapped().%s(%s);",
- type.getSimpleSourceName(), methodName,
parameters[0].getName());
+ sw.println("%s.this.getWrapped().%s(%s);",
type.getSimpleSourceName(), methodName,
+ parameters[0].getName());
// FooAutoBean.this.set("setFoo", foo);
- sw.println("%s.this.set(\"%s\", %s);",
type.getSimpleSourceName(),
- methodName, parameters[0].getName());
+ sw.println("%s.this.set(\"%s\", %s);",
type.getSimpleSourceName(), methodName,
+ parameters[0].getName());
if (JBeanMethod.SET_BUILDER.equals(method.getAction())) {
sw.println("return this;");
}
@@ -568,24 +542,21 @@
// sw.println("checkFrozen();");
if (JPrimitiveType.VOID.equals(jmethod.getReturnType())) {
// getWrapped().doFoo(params);
- sw.println("%s.this.getWrapped().%s(%s);",
- type.getSimpleSourceName(), methodName, arguments);
+ sw.println("%s.this.getWrapped().%s(%s);",
type.getSimpleSourceName(), methodName,
+ arguments);
// call("doFoo", null, params);
- sw.println("%s.this.call(\"%s\", null%s %s);",
- type.getSimpleSourceName(), methodName, arguments.length()
0
- ? "," : "", arguments);
+ sw.println("%s.this.call(\"%s\", null%s %s);",
type.getSimpleSourceName(), methodName,
+ arguments.length() > 0 ? "," : "", arguments);
} else {
// Type toReturn = getWrapped().doFoo(params);
- sw.println(
- "%s toReturn = %s.this.getWrapped().%s(%s);",
-
ModelUtils.ensureBaseType(jmethod.getReturnType()).getQualifiedSourceName(),
- type.getSimpleSourceName(), methodName, arguments);
+ sw.println("%s toReturn = %s.this.getWrapped().%s(%s);",
ModelUtils.ensureBaseType(
+ jmethod.getReturnType()).getQualifiedSourceName(),
type.getSimpleSourceName(),
+ methodName, arguments);
// Non-value types might need to be wrapped
writeReturnWrapper(sw, type, method);
// call("doFoo", toReturn, params);
- sw.println("%s.this.call(\"%s\", toReturn%s %s);",
- type.getSimpleSourceName(), methodName, arguments.length()
0
- ? "," : "", arguments);
+ sw.println("%s.this.call(\"%s\", toReturn%s %s);",
type.getSimpleSourceName(),
+ methodName, arguments.length() > 0 ? "," : "", arguments);
sw.println("return toReturn;");
}
break;
@@ -617,19 +588,15 @@
*/
private void writeTraversal(SourceWriter sw, AutoBeanType type) {
List<AutoBeanMethod> referencedSetters = new
ArrayList<AutoBeanMethod>();
- sw.println(
- "@Override protected void traverseProperties(%s visitor, %s ctx)
{",
- AutoBeanVisitor.class.getCanonicalName(),
- OneShotContext.class.getCanonicalName());
+ sw.println("@Override protected void traverseProperties(%s visitor, %s
ctx) {",
+ AutoBeanVisitor.class.getCanonicalName(),
OneShotContext.class.getCanonicalName());
sw.indent();
sw.println("%s bean;", AbstractAutoBean.class.getCanonicalName());
sw.println("Object value;");
- sw.println("%s propertyContext;",
- ClientPropertyContext.class.getCanonicalName());
+ sw.println("%s propertyContext;",
ClientPropertyContext.class.getCanonicalName());
// Local variable ref cleans up emitted js
sw.println("%1$s as = as();",
type.getPeerType().getQualifiedSourceName());
- sw.println("%s<String, Object> values = this.values;",
- Map.class.getCanonicalName());
+ sw.println("%s<String, Object> values = this.values;",
Map.class.getCanonicalName());
for (AutoBeanMethod method : type.getMethods()) {
if (!method.getAction().equals(JBeanMethod.GET)) {
@@ -640,10 +607,10 @@
// If it's not a simple bean type, try to find a real setter method
if (!type.isSimpleBean()) {
for (AutoBeanMethod maybeSetter : type.getMethods()) {
- boolean isASetter =
maybeSetter.getAction().equals(JBeanMethod.SET)
- || maybeSetter.getAction().equals(JBeanMethod.SET_BUILDER);
- if (isASetter
- &&
maybeSetter.getPropertyName().equals(method.getPropertyName())) {
+ boolean isASetter =
+ maybeSetter.getAction().equals(JBeanMethod.SET)
+ ||
maybeSetter.getAction().equals(JBeanMethod.SET_BUILDER);
+ if (isASetter &&
maybeSetter.getPropertyName().equals(method.getPropertyName())) {
setter = maybeSetter;
break;
}
@@ -651,10 +618,10 @@
}
// The type of property influences the visitation
- String valueExpression = String.format(
- "bean = (%1$s) %2$s.getAutoBean(as.%3$s());",
- AbstractAutoBean.class.getCanonicalName(),
- AutoBeanUtils.class.getCanonicalName(),
method.getMethod().getName());
+ String valueExpression =
+ String.format("bean = (%1$s) %2$s.getAutoBean(as.%3$s());",
AbstractAutoBean.class
+ .getCanonicalName(), AutoBeanUtils.class.getCanonicalName(),
method.getMethod()
+ .getName());
String visitMethod;
String visitVariable = "bean";
if (method.isCollection()) {
@@ -662,8 +629,7 @@
} else if (method.isMap()) {
visitMethod = "Map";
} else if (method.isValueType()) {
- valueExpression = String.format("value = as.%s();",
- method.getMethod().getName());
+ valueExpression = String.format("value = as.%s();",
method.getMethod().getName());
visitMethod = "Value";
visitVariable = "value";
} else {
@@ -683,8 +649,7 @@
* allows purely numeric property names, which are valid JSON map
keys.
*/
// propertyContext = new CPContext(.....);
- sw.println("propertyContext = new %s(",
- ClientPropertyContext.class.getCanonicalName());
+ sw.println("propertyContext = new %s(",
ClientPropertyContext.class.getCanonicalName());
sw.indent();
// The instance on which the context is nominally operating
sw.println("as,");
@@ -698,14 +663,12 @@
} else {
// Create a function that will update the values map
// CPContext.mapSetter(values, "foo");
- sw.println("%s.mapSetter(values, \"%s\"),",
- ClientPropertyContext.Setter.class.getCanonicalName(),
- method.getPropertyName());
+ sw.println("%s.mapSetter(values, \"%s\"),",
ClientPropertyContext.Setter.class
+ .getCanonicalName(), method.getPropertyName());
}
}
if (typeList.size() == 1) {
- sw.println("%s.class",
-
ModelUtils.ensureBaseType(typeList.get(0)).getQualifiedSourceName());
+ sw.println("%s.class",
ModelUtils.ensureBaseType(typeList.get(0)).getQualifiedSourceName());
} else {
// Produce the array of parameter types
sw.print("new Class<?>[] {");
@@ -716,8 +679,7 @@
} else {
sw.print(", ");
}
- sw.print("%s.class",
- ModelUtils.ensureBaseType(lit).getQualifiedSourceName());
+ sw.print("%s.class",
ModelUtils.ensureBaseType(lit).getQualifiedSourceName());
}
sw.println("},");
@@ -743,16 +705,16 @@
sw.println(");");
// if (visitor.visitReferenceProperty("foo", value, ctx))
- sw.println("if (visitor.visit%sProperty(\"%s\", %s,
propertyContext)) {",
- visitMethod, method.getPropertyName(), visitVariable);
+ sw.println("if (visitor.visit%sProperty(\"%s\", %s,
propertyContext)) {", visitMethod, method
+ .getPropertyName(), visitVariable);
if (!method.isValueType()) {
// Cycle-detection in AbstractAutoBean.traverse
sw.indentln("if (bean != null) { bean.traverse(visitor, ctx); }");
}
sw.println("}");
// visitor.endVisitorReferenceProperty("foo", value, ctx);
- sw.println("visitor.endVisit%sProperty(\"%s\", %s,
propertyContext);",
- visitMethod, method.getPropertyName(), visitVariable);
+ sw.println("visitor.endVisit%sProperty(\"%s\", %s,
propertyContext);", visitMethod, method
+ .getPropertyName(), visitVariable);
}
sw.outdent();
sw.println("}");
@@ -766,14 +728,11 @@
* return instan...@com.example.blah::setFoo(Lcom/example/Foo;);
* }
*/
- sw.println(
- "public static native %s %sMethodReference(Object instance)
/*-{",
- ClientPropertyContext.Setter.class.getCanonicalName(),
- jmethod.getName());
- sw.indentln("return instance.@%s::%s(%s);",
- jmethod.getEnclosingType().getQualifiedSourceName(),
- jmethod.getName(),
- jmethod.getParameters()[0].getType().getJNISignature());
+ sw.println("public static native %s %sMethodReference(Object
instance) /*-{",
+ ClientPropertyContext.Setter.class.getCanonicalName(),
jmethod.getName());
+ sw.indentln("return instance.@%s::%s(%s);",
jmethod.getEnclosingType()
+ .getQualifiedSourceName(), jmethod.getName(),
jmethod.getParameters()[0].getType()
+ .getJNISignature());
sw.println("}-*/;");
}
}
=======================================
---
/trunk/user/src/com/google/gwt/autobean/server/AutoBeanFactoryMagic.java
Mon Mar 21 12:22:19 2011
+++
/trunk/user/src/com/google/gwt/autobean/server/AutoBeanFactoryMagic.java
Wed Apr 6 04:44:12 2011
@@ -68,8 +68,7 @@
* @param clazz the interface type implemented by the AutoBean
* @return an instance of an AutoBean
*/
- public static <T> AutoBean<T> createBean(Class<T> clazz,
- Configuration configuration) {
+ public static <T> AutoBean<T> createBean(Class<T> clazz, Configuration
configuration) {
return new ProxyAutoBean<T>(EMPTY, clazz, configuration);
}
}
=======================================
--- /trunk/user/src/com/google/gwt/autobean/server/Configuration.java Mon
Nov 22 08:01:19 2010
+++ /trunk/user/src/com/google/gwt/autobean/server/Configuration.java Wed
Apr 6 04:44:12 2011
@@ -56,8 +56,8 @@
* @return the Builder
*/
public Builder setCategories(Class<?>... categories) {
- toReturn.categories = Collections.unmodifiableList(new
ArrayList<Class<?>>(
- Arrays.asList(categories)));
+ toReturn.categories =
+ Collections.unmodifiableList(new
ArrayList<Class<?>>(Arrays.asList(categories)));
return this;
}
=======================================
--- /trunk/user/src/com/google/gwt/autobean/shared/AutoBeanCodex.java Wed
Feb 16 05:36:53 2011
+++ /trunk/user/src/com/google/gwt/autobean/shared/AutoBeanCodex.java Wed
Apr 6 04:44:12 2011
@@ -101,8 +101,7 @@
throw new RuntimeException(type.getName());
}
for (int i = 0, j = data.size(); i < j; i++) {
- Object element = data.isNull(i) ? null
- : elementDecoder.decode(data.get(i));
+ Object element = data.isNull(i) ? null :
elementDecoder.decode(data.get(i));
collection.add(element);
}
return collection;
@@ -180,16 +179,14 @@
Splittable values = data.get(1);
for (int i = 0, j = keys.size(); i < j; i++) {
Object key = keys.isNull(i) ? null :
keyDecoder.decode(keys.get(i));
- Object value = values.isNull(i) ? null
- : valueDecoder.decode(values.get(i));
+ Object value = values.isNull(i) ? null :
valueDecoder.decode(values.get(i));
toReturn.put(key, value);
}
} else {
ValueCoder keyValueDecoder = (ValueCoder) keyDecoder;
for (String rawKey : data.getPropertyKeys()) {
Object key = keyValueDecoder.decode(rawKey);
- Object value = data.isNull(rawKey) ? null
- : valueDecoder.decode(data.get(rawKey));
+ Object value = data.isNull(rawKey) ? null :
valueDecoder.decode(data.get(rawKey));
toReturn.put(key, value);
}
}
@@ -287,8 +284,7 @@
@Override
public boolean visit(AutoBean<?> bean, Context ctx) {
if (seen.contains(bean)) {
- throw new HaltException(new UnsupportedOperationException(
- "Cycles not supported"));
+ throw new HaltException(new UnsupportedOperationException("Cycles
not supported"));
}
seen.push(bean);
sb.append("{");
@@ -296,8 +292,8 @@
}
@Override
- public boolean visitReferenceProperty(String propertyName,
- AutoBean<?> value, PropertyContext ctx) {
+ public boolean visitReferenceProperty(String propertyName, AutoBean<?>
value,
+ PropertyContext ctx) {
if (value != null) {
encodeProperty(propertyName, value.as(), ctx);
}
@@ -305,17 +301,14 @@
}
@Override
- public boolean visitValueProperty(String propertyName, Object value,
- PropertyContext ctx) {
- if (value != null
-
&& !value.equals(ValueCodex.getUninitializedFieldValue(ctx.getType()))) {
+ public boolean visitValueProperty(String propertyName, Object value,
PropertyContext ctx) {
+ if (value != null
&& !value.equals(ValueCodex.getUninitializedFieldValue(ctx.getType()))) {
encodeProperty(propertyName, value, ctx);
}
return false;
}
- private void encodeProperty(String propertyName, Object value,
- PropertyContext ctx) {
+ private void encodeProperty(String propertyName, Object value,
PropertyContext ctx) {
CoderCreator pd = new CoderCreator();
ctx.accept(pd);
Coder decoder = pd.getCoder();
@@ -342,15 +335,14 @@
}
@Override
- public boolean visitReferenceProperty(String propertyName,
- AutoBean<?> value, PropertyContext ctx) {
+ public boolean visitReferenceProperty(String propertyName, AutoBean<?>
value,
+ PropertyContext ctx) {
decodeProperty(propertyName, ctx);
return false;
}
@Override
- public boolean visitValueProperty(String propertyName, Object value,
- PropertyContext ctx) {
+ public boolean visitValueProperty(String propertyName, Object value,
PropertyContext ctx) {
decodeProperty(propertyName, ctx);
return false;
}
@@ -401,8 +393,7 @@
}
}
- public static <T> AutoBean<T> decode(AutoBeanFactory factory, Class<T>
clazz,
- Splittable data) {
+ public static <T> AutoBean<T> decode(AutoBeanFactory factory, Class<T>
clazz, Splittable data) {
return new AutoBeanCodex(factory).doDecode(clazz, data);
}
@@ -416,8 +407,7 @@
* {@link #encode(AutoBean)}
* @return an AutoBean containing the payload contents
*/
- public static <T> AutoBean<T> decode(AutoBeanFactory factory, Class<T>
clazz,
- String payload) {
+ public static <T> AutoBean<T> decode(AutoBeanFactory factory, Class<T>
clazz, String payload) {
Splittable data = StringQuoter.split(payload);
return decode(factory, clazz, data);
}
=======================================
--- /trunk/user/src/com/google/gwt/autobean/shared/AutoBeanUtils.java Wed
Nov 24 12:33:58 2010
+++ /trunk/user/src/com/google/gwt/autobean/shared/AutoBeanUtils.java Wed
Apr 6 04:44:12 2011
@@ -127,8 +127,8 @@
// Remove the entries that are equal, adding nulls for missing
properties
a.accept(new AutoBeanVisitor() {
@Override
- public boolean visitReferenceProperty(String propertyName,
- AutoBean<?> previousValue, PropertyContext ctx) {
+ public boolean visitReferenceProperty(String propertyName,
AutoBean<?> previousValue,
+ PropertyContext ctx) {
if (toReturn.containsKey(propertyName)) {
if (equal(propertyName, previousValue)) {
// No change
@@ -142,8 +142,8 @@
}
@Override
- public boolean visitValueProperty(String propertyName,
- Object previousValue, PropertyContext ctx) {
+ public boolean visitValueProperty(String propertyName, Object
previousValue,
+ PropertyContext ctx) {
if (toReturn.containsKey(propertyName)) {
if (equal(propertyName, previousValue)) {
// No change
@@ -157,14 +157,14 @@
}
private boolean equal(String propertyName, AutoBean<?>
previousValue) {
- return previousValue == null && toReturn.get(propertyName) == null
- || previousValue != null && equal(propertyName,
previousValue.as());
+ return previousValue == null && toReturn.get(propertyName) == null
|| previousValue != null
+ && equal(propertyName, previousValue.as());
}
private boolean equal(String propertyName, Object previousValue) {
Object currentValue = toReturn.get(propertyName);
- return previousValue == null && currentValue == null
- || previousValue != null && previousValue.equals(currentValue);
+ return previousValue == null && currentValue == null ||
previousValue != null
+ && previousValue.equals(currentValue);
}
});
return toReturn;
@@ -184,15 +184,14 @@
// Look at the previous value of all properties
bean.accept(new AutoBeanVisitor() {
@Override
- public boolean visitReferenceProperty(String propertyName,
- AutoBean<?> value, PropertyContext ctx) {
+ public boolean visitReferenceProperty(String propertyName,
AutoBean<?> value,
+ PropertyContext ctx) {
toReturn.put(propertyName, value == null ? null : value.as());
return false;
}
@Override
- public boolean visitValueProperty(String propertyName, Object value,
- PropertyContext ctx) {
+ public boolean visitValueProperty(String propertyName, Object value,
PropertyContext ctx) {
toReturn.put(propertyName, value);
return false;
}
@@ -209,8 +208,8 @@
*/
@SuppressWarnings("unchecked")
public static <T, U extends T> AutoBean<T> getAutoBean(U delegate) {
- return delegate == null ? null : (AutoBean<T>)
WeakMapping.get(delegate,
- AutoBean.class.getName());
+ return delegate == null ? null : (AutoBean<T>)
WeakMapping.get(delegate, AutoBean.class
+ .getName());
}
/**
@@ -225,8 +224,7 @@
if (value instanceof Collection<?> && otherValue instanceof
Collection<?>) {
// Check collections
- return sameOrEquals((Collection<?>) value, (Collection<?>)
otherValue,
- pending, null);
+ return sameOrEquals((Collection<?>) value, (Collection<?>)
otherValue, pending, null);
}
if (value instanceof Map<?, ?> && otherValue instanceof Map<?, ?>) {
@@ -250,8 +248,7 @@
if (value instanceof AutoBean<?> && otherValue instanceof AutoBean<?>)
{
// Check ValueProxies
- return sameOrEquals((AutoBean<?>) value, (AutoBean<?>) otherValue,
- pending);
+ return sameOrEquals((AutoBean<?>) value, (AutoBean<?>) otherValue,
pending);
}
if (value == null ^ otherValue == null) {
@@ -270,8 +267,8 @@
* If a comparison between two AutoBeans is currently pending, this
method
* will skip their comparison.
*/
- private static boolean sameOrEquals(AutoBean<?> value,
- AutoBean<?> otherValue, Map<PendingComparison, Comparison> pending) {
+ private static boolean sameOrEquals(AutoBean<?> value, AutoBean<?>
otherValue,
+ Map<PendingComparison, Comparison> pending) {
if (value == otherValue) {
// Simple case
return true;
@@ -315,8 +312,7 @@
* Compare two collections by size, then by contents. List comparisons
will
* preserve order. All other collections will be treated with bag
semantics.
*/
- private static boolean sameOrEquals(Collection<?> collection,
- Collection<?> otherCollection,
+ private static boolean sameOrEquals(Collection<?> collection,
Collection<?> otherCollection,
Map<PendingComparison, Comparison> pending, Map<Object, Object>
pairs) {
if (collection.size() != otherCollection.size()
|| !collection.getClass().equals(otherCollection.getClass())) {
@@ -443,8 +439,7 @@
}
// Look at keys only in otherValue, and ensure nullness
- List<String> otherKeys = new ArrayList<String>(
- otherValue.getPropertyKeys());
+ List<String> otherKeys = new
ArrayList<String>(otherValue.getPropertyKeys());
otherKeys.removeAll(keys);
for (String key : otherKeys) {
if (!value.isNull(key)) {
=======================================
--- /trunk/user/src/com/google/gwt/autobean/shared/AutoBeanVisitor.java Mon
Mar 21 12:22:19 2011
+++ /trunk/user/src/com/google/gwt/autobean/shared/AutoBeanVisitor.java Wed
Apr 6 04:44:12 2011
@@ -169,8 +169,8 @@
* @param value the property value
* @param ctx a PropertyContext
*/
- public void endVisitCollectionProperty(String propertyName,
- AutoBean<Collection<?>> value, CollectionPropertyContext ctx) {
+ public void endVisitCollectionProperty(String propertyName,
AutoBean<Collection<?>> value,
+ CollectionPropertyContext ctx) {
endVisitReferenceProperty(propertyName, value, ctx);
}
@@ -181,8 +181,8 @@
* @param value the property value
* @param ctx a PropertyContext
*/
- public void endVisitMapProperty(String propertyName,
- AutoBean<Map<?, ?>> value, MapPropertyContext ctx) {
+ public void endVisitMapProperty(String propertyName, AutoBean<Map<?, ?>>
value,
+ MapPropertyContext ctx) {
endVisitReferenceProperty(propertyName, value, ctx);
}
@@ -193,8 +193,7 @@
* @param value the property value
* @param ctx a PropertyContext
*/
- public void endVisitReferenceProperty(String propertyName, AutoBean<?>
value,
- PropertyContext ctx) {
+ public void endVisitReferenceProperty(String propertyName, AutoBean<?>
value, PropertyContext ctx) {
}
/**
@@ -204,8 +203,7 @@
* @param value the property value
* @param ctx a PropertyContext
*/
- public void endVisitValueProperty(String propertyName, Object value,
- PropertyContext ctx) {
+ public void endVisitValueProperty(String propertyName, Object value,
PropertyContext ctx) {
}
/**
@@ -226,8 +224,8 @@
* @param value the property value
* @param ctx a PropertyContext
*/
- public boolean visitCollectionProperty(String propertyName,
- AutoBean<Collection<?>> value, CollectionPropertyContext ctx) {
+ public boolean visitCollectionProperty(String propertyName,
AutoBean<Collection<?>> value,
+ CollectionPropertyContext ctx) {
return visitReferenceProperty(propertyName, value, ctx);
}
@@ -239,8 +237,8 @@
* @param value the property value
* @param ctx a PropertyContext
*/
- public boolean visitMapProperty(String propertyName,
- AutoBean<Map<?, ?>> value, MapPropertyContext ctx) {
+ public boolean visitMapProperty(String propertyName, AutoBean<Map<?, ?>>
value,
+ MapPropertyContext ctx) {
return visitReferenceProperty(propertyName, value, ctx);
}
@@ -252,8 +250,7 @@
* @param value the property value
* @param ctx a PropertyContext
*/
- public boolean visitReferenceProperty(String propertyName, AutoBean<?>
value,
- PropertyContext ctx) {
+ public boolean visitReferenceProperty(String propertyName, AutoBean<?>
value, PropertyContext ctx) {
return true;
}
@@ -264,8 +261,7 @@
* @param value the property value
* @param ctx a PropertyContext
*/
- public boolean visitValueProperty(String propertyName, Object value,
- PropertyContext ctx) {
+ public boolean visitValueProperty(String propertyName, Object value,
PropertyContext ctx) {
return true;
}
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
