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 62c178b7c804da60e8d968af5c8a8f5607d4bbeb..8916bcd151b8c592a10fc599000a948099516072 100755 (executable)
--- 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;
        }