Paintable -> Connector

diff --git a/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java b/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java
index 2c5d9384f42fcbfcde0d0a1cbc7b95fe42b29fc2..a8dabb8652e41c68f7431ac260f03b3aa756279e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java
+++ b/src/com/vaadin/terminal/gwt/client/VCaptionWrapper.java
@@ -10,7 +10,7 @@ public class VCaptionWrapper extends FlowPanel {
 
     public static final String CLASSNAME = "v-captionwrapper";
     VCaption caption;
-    ComponentConnector paintable;
+    ComponentConnector wrappedConnector;
 
     /**
      * Creates a new caption wrapper panel.
@@ -24,8 +24,8 @@ public class VCaptionWrapper extends FlowPanel {
             ApplicationConnection client) {
         caption = new VCaption(toBeWrapped, client);
         add(caption);
-        paintable = toBeWrapped;
-        add(paintable.getWidget());
+        wrappedConnector = toBeWrapped;
+        add(wrappedConnector.getWidget());
         setStyleName(CLASSNAME);
     }
 
@@ -33,7 +33,7 @@ public class VCaptionWrapper extends FlowPanel {
         caption.updateCaption();
     }
 
-    public ComponentConnector getPaintable() {
-        return paintable;
+    public ComponentConnector getWrappedConnector() {
+        return wrappedConnector;
     }
 }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
index be7defc2f6c00961837d4eb446e6780722e325a9..5c120418fa5f0718edcf9b027eda57694ad3b219 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
@@ -177,22 +177,22 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector
         getLayoutManager().setNeedsUpdate(this);
     }
 
-    public void updateCaption(ComponentConnector paintable) {
+    public void updateCaption(ComponentConnector childConnector) {
         VGridLayout layout = getWidget();
-        if (VCaption.isNeeded(paintable.getState())) {
-            Cell cell = layout.widgetToCell.get(paintable.getWidget());
+        if (VCaption.isNeeded(childConnector.getState())) {
+            Cell cell = layout.widgetToCell.get(childConnector.getWidget());
             VLayoutSlot layoutSlot = cell.slot;
             VCaption caption = layoutSlot.getCaption();
             if (caption == null) {
-                caption = new VCaption(paintable, getConnection());
+                caption = new VCaption(childConnector, getConnection());
 
-                Widget widget = paintable.getWidget();
+                Widget widget = childConnector.getWidget();
 
                 layout.setCaption(widget, caption);
             }
             caption.updateCaption();
         } else {
-            layout.setCaption(paintable.getWidget(), null);
+            layout.setCaption(childConnector.getWidget(), null);
         }
     }