diff options
| author | Pekka Hyvönen <pekka@vaadin.com> | 2016-10-05 11:32:59 +0300 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2016-10-06 09:56:45 +0300 |
| commit | 45082d1abcfec7f281c986c08fe0c1f065af29f2 (patch) | |
| tree | e9e6b0d12334bac5db8b42c509e56f450617c597 /server/src | |
| parent | a249d3ba04c7dcf54d77d7df7f8d2d73fb7d9f7b (diff) | |
| download | vaadin-framework-45082d1abcfec7f281c986c08fe0c1f065af29f2.tar.gz vaadin-framework-45082d1abcfec7f281c986c08fe0c1f065af29f2.zip | |
Make Valo the default theme
LegacyApplication explicitly uses "reindeer" as default theme.
Extended AbstractTestUI to AbstractReindeerTestUI, that all old tests now inherit.
All new tests should be based on AbstractTestUI.
Also added AbstractReindeerTestUIWithLog for those that needed it.
Removed all found @Theme("valo") and used proper parent test class.
Change-Id: I0bb45850f3f1d39c6f78dac35dfa08acbad427ad
Diffstat (limited to 'server/src')
| -rw-r--r-- | server/src/main/java/com/vaadin/server/Constants.java | 2 | ||||
| -rw-r--r-- | server/src/main/java/com/vaadin/server/LegacyApplication.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/server/src/main/java/com/vaadin/server/Constants.java b/server/src/main/java/com/vaadin/server/Constants.java index daa9d55032..a5ed28cd50 100644 --- a/server/src/main/java/com/vaadin/server/Constants.java +++ b/server/src/main/java/com/vaadin/server/Constants.java @@ -152,7 +152,7 @@ public interface Constants { @Deprecated static final String ERROR_NO_UI_FOUND = "No UIProvider returned a UI for the request."; - static final String DEFAULT_THEME_NAME = "reindeer"; + static final String DEFAULT_THEME_NAME = "valo"; static final String INVALID_SECURITY_KEY_MSG = "Invalid security key."; diff --git a/server/src/main/java/com/vaadin/server/LegacyApplication.java b/server/src/main/java/com/vaadin/server/LegacyApplication.java index 210520cfaa..b417c0f9ee 100644 --- a/server/src/main/java/com/vaadin/server/LegacyApplication.java +++ b/server/src/main/java/com/vaadin/server/LegacyApplication.java @@ -40,7 +40,7 @@ import com.vaadin.ui.UI; @Deprecated public abstract class LegacyApplication implements ErrorHandler { private LegacyWindow mainWindow; - private String theme; + private String theme = "reindeer"; private Map<String, LegacyWindow> legacyUINames = new HashMap<>(); @@ -105,6 +105,9 @@ public abstract class LegacyApplication implements ErrorHandler { /** * Sets the application's theme. * <p> + * The default theme for {@link LegacyApplication} is reindeer, unlike for + * {@link UI} the default theme is valo. + * <p> * Note that this theme can be overridden for a specific UI with * {@link VaadinSession#getThemeForUI(UI)}. Setting theme to be * <code>null</code> selects the default theme. For the available theme |