merge of 'b12b7f42f59f400abd7032f3f2bffba289f3ec7a'

and 'b5a86744c2877d9d738a2fdd2b99970a0160e062'
This commit is contained in:
zzz
2010-04-10 16:06:14 +00:00
13 changed files with 88 additions and 26 deletions

View File

@@ -259,8 +259,7 @@ public class PluginStarter implements Runnable {
String current = ctx.getProperty(CSSHelper.PROP_THEME_NAME);
for (int i = 0; i < tfiles.length; i++) {
String name = tfiles[i].getName();
if (tfiles[i].isDirectory() && (!name.equals("images")) && (!name.equals("classic")) &&
(!name.equals("dark")) && (!name.equals("light")) && (!name.equals("midnight"))) {
if (tfiles[i].isDirectory() && (!Arrays.asList(STANDARD_THEMES).contains(tfiles[i]))) {
ctx.router().removeConfigSetting(ConfigUIHelper.PROP_THEME_PFX + name);
if (name.equals(current))
ctx.router().setConfigSetting(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME);