From 3320dd0eee5d93d73de3eafcc6774b5cb38ea98b Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Thu, 3 Jul 2014 14:02:14 +0300 Subject: Revert "Allow changing theme on the fly (#2874)" This reverts commit 1b73b00b2875c5eafa3c641b77f5d9efc2f7d929 as well as the related changes to @since, release notes etc. Conflicts: client/src/com/vaadin/client/ResourceLoader.java client/src/com/vaadin/client/communication/TranslatedURLReference.java client/src/com/vaadin/client/ui/ui/UIConnector.java server/src/com/vaadin/ui/UI.java shared/src/com/vaadin/shared/ui/ui/UIState.java uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java Change-Id: Id882dc730f51055f6d17200964bcaf8a1f87a35f --- shared/src/com/vaadin/shared/ui/ui/UIState.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'shared') diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java index 2f51fef6ee..3c3785b7d5 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIState.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java @@ -62,12 +62,6 @@ public class UIState extends TabIndexState { * Configuration for the push channel */ public PushConfigurationState pushConfiguration = new PushConfigurationState(); - /** - * Currently used theme. - * - * @since 7.3 - */ - public String theme; { primaryStyleName = "v-ui"; // Default is 1 for legacy reasons @@ -101,7 +95,7 @@ public class UIState extends TabIndexState { NotificationRole role) { this.prefix = prefix; this.postfix = postfix; - notificationRole = role; + this.notificationRole = role; } } -- cgit v1.2.3