summaryrefslogtreecommitdiffstats
path: root/client-compiler/src
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2014-07-22 12:59:14 +0300
committerLeif Åstrand <leif@vaadin.com>2014-07-22 12:59:32 +0300
commit86e1c718578f8c81323b47e3efed03178d123c03 (patch)
tree9eaf3779ce79b67963c9fcb3a43c7fd6c39f25fd /client-compiler/src
parentaca2902c9cafcb02db19a0cdd42b1488786c0f56 (diff)
parent6ae7843e46ee906adfc99bde71ded5f296caea74 (diff)
downloadvaadin-framework-86e1c718578f8c81323b47e3efed03178d123c03.tar.gz
vaadin-framework-86e1c718578f8c81323b47e3efed03178d123c03.zip
Merge branch 'master' into grid
Change-Id: I6878b3c64eb5c98174537f4e5864e2ff2cb1863f
Diffstat (limited to 'client-compiler/src')
-rw-r--r--client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java12
1 files changed, 2 insertions, 10 deletions
diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
index 6c242dfd74..a31dafe05c 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/FieldProperty.java
@@ -45,25 +45,17 @@ public class FieldProperty extends Property {
@Override
public void writeSetterBody(TreeLogger logger, SourceWriter w,
String beanVariable, String valueVariable) {
- // Don't try to unbox Longs in javascript, as it's not supported.
- // (#13692)
- boolean shouldUnbox = !"long".equals(field.getType()
- .getSimpleSourceName());
w.println("%s.@%s::%s = %s;", beanVariable, getBeanType()
- .getQualifiedSourceName(), getName(),
- shouldUnbox ? unboxValue(valueVariable) : valueVariable);
+ .getQualifiedSourceName(), getName(), unboxValue(valueVariable));
}
@Override
public void writeGetterBody(TreeLogger logger, SourceWriter w,
String beanVariable) {
- // Longs are not unboxed, as it's not supported. (#13692)
- boolean shouldBox = !"long".equals(field.getType()
- .getSimpleSourceName());
String value = String.format("%s.@%s::%s", beanVariable, getBeanType()
.getQualifiedSourceName(), getName());
w.print("return ");
- w.print(shouldBox ? boxValue(value) : value);
+ w.print(boxValue(value));
w.println(";");
}