From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 13 Jan 2012 16:06:02 +0000 (+0000)
Subject: Test and fix for #5982 - FormLayout now updates caption style names when the componen... 
X-Git-Tag: 7.0.0.alpha2~485^2~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=988107060ad42f274d5e9f7c24b43ce6d33eb5c7;p=vaadin-framework.git

Test and fix for #5982 - FormLayout now updates caption style names when the component is updated

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 174e66b7aa..5f2884391f 100644
--- 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) {