aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2015-03-20 13:14:02 +0200
committerLeif Åstrand <leif@vaadin.com>2015-03-20 14:40:45 +0200
commit498bccaf26cafb87f94b7982874d5c00c3039665 (patch)
tree8369b3996b4beaf9cf60235b5027018bfaff2704
parentbe3b8a9fdbcd16c7b2b751bf3a8ddefcda8cf96d (diff)
downloadvaadin-framework-498bccaf26cafb87f94b7982874d5c00c3039665.tar.gz
vaadin-framework-498bccaf26cafb87f94b7982874d5c00c3039665.zip
Make UIConnector.replaceTheme() and UIConnector.activateTheme() protected #17235
Change-Id: I4ee650efdc8683dd1d6fedf5e53460c48186ed88
-rw-r--r--client/src/com/vaadin/client/ui/ui/UIConnector.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java
index 9e1da113bf..804ad45f92 100644
--- a/client/src/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java
@@ -847,6 +847,7 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
/**
* Loads the new theme and removes references to the old theme
*
+ * @since 7.4.3
* @param oldTheme
* The name of the old theme
* @param newTheme
@@ -856,7 +857,7 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
* @param newThemeUrl
* The url of the new theme
*/
- private void replaceTheme(final String oldTheme, final String newTheme,
+ protected void replaceTheme(final String oldTheme, final String newTheme,
String oldThemeUrl, final String newThemeUrl) {
LinkElement tagToReplace = null;
@@ -961,10 +962,11 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
* Activates the new theme. Assumes the theme has been loaded and taken into
* use in the browser.
*
- * @since 7.3
+ * @since 7.4.3
* @param newTheme
+ * The name of the new theme
*/
- private void activateTheme(String newTheme) {
+ protected void activateTheme(String newTheme) {
if (activeTheme != null) {
getWidget().getParent().removeStyleName(activeTheme);
VOverlay.getOverlayContainer(getConnection()).removeClassName(