From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 6 Jun 2007 06:24:45 +0000 (+0000)
Subject: updated to comform new uidl format
X-Git-Tag: 6.7.0.beta1~6329
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=157c02e3df89764e36cecd028312b09240f62481;p=vaadin-framework.git

updated to comform new uidl format

svn changeset:1616/svn branch:trunk
---

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() {