From af8159f0fe099bdaf478348595ae205e7cec20b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Mon, 16 Apr 2012 14:26:56 +0300
Subject: [PATCH] Rename paintable -> connector internally

---
 .../terminal/gwt/client/LayoutManager.java    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/com/vaadin/terminal/gwt/client/LayoutManager.java b/src/com/vaadin/terminal/gwt/client/LayoutManager.java
index d0bd841dad..07b8debc79 100644
--- a/src/com/vaadin/terminal/gwt/client/LayoutManager.java
+++ b/src/com/vaadin/terminal/gwt/client/LayoutManager.java
@@ -30,7 +30,7 @@ public class LayoutManager {
     private static final boolean debugLogging = false;
 
     private ApplicationConnection connection;
-    private final Set<Element> measuredNonPaintableElements = new HashSet<Element>();
+    private final Set<Element> measuredNonConnectorElements = new HashSet<Element>();
     private final MeasuredSize nullSize = new MeasuredSize();
 
     private LayoutDependencyTree currentDependencyTree;
@@ -79,7 +79,7 @@ public class LayoutManager {
             measuredSize = new MeasuredSize();
 
             if (ConnectorMap.get(connection).getConnector(element) == null) {
-                measuredNonPaintableElements.add(element);
+                measuredNonConnectorElements.add(element);
             }
             setMeasuredSize(element, measuredSize);
         }
@@ -195,7 +195,7 @@ public class LayoutManager {
         }
         needsMeasure.clear();
 
-        measureNonPaintables();
+        measureNonConnectors();
 
         VConsole.log("Layout init in " + totalDuration.elapsedMillis() + " ms");
 
@@ -473,12 +473,12 @@ public class LayoutManager {
         }
     }
 
-    private void measureNonPaintables() {
-        for (Element element : measuredNonPaintableElements) {
+    private void measureNonConnectors() {
+        for (Element element : measuredNonConnectorElements) {
             measuredAndUpdate(element, getMeasuredSize(element, null));
         }
-        VConsole.log("Measured " + measuredNonPaintableElements.size()
-                + " non paintable elements");
+        VConsole.log("Measured " + measuredNonConnectorElements.size()
+                + " non connector elements");
     }
 
     private MeasureResult measuredAndUpdate(Element element,
@@ -518,15 +518,15 @@ public class LayoutManager {
         }
     }
 
-    private static boolean isManagedLayout(ComponentConnector paintable) {
-        return paintable instanceof ManagedLayout;
+    private static boolean isManagedLayout(ComponentConnector connector) {
+        return connector instanceof ManagedLayout;
     }
 
     public void forceLayout() {
-        ConnectorMap paintableMap = connection.getConnectorMap();
-        ComponentConnector[] paintableWidgets = paintableMap
+        ConnectorMap connectorMap = connection.getConnectorMap();
+        ComponentConnector[] componentConnectors = connectorMap
                 .getComponentConnectors();
-        for (ComponentConnector connector : paintableWidgets) {
+        for (ComponentConnector connector : componentConnectors) {
             if (connector instanceof ManagedLayout) {
                 setNeedsLayout((ManagedLayout) connector);
             }
@@ -700,7 +700,7 @@ public class LayoutManager {
 
     private void stopMeasuringIfUnecessary(Element element) {
         if (!needsMeasure(element)) {
-            measuredNonPaintableElements.remove(element);
+            measuredNonConnectorElements.remove(element);
             setMeasuredSize(element, null);
         }
     }
-- 
2.39.5