diff options
| author | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-06-06 17:19:56 +0000 |
|---|---|---|
| committer | Joonas Lehtinen <joonas.lehtinen@itmill.com> | 2007-06-06 17:19:56 +0000 |
| commit | e03a20a34537f99a94cb60da89ca0f2889897c5f (patch) | |
| tree | c448575533437a4684bc3d39111d3063998b3bad | |
| parent | d961a7912641890ffefd21c4a2c6366936876133 (diff) | |
| download | vaadin-framework-e03a20a34537f99a94cb60da89ca0f2889897c5f.tar.gz vaadin-framework-e03a20a34537f99a94cb60da89ca0f2889897c5f.zip | |
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
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/AjaxApplicationManager.java | 3 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/terminal/web/AjaxVariableMap.java | 10 |
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); |