]> source.dussan.org Git - vaadin-framework.git/commitdiff
updated to comform new uidl format
authorMatti Tahvonen <matti.tahvonen@itmill.com>
Wed, 6 Jun 2007 06:24:45 +0000 (06:24 +0000)
committerMatti Tahvonen <matti.tahvonen@itmill.com>
Wed, 6 Jun 2007 06:24:45 +0000 (06:24 +0000)
svn changeset:1616/svn branch:trunk

src/com/itmill/toolkit/terminal/gwt/client/UIDL.java

index 8830366fc5fd4894df7afcb41ab0e3d22e6fcbc9..1b391a93c856e3778ee60a1faaeb16b8513fcb26 100644 (file)
@@ -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() {