You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/07/01 09:20:38 UTC
[4/6] git commit: WICKET-5257 Make css class strings used in the
framework configurable
WICKET-5257 Make css class strings used in the framework configurable
Use #getString() (i18n) to load the CSS classes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8daef119
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8daef119
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8daef119
Branch: refs/heads/master
Commit: 8daef11930bb9fd8e5ade92752b903e7d8ec1659
Parents: abdf5c3
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 28 12:27:04 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 28 12:27:04 2013 +0300
----------------------------------------------------------------------
.../java/org/apache/wicket/Application.java | 28 --------
.../org/apache/wicket/Application.properties | 23 ++++++
.../apache/wicket/feedback/FeedbackMessage.java | 14 ++--
.../markup/html/form/AutoLabelResolver.java | 16 ++---
.../markup/html/form/FormComponentLabel.java | 15 ++--
.../markup/html/list/OddEvenListItem.java | 8 +--
.../wicket/markup/html/panel/FeedbackPanel.java | 16 ++---
.../wicket/markup/repeater/OddEvenItem.java | 8 +--
.../apache/wicket/settings/ICssSettings.java | 28 --------
.../apache/wicket/settings/def/CssSettings.java | 74 --------------------
.../apache/wicket/extensions/Initializer.java | 18 -----
.../wicket/extensions/Initializer.properties | 10 ++-
.../html/repeater/data/sort/OrderByLink.java | 14 ++--
.../markup/html/tabs/TabbedPanel.java | 12 ++--
14 files changed, 76 insertions(+), 208 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-core/src/main/java/org/apache/wicket/Application.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java
index 16989c6..5cbbdde 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.java
@@ -85,7 +85,6 @@ import org.apache.wicket.session.DefaultPageFactory;
import org.apache.wicket.session.ISessionStore;
import org.apache.wicket.session.ISessionStore.UnboundListener;
import org.apache.wicket.settings.IApplicationSettings;
-import org.apache.wicket.settings.ICssSettings;
import org.apache.wicket.settings.IDebugSettings;
import org.apache.wicket.settings.IExceptionSettings;
import org.apache.wicket.settings.IFrameworkSettings;
@@ -98,7 +97,6 @@ import org.apache.wicket.settings.IResourceSettings;
import org.apache.wicket.settings.ISecuritySettings;
import org.apache.wicket.settings.IStoreSettings;
import org.apache.wicket.settings.def.ApplicationSettings;
-import org.apache.wicket.settings.def.CssSettings;
import org.apache.wicket.settings.def.DebugSettings;
import org.apache.wicket.settings.def.ExceptionSettings;
import org.apache.wicket.settings.def.FrameworkSettings;
@@ -1041,9 +1039,6 @@ public abstract class Application implements UnboundListener, IEventSink
/** The Markup Settings */
private IMarkupSettings markupSettings;
- /** The CSS Settings */
- private ICssSettings cssSettings;
-
/** The Page Settings */
private IPageSettings pageSettings;
@@ -1244,29 +1239,6 @@ public abstract class Application implements UnboundListener, IEventSink
this.markupSettings = markupSettings;
}
-
- /**
- * @return Application's CSS related settings
- */
- public ICssSettings getCssSettings()
- {
- checkSettingsAvailable();
- if (cssSettings == null)
- {
- cssSettings = new CssSettings();
- }
- return cssSettings;
- }
-
- /**
- * @param cssSettings
- */
- public final void setCssSettings(final ICssSettings cssSettings)
- {
- this.cssSettings = cssSettings;
- }
-
-
/**
* @return Application's request logger related settings
*/
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-core/src/main/java/org/apache/wicket/Application.properties
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.properties b/wicket-core/src/main/java/org/apache/wicket/Application.properties
index 0aed4c1..bd36a27 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.properties
@@ -62,3 +62,26 @@ org.apache.wicket.mfu.delete=Delete
uploadTooLarge = File must be less than ${maxSize}.
uploadFailed = File failed to upload: ${exception.localizedMessage}
+
+feedbackMessageUndefinedCssClass=feedbackPanelUNDEFINED
+feedbackMessageDebugCssClass=feedbackPanelDEBUG
+feedbackMessageInfoCssClass=feedbackPanelINFO
+feedbackMessageSuccessCssClass=feedbackPanelSUCCESS
+feedbackMessageWarningCssClass=feedbackPanelWARNING
+feedbackMessageErrorCssClass=feedbackPanelERROR
+feedbackMessageFatalCssClass=feedbackPanelFATAL
+
+formComponentLabelRequiredCssClass=required
+formComponentLabelInvalidCssClass=error
+formComponentLabelDisabledCssClass=disabled
+
+oddItemCssClass=odd
+evenItemCssClass=even
+
+oddListItemCssClass=odd
+evenListItemCssClass=even
+
+autoLabelRequiredCssClass=required
+autoLabelInvalidCssClass=error
+autoLabelDisabledCssClass=disabled
+
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
index 3bd6959..a144912 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
@@ -34,19 +34,19 @@ public class FeedbackMessage implements IDetachable
{
private static final long serialVersionUID = 1L;
- public static final String UNDEFINED_CSS_CLASS_KEY = "wicket-core-feedback-message-undefined-css-class";
+ public static final String UNDEFINED_CSS_CLASS_KEY = "feedbackMessageUndefinedCssClass";
- public static final String DEBUG_CSS_CLASS_KEY = "wicket-core-feedback-message-debug-css-class";
+ public static final String DEBUG_CSS_CLASS_KEY = "feedbackMessageDebugCssClass";
- public static final String INFO_CSS_CLASS_KEY = "wicket-core-feedback-message-info-css-class";
+ public static final String INFO_CSS_CLASS_KEY = "feedbackMessageInfoCssClass";
- public static final String SUCCESS_CSS_CLASS_KEY = "wicket-core-feedback-message-success-css-class";
+ public static final String SUCCESS_CSS_CLASS_KEY = "feedbackMessageSuccessCssClass";
- public static final String WARNING_CSS_CLASS_KEY = "wicket-core-feedback-message-warning-css-class";
+ public static final String WARNING_CSS_CLASS_KEY = "feedbackMessageWarningCssClass";
- public static final String ERROR_CSS_CLASS_KEY = "wicket-core-feedback-message-error-css-class";
+ public static final String ERROR_CSS_CLASS_KEY = "feedbackMessageErrorCssClass";
- public static final String FATAL_CSS_CLASS_KEY = "wicket-core-feedback-message-fatal-css-class";
+ public static final String FATAL_CSS_CLASS_KEY = "feedbackMessageFatalCssClass";
/**
* Constant for an undefined level; note that components might decide not to render anything
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
index 815401a..5de06be 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
@@ -23,7 +23,6 @@ import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
import org.apache.wicket.markup.resolver.IComponentResolver;
-import org.apache.wicket.settings.ICssSettings;
import org.apache.wicket.util.visit.IVisit;
import org.apache.wicket.util.visit.IVisitor;
import org.slf4j.Logger;
@@ -63,12 +62,11 @@ public class AutoLabelResolver implements IComponentResolver
private static final Logger logger = LoggerFactory.getLogger(AutoLabelResolver.class);
- public static final String REQUIRED_CSS_CLASS_KEY = "wicket-core-auto-label-required-css-class";
+ public static final String REQUIRED_CSS_CLASS_KEY = "autoLabelRequiredCssClass";
- public static final String INVALID_CSS_CLASS_KEY = "wicket-core-auto-label-invalid-css-class";
-
- public static final String DISABLED_CSS_CLASS_KEY = "wicket-core-auto-label-disabled-css-class";
+ public static final String INVALID_CSS_CLASS_KEY = "autoLabelInvalidCssClass";
+ public static final String DISABLED_CSS_CLASS_KEY = "autoLabelDisabledCssClass";
static final String WICKET_FOR = ":for";
@@ -193,24 +191,22 @@ public class AutoLabelResolver implements IComponentResolver
super.onComponentTag(tag);
tag.put("for", component.getMarkupId());
- ICssSettings cssSettings = getApplication().getCssSettings();
-
if (component instanceof FormComponent)
{
FormComponent<?> fc = (FormComponent<?>)component;
if (fc.isRequired())
{
- tag.append("class", cssSettings.getCssClass(REQUIRED_CSS_CLASS_KEY), " ");
+ tag.append("class", getString(REQUIRED_CSS_CLASS_KEY), " ");
}
if (!fc.isValid())
{
- tag.append("class", cssSettings.getCssClass(INVALID_CSS_CLASS_KEY), " ");
+ tag.append("class", getString(INVALID_CSS_CLASS_KEY), " ");
}
}
if (!component.isEnabledInHierarchy())
{
- tag.append("class", cssSettings.getCssClass(DISABLED_CSS_CLASS_KEY), " ");
+ tag.append("class", getString(DISABLED_CSS_CLASS_KEY), " ");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java
index a986dd5..75af52f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponentLabel.java
@@ -19,7 +19,6 @@ package org.apache.wicket.markup.html.form;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.parser.XmlTag.TagType;
-import org.apache.wicket.settings.ICssSettings;
import org.apache.wicket.util.lang.Args;
/**
@@ -33,11 +32,11 @@ public class FormComponentLabel extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
- public static final String REQUIRED_CSS_CLASS_KEY = "wicket-core-form-component-label-required-css-class";
+ public static final String REQUIRED_CSS_CLASS_KEY = "formComponentLabelRequiredCssClass";
- public static final String INVALID_CSS_CLASS_KEY = "wicket-core-form-component-label-invalid-css-class";
+ public static final String INVALID_CSS_CLASS_KEY = "formComponentLabelInvalidCssClass";
- public static final String DISABLED_CSS_CLASS_KEY = "wicket-core-form-component-label-disabled-css-class";
+ public static final String DISABLED_CSS_CLASS_KEY = "formComponentLabelDisabledCssClass";
private final LabeledWebMarkupContainer component;
@@ -72,25 +71,23 @@ public class FormComponentLabel extends WebMarkupContainer
tag.put("for", formComponent.getMarkupId());
- ICssSettings cssSettings = getApplication().getCssSettings();
-
if (formComponent instanceof FormComponent<?>)
{
FormComponent<?> fc = (FormComponent<?>) formComponent;
if (fc.isRequired())
{
- tag.append("class", cssSettings.getCssClass(REQUIRED_CSS_CLASS_KEY), " ");
+ tag.append("class", getString(REQUIRED_CSS_CLASS_KEY), " ");
}
if (fc.isValid() == false)
{
- tag.append("class", cssSettings.getCssClass(INVALID_CSS_CLASS_KEY), " ");
+ tag.append("class", getString(INVALID_CSS_CLASS_KEY), " ");
}
}
if (formComponent.isEnabledInHierarchy() == false)
{
- tag.append("class", cssSettings.getCssClass(DISABLED_CSS_CLASS_KEY), " ");
+ tag.append("class", getString(DISABLED_CSS_CLASS_KEY), " ");
}
// always transform the tag to <span></span> so even labels defined as <span/> render
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-core/src/main/java/org/apache/wicket/markup/html/list/OddEvenListItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/OddEvenListItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/OddEvenListItem.java
index 324ce36..a808d5d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/list/OddEvenListItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/list/OddEvenListItem.java
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.html.list;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.settings.ICssSettings;
/**
* ListItem that adds <code>class="odd"</code> or <code>class="even"</code> html attribute depending
@@ -31,9 +30,9 @@ public class OddEvenListItem<T> extends ListItem<T>
{
private static final long serialVersionUID = 1L;
- public static final String ODD_CSS_CLASS_KEY = "wicket-core-odd-list-item-css-class";
+ public static final String ODD_CSS_CLASS_KEY = "oddListItemCssClass";
- public static final String EVEN_CSS_CLASS_KEY = "wicket-core-even-list-item-css-class";
+ public static final String EVEN_CSS_CLASS_KEY = "evenListItemCssClass";
/**
* Constructor
@@ -54,7 +53,6 @@ public class OddEvenListItem<T> extends ListItem<T>
{
super.onComponentTag(tag);
- ICssSettings cssSettings = getApplication().getCssSettings();
- tag.append("class", (getIndex() % 2 == 0) ? cssSettings.getCssClass(EVEN_CSS_CLASS_KEY) : cssSettings.getCssClass(ODD_CSS_CLASS_KEY), " ");
+ tag.append("class", (getIndex() % 2 == 0) ? getString(EVEN_CSS_CLASS_KEY) : getString(ODD_CSS_CLASS_KEY), " ");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
index 97e945f..fe284f5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
@@ -34,7 +34,6 @@ import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.settings.IApplicationSettings;
-import org.apache.wicket.settings.ICssSettings;
/**
@@ -292,30 +291,29 @@ public class FeedbackPanel extends Panel implements IFeedback
*/
protected String getCSSClass(final FeedbackMessage message)
{
- ICssSettings cssSettings = getApplication().getCssSettings();
String cssClass;
switch (message.getLevel())
{
case FeedbackMessage.UNDEFINED:
- cssClass = cssSettings.getCssClass(FeedbackMessage.UNDEFINED_CSS_CLASS_KEY);
+ cssClass = getString(FeedbackMessage.UNDEFINED_CSS_CLASS_KEY);
break;
case FeedbackMessage.DEBUG:
- cssClass = cssSettings.getCssClass(FeedbackMessage.DEBUG_CSS_CLASS_KEY);
+ cssClass = getString(FeedbackMessage.DEBUG_CSS_CLASS_KEY);
break;
case FeedbackMessage.INFO:
- cssClass = cssSettings.getCssClass(FeedbackMessage.INFO_CSS_CLASS_KEY);
+ cssClass = getString(FeedbackMessage.INFO_CSS_CLASS_KEY);
break;
case FeedbackMessage.SUCCESS:
- cssClass = cssSettings.getCssClass(FeedbackMessage.SUCCESS_CSS_CLASS_KEY);
+ cssClass = getString(FeedbackMessage.SUCCESS_CSS_CLASS_KEY);
break;
case FeedbackMessage.WARNING:
- cssClass = cssSettings.getCssClass(FeedbackMessage.WARNING_CSS_CLASS_KEY);
+ cssClass = getString(FeedbackMessage.WARNING_CSS_CLASS_KEY);
break;
case FeedbackMessage.ERROR:
- cssClass = cssSettings.getCssClass(FeedbackMessage.ERROR_CSS_CLASS_KEY);
+ cssClass = getString(FeedbackMessage.ERROR_CSS_CLASS_KEY);
break;
case FeedbackMessage.FATAL:
- cssClass = cssSettings.getCssClass(FeedbackMessage.FATAL_CSS_CLASS_KEY);
+ cssClass = getString(FeedbackMessage.FATAL_CSS_CLASS_KEY);
break;
default:
cssClass = "feedbackPanel" + message.getLevelAsString();
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-core/src/main/java/org/apache/wicket/markup/repeater/OddEvenItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/OddEvenItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/OddEvenItem.java
index 3d3adba..41c29fd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/OddEvenItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/OddEvenItem.java
@@ -18,7 +18,6 @@ package org.apache.wicket.markup.repeater;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.settings.ICssSettings;
/**
* Item that sets class="even" or class="odd" attributes based on its index
@@ -32,9 +31,9 @@ public class OddEvenItem<T> extends Item<T>
{
private static final long serialVersionUID = 1L;
- public static final String ODD_CSS_CLASS_KEY = "wicket-core-odd-item-css-class";
+ public static final String ODD_CSS_CLASS_KEY = "oddItemCssClass";
- public static final String EVEN_CSS_CLASS_KEY = "wicket-core-even-item-css-class";
+ public static final String EVEN_CSS_CLASS_KEY = "evenItemCssClass";
/**
* Constructor
@@ -56,8 +55,7 @@ public class OddEvenItem<T> extends Item<T>
{
super.onComponentTag(tag);
- ICssSettings cssSettings = getApplication().getCssSettings();
- tag.put("class", (getIndex() % 2 == 0) ? cssSettings.getCssClass(EVEN_CSS_CLASS_KEY) : cssSettings.getCssClass(ODD_CSS_CLASS_KEY));
+ tag.put("class", (getIndex() % 2 == 0) ? getString(EVEN_CSS_CLASS_KEY) : getString(ODD_CSS_CLASS_KEY));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-core/src/main/java/org/apache/wicket/settings/ICssSettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/ICssSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/ICssSettings.java
deleted file mode 100644
index 14fb10a..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/settings/ICssSettings.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.settings;
-
-/**
- * Provides means to change the default CSS classes and styles used
- * by the components in Wicket distribution.
- */
-public interface ICssSettings
-{
- String getCssClass(String key);
-
- void setCssClass(String key, String cssClassName);
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-core/src/main/java/org/apache/wicket/settings/def/CssSettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/def/CssSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/def/CssSettings.java
deleted file mode 100644
index 9fbaaa2..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/settings/def/CssSettings.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.settings.def;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.wicket.feedback.FeedbackMessage;
-import org.apache.wicket.markup.html.form.AutoLabelResolver;
-import org.apache.wicket.markup.html.form.FormComponentLabel;
-import org.apache.wicket.markup.html.list.OddEvenListItem;
-import org.apache.wicket.markup.repeater.OddEvenItem;
-import org.apache.wicket.settings.ICssSettings;
-
-/**
- *
- */
-public class CssSettings implements ICssSettings
-{
- private final Map<String, String> cssClassNames;
-
- public CssSettings()
- {
- this.cssClassNames = new HashMap<>();
-
- setCssClass(FormComponentLabel.DISABLED_CSS_CLASS_KEY, "disabled");
- setCssClass(FormComponentLabel.INVALID_CSS_CLASS_KEY, "error");
- setCssClass(FormComponentLabel.REQUIRED_CSS_CLASS_KEY, "required");
-
- setCssClass(AutoLabelResolver.DISABLED_CSS_CLASS_KEY, "disabled");
- setCssClass(AutoLabelResolver.INVALID_CSS_CLASS_KEY, "error");
- setCssClass(AutoLabelResolver.REQUIRED_CSS_CLASS_KEY, "required");
-
- setCssClass(OddEvenItem.ODD_CSS_CLASS_KEY, "odd");
- setCssClass(OddEvenItem.EVEN_CSS_CLASS_KEY, "even");
-
- setCssClass(OddEvenListItem.ODD_CSS_CLASS_KEY, "odd");
- setCssClass(OddEvenListItem.EVEN_CSS_CLASS_KEY, "even");
-
- setCssClass(FeedbackMessage.UNDEFINED_CSS_CLASS_KEY, "feedbackPanelUNDEFINED");
- setCssClass(FeedbackMessage.DEBUG_CSS_CLASS_KEY, "feedbackPanelDEBUG");
- setCssClass(FeedbackMessage.INFO_CSS_CLASS_KEY, "feedbackPanelINFO");
- setCssClass(FeedbackMessage.SUCCESS_CSS_CLASS_KEY, "feedbackPanelSUCCESS");
- setCssClass(FeedbackMessage.WARNING_CSS_CLASS_KEY, "feedbackPanelWARNING");
- setCssClass(FeedbackMessage.ERROR_CSS_CLASS_KEY, "feedbackPanelERROR");
- setCssClass(FeedbackMessage.FATAL_CSS_CLASS_KEY, "feedbackPanelFATAL");
- }
-
- @Override
- public String getCssClass(String key)
- {
- return cssClassNames.get(key);
- }
-
- @Override
- public void setCssClass(String key, String cssClassName)
- {
- cssClassNames.put(key, cssClassName);
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.java
index 2d76e49..53167fd 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.java
@@ -19,9 +19,6 @@ package org.apache.wicket.extensions;
import org.apache.wicket.Application;
import org.apache.wicket.IInitializer;
import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
-import org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink;
-import org.apache.wicket.extensions.markup.html.tabs.TabbedPanel;
-import org.apache.wicket.settings.ICssSettings;
/**
@@ -38,21 +35,6 @@ public class Initializer implements IInitializer
public void init(final Application application)
{
new UploadProgressBar.ComponentInitializer().init(application);
-
- configureCssSettings(application);
- }
-
- private void configureCssSettings(Application application)
- {
- ICssSettings cssSettings = application.getCssSettings();
-
- cssSettings.setCssClass(TabbedPanel.CONTAINER_CSS_CLASS_KEY, "tab-row");
- cssSettings.setCssClass(TabbedPanel.SELECTED_CSS_CLASS_KEY, "selected");
- cssSettings.setCssClass(TabbedPanel.LAST_CSS_CLASS_KEY, "last");
-
- cssSettings.setCssClass(OrderByLink.SORT_ASCENDING_CSS_CLASS_KEY, "wicket_orderUp");
- cssSettings.setCssClass(OrderByLink.SORT_DESCENDING_CSS_CLASS_KEY, "wicket_orderDown");
- cssSettings.setCssClass(OrderByLink.SORT_NONE_CSS_CLASS_KEY, "wicket_orderNone");
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties b/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties
index ddf852e..876cebb 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/Initializer.properties
@@ -20,4 +20,12 @@ datatable.export-file-name=export
UploadProgressBar.starting=Upload starting...
UploadStatusResource.status=${percentageComplete}% finished, ${bytesUploadedString} of ${totalBytesString} at ${transferRateString}; ${remainingTimeString}
-RfcCompliantEmailAddressValidator='${label}' is not a valid email address.
\ No newline at end of file
+RfcCompliantEmailAddressValidator='${label}' is not a valid email address.
+
+orderByLinkSortAscendingCssClass=wicket_orderUp
+orderByLinkSortDescendingCssClass=wicket_orderDown
+orderByLinkSortNoneCssClass=wicket_orderNone
+
+tabbedPanelContainerCssClass=tab-row
+tabbedPanelSelectedCssClass=selected
+tabbedPanelLastCssClass=last
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
index e0d08eb..5266837 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByLink.java
@@ -18,7 +18,6 @@ package org.apache.wicket.extensions.markup.html.repeater.data.sort;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.settings.ICssSettings;
import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
@@ -35,11 +34,11 @@ public class OrderByLink<S> extends Link<Void>
{
private static final long serialVersionUID = 1L;
- public static final String SORT_ASCENDING_CSS_CLASS_KEY = "wicket-extensions-order-by-link-sort-ascending-css-class";
+ public static final String SORT_ASCENDING_CSS_CLASS_KEY = "orderByLinkSortAscendingCssClass";
- public static final String SORT_DESCENDING_CSS_CLASS_KEY = "wicket-extensions-order-by-link-sort-descending-css-class";
+ public static final String SORT_DESCENDING_CSS_CLASS_KEY = "orderByLinkSortDescendingCssClass";
- public static final String SORT_NONE_CSS_CLASS_KEY = "wicket-extensions-order-by-link-sort-none-css-class";
+ public static final String SORT_NONE_CSS_CLASS_KEY = "orderByLinkSortNoneCssClass";
/** sortable property */
private final S property;
@@ -140,20 +139,19 @@ public class OrderByLink<S> extends Link<Void>
final ISortState<S> sortState = stateLocator.getSortState();
- ICssSettings cssSettings = getApplication().getCssSettings();
SortOrder dir = sortState.getPropertySortOrder(property);
String cssClass;
if (dir == SortOrder.ASCENDING)
{
- cssClass = cssSettings.getCssClass(SORT_ASCENDING_CSS_CLASS_KEY);
+ cssClass = getString(SORT_ASCENDING_CSS_CLASS_KEY);
}
else if (dir == SortOrder.DESCENDING)
{
- cssClass = cssSettings.getCssClass(SORT_DESCENDING_CSS_CLASS_KEY);
+ cssClass = getString(SORT_DESCENDING_CSS_CLASS_KEY);
}
else
{
- cssClass = cssSettings.getCssClass(SORT_NONE_CSS_CLASS_KEY);
+ cssClass = getString(SORT_NONE_CSS_CLASS_KEY);
}
if (!Strings.isEmpty(cssClass))
http://git-wip-us.apache.org/repos/asf/wicket/blob/8daef119/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
index 81f868d..ba92582 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tabs/TabbedPanel.java
@@ -79,11 +79,11 @@ public class TabbedPanel<T extends ITab> extends Panel
/** id used for child panels */
public static final String TAB_PANEL_ID = "panel";
- public static final String CONTAINER_CSS_CLASS_KEY = "wicket-extensions-tabbed-panel-container-css-class-key";
+ public static final String CONTAINER_CSS_CLASS_KEY = "tabbedPanelContainerCssClass";
- public static final String SELECTED_CSS_CLASS_KEY = "wicket-extensions-tabbed-panel-selected-css-class-key";
+ public static final String SELECTED_CSS_CLASS_KEY = "tabbedPanelSelectedCssClass";
- public static final String LAST_CSS_CLASS_KEY = "wicket-extensions-tabbed-panel-last-css-class-key";
+ public static final String LAST_CSS_CLASS_KEY = "tabbedPanelLastCssClass";
private final List<T> tabs;
@@ -278,7 +278,7 @@ public class TabbedPanel<T extends ITab> extends Panel
*/
protected String getTabContainerCssClass()
{
- return getApplication().getCssSettings().getCssClass(CONTAINER_CSS_CLASS_KEY);
+ return getString(CONTAINER_CSS_CLASS_KEY);
}
/**
@@ -287,7 +287,7 @@ public class TabbedPanel<T extends ITab> extends Panel
*/
protected String getLastTabCssClass()
{
- return getApplication().getCssSettings().getCssClass(LAST_CSS_CLASS_KEY);
+ return getString(LAST_CSS_CLASS_KEY);
}
/**
@@ -296,7 +296,7 @@ public class TabbedPanel<T extends ITab> extends Panel
*/
protected String getSelectedTabCssClass()
{
- return getApplication().getCssSettings().getCssClass(SELECTED_CSS_CLASS_KEY);
+ return getString(SELECTED_CSS_CLASS_KEY);
}
/**