Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrade TODC Bootstrap to bootstrap 3.2.0 (google theme) #401

Merged
merged 6 commits into from
Jun 30, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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