From 4d2b5c2ab1ddf5194458270807d4cc476618ef76 Mon Sep 17 00:00:00 2001 From: Marc Englund Date: Tue, 17 Apr 2012 12:10:51 +0300 Subject: [PATCH] Fixes #8669 by prefixing field names with "json_" instead of just "json" to avoid clashes. --- .../terminal/gwt/widgetsetutils/SerializerGenerator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java index 18bc5439ec..d3ed9fe484 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java @@ -167,8 +167,8 @@ public class SerializerGenerator extends Generator { logger.log(Type.DEBUG, "* Processing field " + fieldName + " in " + beanQualifiedSourceName + " (" + beanType.getName() + ")"); - String jsonFieldName = "json" + fieldName; - // JSONArray jsonHeight = (JSONArray) jsonValue.get("height"); + String jsonFieldName = "json_" + fieldName; + // JSONArray json_Height = (JSONArray) jsonValue.get("height"); sourceWriter.println("JSONArray " + jsonFieldName + " = (JSONArray) jsonValue.get(\"" + fieldName + "\");"); -- 2.39.5