From 069a3de26498735426b47e541c5d7734b0bf6cae Mon Sep 17 00:00:00 2001 From: Maxime Mériouma-Caron Date: Tue, 1 Dec 2015 18:39:32 -0500 Subject: Fix lazy() ClassCast --- .../src/main/java/com/google/gwt/query/rebind/LazyGenerator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/LazyGenerator.java b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/LazyGenerator.java index 0a2cce56..413a5ebc 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/LazyGenerator.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/LazyGenerator.java @@ -207,7 +207,7 @@ public class LazyGenerator extends Generator { } sw.println( - "ctx = GQuery.$(getElement()).as(" + nonLazyType.getQualifiedSourceName() + "." + "ctx = GQuery.$((Element) getElement()).as(" + nonLazyType.getQualifiedSourceName() + "." + classID + ");"); sw.println("for (int i = 0; i < closures.length(); i++) {"); sw.indent(); @@ -220,5 +220,6 @@ public class LazyGenerator extends Generator { sw.println("};"); sw.outdent(); sw.println("}"); + treeLogger.log(TreeLogger.Type.ERROR, sw.toString()); } } -- cgit v1.2.3 From 7ea7d68a297563bd8dfd6c8143171dbc38254aef Mon Sep 17 00:00:00 2001 From: Maxime Mériouma-Caron Date: Tue, 1 Dec 2015 18:40:06 -0500 Subject: Revert debug --- .../src/main/java/com/google/gwt/query/rebind/LazyGenerator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/LazyGenerator.java b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/LazyGenerator.java index 413a5ebc..68d4895e 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/LazyGenerator.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/LazyGenerator.java @@ -220,6 +220,5 @@ public class LazyGenerator extends Generator { sw.println("};"); sw.outdent(); sw.println("}"); - treeLogger.log(TreeLogger.Type.ERROR, sw.toString()); } } -- cgit v1.2.3 From 416c8929052da5f7d0f2f14044b4d784e6eff913 Mon Sep 17 00:00:00 2001 From: Maxime Mériouma-Caron Date: Tue, 1 Dec 2015 19:20:48 -0500 Subject: Fix databind tests --- gwtquery-core/pom.xml | 6 +++--- .../main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java | 2 +- .../src/main/java/com/google/gwt/query/vm/JsonBuilderHandler.java | 2 +- .../com/google/gwt/query/client/dbinding/DataBindingTestJre.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gwtquery-core/pom.xml b/gwtquery-core/pom.xml index e1af3097..eb82473f 100644 --- a/gwtquery-core/pom.xml +++ b/gwtquery-core/pom.xml @@ -8,8 +8,8 @@ - - FF17 + + Chrome -ea -out ${basedir}/target/gwt-junit -checkAssertions @@ -17,7 +17,7 @@ test-prod diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java index e30b7588..672ef1e7 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java @@ -209,7 +209,7 @@ public class JsonBuilderGenerator extends Generator { if (arr != null) { sw.println("return " + ret + ";"); } else { - sw.println("return Arrays.asList(" + ret + ");"); + sw.println("return a == null ? null : Arrays.asList(" + ret + ");"); } } else if (method.getReturnType().isEnum() != null) { sw.println("return " + method.getReturnType().getQualifiedSourceName() diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonBuilderHandler.java b/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonBuilderHandler.java index 395a38a3..0cece814 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonBuilderHandler.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/vm/JsonBuilderHandler.java @@ -349,4 +349,4 @@ public class JsonBuilderHandler implements InvocationHandler { return ispropertyGetters; } -} \ No newline at end of file +} diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java index 1767da99..3652ab43 100644 --- a/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java +++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java @@ -249,9 +249,9 @@ public class DataBindingTestJre extends GWTTestCase { //WHEN fetching that user GUser retrievedUser = GQ.create(GUser.class); retrievedUser.parse(json, true); - + //THEN List phones = retrievedUser.getPhones(); assertNull(phones); } -} \ No newline at end of file +} -- cgit v1.2.3 From b708ab292e707ea5ea1f988a126a6b56ccb2c0ae Mon Sep 17 00:00:00 2001 From: Maxime Mériouma-Caron Date: Tue, 1 Dec 2015 19:22:40 -0500 Subject: Revert FF --- gwtquery-core/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gwtquery-core/pom.xml b/gwtquery-core/pom.xml index eb82473f..e1af3097 100644 --- a/gwtquery-core/pom.xml +++ b/gwtquery-core/pom.xml @@ -8,8 +8,8 @@ - - Chrome + + FF17 -ea -out ${basedir}/target/gwt-junit -checkAssertions @@ -17,7 +17,7 @@ test-prod -- cgit v1.2.3 From 3c40171b04ac1de5a3f477fc9a55cdba6058a085 Mon Sep 17 00:00:00 2001 From: Maxime Mériouma-Caron Date: Tue, 1 Dec 2015 19:35:39 -0500 Subject: Try fix --- .../src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java index 672ef1e7..86bf6377 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/rebind/JsonBuilderGenerator.java @@ -209,7 +209,7 @@ public class JsonBuilderGenerator extends Generator { if (arr != null) { sw.println("return " + ret + ";"); } else { - sw.println("return a == null ? null : Arrays.asList(" + ret + ");"); + sw.println("return (a == null ? null : Arrays.asList(" + ret + "));"); } } else if (method.getReturnType().isEnum() != null) { sw.println("return " + method.getReturnType().getQualifiedSourceName() -- cgit v1.2.3 From 26507a9c986908c3671ced8f14f30a60c84549c1 Mon Sep 17 00:00:00 2001 From: Maxime Mériouma-Caron Date: Tue, 1 Dec 2015 20:21:32 -0500 Subject: Fix databinding --- .../java/com/google/gwt/query/client/builders/JsonBuilderBase.java | 6 ++++++ .../com/google/gwt/query/client/dbinding/DataBindingTestJre.java | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java b/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java index 996f245c..113d6fd6 100644 --- a/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java +++ b/gwtquery-core/src/main/java/com/google/gwt/query/client/builders/JsonBuilderBase.java @@ -26,6 +26,7 @@ import com.google.gwt.query.client.js.JsObjectArray; import com.google.gwt.query.client.js.JsUtils; import java.util.Arrays; +import java.util.Collection; import java.util.List; /** @@ -166,6 +167,11 @@ public abstract class JsonBuilderBase> implements J public T set(Object key, Object val) { if (val instanceof IsProperties) { p.set(key, ((IsProperties) val).getDataImpl()); + } else if (val instanceof Object[]) { + setArrayBase(String.valueOf(key), (Object[]) val); + } else if (val instanceof Collection) { + Collection collection = (Collection) val; + setArrayBase(String.valueOf(key), collection.toArray(new Object[collection.size()])); } else { p.set(key, val); } diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java index 3652ab43..903ef138 100644 --- a/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java +++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java @@ -230,11 +230,11 @@ public class DataBindingTestJre extends GWTTestCase { user.set("name", "Random Name"); user.set("phones", Collections.emptyList()); String json = user.toJson(); - + //WHEN fetching that user GUser retrievedUser = GQ.create(GUser.class); retrievedUser.parse(json, true); - + //THEN assertEquals(0, retrievedUser.getPhones().size()); } -- cgit v1.2.3