Test and fix for #5982 - FormLayout now updates caption style names when the componen...

svn changeset:22631/svn branch:6.7

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
index 174e66b7aaba0abf988e541989eebd967f818a85..5f2884391fd9ca516c0169e8112a8de4a3a9fd68 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java
@@ -327,8 +327,7 @@ public class VFormLayout extends SimplePanel implements Container {
         }
 
         private void setStyles(String[] styles) {
-            String styleName = CLASSNAME;
-
+            String style = CLASSNAME;
             if (styles != null) {
                 for (String style : styles) {
                     if (ApplicationConnection.DISABLED_CLASSNAME.equals(style)) {
@@ -340,8 +339,7 @@ public class VFormLayout extends SimplePanel implements Container {
                     styleName += " " + CLASSNAME + "-" + style;
                 }
             }
-
-            setStyleName(styleName);
+            setStyleName(style);
         }
 
         public void updateCaption(UIDL uidl) {