summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2007-06-06 06:24:45 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2007-06-06 06:24:45 +0000
commit157c02e3df89764e36cecd028312b09240f62481 (patch)
treed5c2c36341e0d862988430675e0df9b64e75f8ab /src
parent4794bfa77457e9d27bdfefbd006b3440d6131789 (diff)
downloadvaadin-framework-157c02e3df89764e36cecd028312b09240f62481.tar.gz
vaadin-framework-157c02e3df89764e36cecd028312b09240f62481.zip
updated to comform new uidl format
svn changeset:1616/svn branch:trunk
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/client/UIDL.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/UIDL.java b/src/com/itmill/toolkit/terminal/gwt/client/UIDL.java
index 8830366fc5..1b391a93c8 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/UIDL.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/UIDL.java
@@ -23,13 +23,11 @@ public class UIDL {
public String getTag() {
Set keys = json.keySet();
- if (keys.size() != 1)
- throw new IllegalStateException("Expected JSON Object to contain exactly one key, now contains "+ json.keySet());
return "" + keys.iterator().next();
}
public String getAttribute(String name) {
- JSONObject attrs = (JSONObject) json.get("attr");
+ JSONObject attrs = (JSONObject) json.get("a");
if (attrs == null) return null;
return ""+ attrs.get(name);
}
@@ -38,7 +36,7 @@ public class UIDL {
return new Iterator() {
- JSONArray children = (JSONArray) ((JSONObject)json.get(getTag())).get("children");
+ JSONArray children = (JSONArray) ((JSONObject)json.get(getTag())).get("c");
int index=0;
public void remove() {