From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 11 Oct 2007 14:15:01 +0000 (+0000)
Subject: fixed removing additional style names, added test for it
X-Git-Tag: 6.7.0.beta1~5859
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4c5dcb75e92ef2eff2f8c5f245e51618ea21b8aa;p=vaadin-framework.git

fixed removing additional style names, added test for it

svn changeset:2500/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 62c178b7c8..8916bcd151 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -420,9 +420,11 @@ public class ApplicationConnection implements FocusListener {
 		if (!visible)
 			return true;
 
+		component.setStyleName(component.getStylePrimaryName());
 		// add additional styles as css classes
-		if (uidl.hasAttribute("style"))
+		if (uidl.hasAttribute("style")) {
 			component.addStyleName(uidl.getStringAttribute("style"));
+		}
 
 		return false;
 	}