Skip to content

Commit

Permalink
Merge pull request #401 from l0rdn1kk0n/issue_349
Browse files Browse the repository at this point in the history
upgrade TODC Bootstrap to bootstrap 3.2.0 (google theme) (related to issues #349 and #396)
  • Loading branch information
l0rdn1kk0n committed Jun 30, 2014
2 parents 6a79fe5 + f28a91b commit cb1ff9e
Show file tree
Hide file tree
Showing 45 changed files with 104 additions and 556 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,22 @@
import org.apache.wicket.util.string.Strings;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
* # Description
*
* A default {@link ThemeProvider} implementation that only contains
* the {@link de.agilecoders.wicket.core.markup.html.themes.bootstrap.BootstrapTheme}.
*
* @author miha
* # Usage
*
* ```java
* settings.setThemeProvider(new DefaultThemeProvider(settings));
* ```
*
* @author Michael Haitz <[email protected]>
*/
public class DefaultThemeProvider implements ThemeProvider {

Expand Down Expand Up @@ -106,7 +115,7 @@ public DefaultThemeProvider defaultTheme(final ITheme theme) {
public DefaultThemeProvider defaultTheme(final String themeName) {
ITheme newDefaultTheme = byName(themeName);

if (defaultTheme != newDefaultTheme) {
if (newDefaultTheme != null && !newDefaultTheme.equals(defaultTheme)) {
defaultTheme = newDefaultTheme;
}

Expand All @@ -128,7 +137,7 @@ public ITheme byName(String name) {

@Override
public List<ITheme> available() {
return new ArrayList<ITheme>(themes);
return Collections.unmodifiableList(themes);
}

@Override
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit cb1ff9e

Please sign in to comment.