From: Joonas Lehtinen Date: Wed, 6 Jun 2007 17:19:56 +0000 (+0000) Subject: Quick UGLY BROKEN HACK to get variable-mapping working TEMPORARILY. X-Git-Tag: 6.7.0.beta1~6314 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e03a20a34537f99a94cb60da89ca0f2889897c5f;p=vaadin-framework.git 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 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);