Changeset ceda855a in vaadin

Timestamp:

03/21/12 13:27:27 (14 months ago)

Author:

Artur Signell <artur@…>

Branches:

master, b1390c580cf5e9ad6adbb6067007d03fb69a92cc, 42c4b2097bc955ca18107c449e04f0d5d5683ca3

Children:

36dca644

Parents:

242b09c8

git-author:

Artur Signell <artur@…> (03/16/12 15:42:06)

git-committer:

Artur Signell <artur@…> (03/21/12 13:27:27)

Message:

Cleaned up code related to storing which type mappings have already been
sent to the client

File:

• src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java (modified) (6 diffs)

src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java

@@ -132 +132 @@
     public static final char VAR_ESCAPE_CHARACTER = '\u001b';
 
-    private final HashMap<Integer, OpenWindowCache> currentlyOpenWindowsInClient = new HashMap<Integer, OpenWindowCache>();
+    private final HashMap<Integer, ClientCache> rootToClientCache = new HashMap<Integer, ClientCache>();
 
     private static final int MAX_BUFFER_SIZE = 64 * 1024;
@@ -800 +800 @@
         JsonPaintTarget paintTarget = new JsonPaintTarget(this, outWriter,
                 !repaintAll);
-        OpenWindowCache windowCache = currentlyOpenWindowsInClient.get(Integer
-                .valueOf(root.getRootId()));
-        if (windowCache == null) {
-            windowCache = new OpenWindowCache();
-            currentlyOpenWindowsInClient.put(Integer.valueOf(root.getRootId()),
-                    windowCache);
-        }
+        ClientCache clientCache = getClientCache(root);
 
         // TODO These seem unnecessary and could be removed/replaced by looping
@@ -1131 +1125 @@
         boolean typeMappingsOpen = false;
         for (Class<? extends Paintable> class1 : usedPaintableTypes) {
-            if (windowCache.cache(class1)) {
+            if (clientCache.cache(class1)) {
                 // client does not know the mapping key for this type, send
                 // mapping to client
@@ -1157 +1151 @@
             dragAndDropService.printJSONResponse(outWriter);
         }
+    }
+
+    private ClientCache getClientCache(Root root) {
+        Integer rootId = Integer.valueOf(root.getRootId());
+        ClientCache cache = rootToClientCache.get(rootId);
+        if (cache == null) {
+            cache = new ClientCache();
+            rootToClientCache.put(rootId, cache);
+        }
+        return cache;
     }
 
@@ -1270 +1274 @@
         }
         // clean WindowCache
-        OpenWindowCache openWindowCache = currentlyOpenWindowsInClient
-                .get(Integer.valueOf(root.getRootId()));
-        if (openWindowCache != null) {
-            openWindowCache.clear();
-        }
+        getClientCache(root).clear();
     }
 
@@ -2192 +2192 @@
      * TODO make customlayout templates (from theme) to be cached here.
      */
-    class OpenWindowCache implements Serializable {
+    class ClientCache implements Serializable {
 
         private final Set<Object> res = new HashSet<Object>();