summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2012-01-13 16:06:02 +0000
committerArtur Signell <artur.signell@itmill.com>2012-01-13 16:06:02 +0000
commit988107060ad42f274d5e9f7c24b43ce6d33eb5c7 (patch)
treeb62a311e11e6d934c6a94f6d1e32253ca3308028 /src
parentf3f5f0ebff01df7aa22177629bbac45d4e157243 (diff)
downloadvaadin-framework-988107060ad42f274d5e9f7c24b43ce6d33eb5c7.tar.gz
vaadin-framework-988107060ad42f274d5e9f7c24b43ce6d33eb5c7.zip
Test and fix for #5982 - FormLayout now updates caption style names when the component is updated
svn changeset:22631/svn branch:6.7
Diffstat (limited to 'src')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java6
1 files changed, 2 insertions, 4 deletions
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) {