summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2014-07-03 14:02:14 +0300
committerHenri Sara <hesara@vaadin.com>2014-07-03 14:08:53 +0300
commit3320dd0eee5d93d73de3eafcc6774b5cb38ea98b (patch)
tree1624514a69d3570a9d8b3e1873f2db4e3ea8f1f7 /shared
parentff8efe1b94b077c24085962db733fbb26f213484 (diff)
downloadvaadin-framework-3320dd0eee5d93d73de3eafcc6774b5cb38ea98b.tar.gz
vaadin-framework-3320dd0eee5d93d73de3eafcc6774b5cb38ea98b.zip
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
Diffstat (limited to 'shared')
-rw-r--r--shared/src/com/vaadin/shared/ui/ui/UIState.java8
1 files changed, 1 insertions, 7 deletions
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;
}
}