aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java3
-rw-r--r--src/com/itmill/toolkit/terminal/web/AjaxVariableMap.java10
2 files changed, 11 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java b/src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java
index 8e80913e80..dae70dc88f 100644
--- 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 5cea2afe06..80980d8b69 100644
--- 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);