Addresses #349 (comment)

Simplifies DefaultThemeProvider#defaultTheme() methods
martin-g · Nov 19, 2014 · 58a8e22 · 58a8e22
1 parent fc81375
commit 58a8e22
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/bootstrap-core/src/main/java/de/agilecoders/wicket/core/settings/DefaultThemeProvider.java b/bootstrap-core/src/main/java/de/agilecoders/wicket/core/settings/DefaultThemeProvider.java
@@ -98,27 +98,26 @@ public DefaultThemeProvider addDefaultTheme(final ITheme theme) {
     /**
      * sets the default theme.
      *
-     * @param theme The new default theme
+     * @param newDefaultTheme The new default theme
      * @return This instance
      */
-    public DefaultThemeProvider defaultTheme(final ITheme theme) {
-        return defaultTheme(theme.name());
+    public DefaultThemeProvider defaultTheme(final ITheme newDefaultTheme) {
+        if (newDefaultTheme != null && !newDefaultTheme.equals(defaultTheme)) {
+            defaultTheme = newDefaultTheme;
+        }
+
+        return this;
     }
 
     /**
      * sets the default theme.
      *
-     * @param themeName The new default theme
+     * @param themeName The name of the new default theme
      * @return This instance
      */
     public DefaultThemeProvider defaultTheme(final String themeName) {
         ITheme newDefaultTheme = byName(themeName);
-
-        if (newDefaultTheme != null && !newDefaultTheme.equals(defaultTheme)) {
-            defaultTheme = newDefaultTheme;
-        }
-
-        return this;
+        return defaultTheme(newDefaultTheme);
     }
 
     @Override