Fixed GridLayout caption rendering

Components that do not delegate caption handling to parent should not
get a caption

diff --git a/src/com/vaadin/terminal/gwt/client/ComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ComponentConnector.java
index 48d988be765a37cf5ed2196710d413775ecf9c56..34f3f13f031e14115855aa27d7e9e46d886185cf 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ComponentConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ComponentConnector.java
@@ -104,4 +104,19 @@ public interface ComponentConnector extends ServerConnector {
 
     public boolean hasEventListener(String eventIdentifier);
 
+    /**
+     * Return true if parent handles caption, false if the paintable handles the
+     * caption itself.
+     * 
+     * <p>
+     * This should always return true and all components should let the parent
+     * handle the caption and use other attributes for internal texts in the
+     * component
+     * </p>
+     * 
+     * @return true if caption handling is delegated to the parent, false if
+     *         parent should not be allowed to render caption
+     */
+    public boolean delegateCaptionHandling();
+
 }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
index 023023293d57e49520527e1f375d34f398ba65e9..9ea03381c4b878b1695d8028d99ca0154ee49d70 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
@@ -219,18 +219,14 @@ public abstract class AbstractComponentConnector extends AbstractConnector
         }
     }
 
-    /**
-     * Return true if parent handles caption, false if the paintable handles the
-     * caption itself.
-     * 
+    /*
+     * (non-Javadoc)
      * 
-     * @deprecated This should always return true and all components should let
-     *             the parent handle the caption and use other attributes for
-     *             internal texts in the component
-     * @return
+     * @see
+     * com.vaadin.terminal.gwt.client.ComponentConnector#delegateCaptionHandling
+     * ()
      */
-    @Deprecated
-    protected boolean delegateCaptionHandling() {
+    public boolean delegateCaptionHandling() {
         return true;
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java b/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java
index b905af3d443c762b1fa6f4f48d030338637dc9d1..ddc9b5943096917f8ab7a9cf6c437c7de746c669 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java
@@ -43,7 +43,7 @@ public class ButtonConnector extends AbstractComponentConnector implements
     }
 
     @Override
-    protected boolean delegateCaptionHandling() {
+    public boolean delegateCaptionHandling() {
         return false;
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/CheckBoxConnector.java b/src/com/vaadin/terminal/gwt/client/ui/CheckBoxConnector.java
index 2c7f43fede4319befa31e93c66768012b9a8fd51..5c9193f08bd8120222438d9e8c3bd089535979f7 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/CheckBoxConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/CheckBoxConnector.java
@@ -19,7 +19,7 @@ public class CheckBoxConnector extends AbstractFieldConnector implements
         Paintable {
 
     @Override
-    protected boolean delegateCaptionHandling() {
+    public boolean delegateCaptionHandling() {
         return false;
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java b/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
index 0ac6f0cb699618a431eae9231bf5091667dbef82..8e05522eb51adb85434d40e4afbedecf4b860b93 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
@@ -49,7 +49,7 @@ public class FormConnector extends AbstractComponentContainerConnector
     }
 
     @Override
-    protected boolean delegateCaptionHandling() {
+    public boolean delegateCaptionHandling() {
         return false;
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
index b3bcc3e58d56702a839736c74be3a83387cba260..1aad705109ce9c68d5ac8d9dccd22f1787b6e4f1 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
@@ -168,7 +168,9 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector
             needCaptionUpdate = false;
 
             for (ComponentConnector child : getChildren()) {
-                updateCaption(child);
+                if (child.delegateCaptionHandling()) {
+                    updateCaption(child);
+                }
             }
         }
         getLayoutManager().setNeedsUpdate(this);

diff --git a/src/com/vaadin/terminal/gwt/client/ui/LinkConnector.java b/src/com/vaadin/terminal/gwt/client/ui/LinkConnector.java
index 12fbefa80cb64bd4985589f557e088dbd6db003f..715e902b244b340596e19a125b9ed79c0cce9087 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/LinkConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/LinkConnector.java
@@ -17,7 +17,7 @@ public class LinkConnector extends AbstractComponentConnector implements
         Paintable {
 
     @Override
-    protected boolean delegateCaptionHandling() {
+    public boolean delegateCaptionHandling() {
         return false;
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java b/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java
index 991a184e57ba354e152753a844bbb78acf458316..bf1299ed271c9d4642c83eadd925cb75b022788a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java
@@ -27,7 +27,7 @@ public class NativeButtonConnector extends AbstractComponentConnector implements
     }
 
     @Override
-    protected boolean delegateCaptionHandling() {
+    public boolean delegateCaptionHandling() {
         return false;
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
index 19470da73a317f8742abbbd49937c04ddbf5b115..529353f9902e3968013e1eb13afbf3c977c27138 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
@@ -86,7 +86,7 @@ public class PanelConnector extends AbstractComponentContainerConnector
     }
 
     @Override
-    protected boolean delegateCaptionHandling() {
+    public boolean delegateCaptionHandling() {
         return false;
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/PopupViewConnector.java b/src/com/vaadin/terminal/gwt/client/ui/PopupViewConnector.java
index 5da77c7e56654372889ecb2161071c051aaae1e4..a409b3e5a53352dd2f83194c15cd78a5fcf73a79 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/PopupViewConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/PopupViewConnector.java
@@ -20,7 +20,7 @@ public class PopupViewConnector extends AbstractComponentContainerConnector
     private boolean centerAfterLayout = false;
 
     @Override
-    protected boolean delegateCaptionHandling() {
+    public boolean delegateCaptionHandling() {
         return false;
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java
index 42b6bbaf5099dbc9ca630e14176cd5a9af25196f..54e6043f1bc72adc0656865d73a54fcefeb9acfa 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java
@@ -15,7 +15,7 @@ public class UnknownComponentConnector extends AbstractComponentConnector
         implements Paintable {
 
     @Override
-    protected boolean delegateCaptionHandling() {
+    public boolean delegateCaptionHandling() {
         return false;
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
index 7c50b0f34f9529ce33fe121bc277270eb6d95427..34a3f9a94f373caa808ca3c76f291e483f16a905 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
@@ -112,7 +112,7 @@ public class WindowConnector extends AbstractComponentContainerConnector
     private WindowServerRPC rpc;
 
     @Override
-    protected boolean delegateCaptionHandling() {
+    public boolean delegateCaptionHandling() {
         return false;
     };