Quick UGLY BROKEN HACK to get variable-mapping working TEMPORARILY.

In real life - we should just get rid of variablemap alltogether.
(it should not be needed anymore as we deprecated variableids in
favour of paintableids)

svn changeset:1631/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java b/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java
index 8e80913e80feaa767a472711cf042a92054f5f06..dae70dc88f5a2f57486ad7b2c3cee4e16a01b01c 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java
+++ b/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java
@@ -86,7 +86,8 @@ public class AjaxApplicationManager implements
 
        private HashSet dirtyPaintabletSet = new HashSet();
 
-       private WeakHashMap paintableIdMap = new WeakHashMap();
+       // TODO THIS TEMPORARY HACK IS ONLY HERE TO MAKE GWT DEVEL EASIER
+    static WeakHashMap paintableIdMap = new WeakHashMap();
 
        private int idSequence = 0;
 

diff --git a/src/com/itmill/toolkit/terminal/web/AjaxVariableMap.java b/src/com/itmill/toolkit/terminal/web/AjaxVariableMap.java
index 5cea2afe06df04f7a3ed2fd0983f4cd97e277baf..80980d8b6964beb7ff7d75f494bf773ecf0aaf61 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/AjaxVariableMap.java
+++ b/src/com/itmill/toolkit/terminal/web/AjaxVariableMap.java
@@ -141,7 +141,15 @@ public class AjaxVariableMap {
 
                        if (id == null) {
                                // Generates new id and register it
-                               id = "v" + String.valueOf(++lastId);
+
+// ----------
+// TODO This HACK is only included for testing GWT integration                         
+//Original                             id = "v" + String.valueOf(++lastId);
+                               Object pid = AjaxApplicationManager.paintableIdMap.get(owner);
+                               id = pid + "_"+name;
+// ----------
+                               
+                               
                                nameToIdMap.put(name, id);
                                idToOwnerMap.put(id, new WeakReference(owner));
                                idToNameMap.put(id, name);