You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2013/06/28 12:26:41 UTC
git commit: WICKET-5257 standardize CSS keys
Updated Branches:
refs/heads/5257-css-settings 8daef1193 -> b4b451b86
WICKET-5257 standardize CSS keys
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b4b451b8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b4b451b8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b4b451b8
Branch: refs/heads/5257-css-settings
Commit: b4b451b8676a3e623d71567387fbfe590d1f0868
Parents: 8daef11
Author: svenmeier <sv...@meiers.net>
Authored: Fri Jun 28 12:26:08 2013 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Fri Jun 28 12:26:08 2013 +0200
----------------------------------------------------------------------
.../org/apache/wicket/Application.properties | 42 ++++++++++----------
.../wicket/core/util/string/CssUtils.java | 14 +++++++
.../apache/wicket/feedback/FeedbackMessage.java | 18 +++++----
.../markup/html/form/AutoLabelResolver.java | 7 ++--
.../markup/html/form/FormComponentLabel.java | 10 +++--
.../markup/html/list/OddEvenListItem.java | 5 ++-
.../wicket/markup/repeater/OddEvenItem.java | 5 ++-
.../wicket/extensions/Initializer.properties | 12 +++---
.../html/repeater/data/sort/OrderByLink.java | 9 +++--
.../markup/html/tabs/TabbedPanel.java | 8 ++--
10 files changed, 80 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4b451b8/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 bd36a27..1408c9a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Application.properties
+++ b/wicket-core/src/main/java/org/apache/wicket/Application.properties
@@ -63,25 +63,25 @@ 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
+FeedbackMessage.CSS.undefined=feedbackPanelUNDEFINED
+FeedbackMessage.CSS.debug=feedbackPanelDEBUG
+FeedbackMessage.CSS.info=feedbackPanelINFO
+FeedbackMessage.CSS.success=feedbackPanelSUCCESS
+FeedbackMessage.CSS.warning=feedbackPanelWARNING
+FeedbackMessage.CSS.error=feedbackPanelERROR
+FeedbackMessage.CSS.fatal=feedbackPanelFATAL
+
+FormComponentLabel.CSS.required=required
+FormComponentLabel.CSS.invalid=error
+FormComponentLabel.CSS.disabled=disabled
+
+OddEvenItem.CSS.odd=odd
+OddEvenItem.CSS.even=even
+
+OddEvenListItem.CSS.odd=odd
+OddEvenListItem.CSS.even=even
+
+AutoLabel.CSS.required=required
+AutoLabel.CSS.invalid=error
+AutoLabel.CSS.disabled=disabled
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4b451b8/wicket-core/src/main/java/org/apache/wicket/core/util/string/CssUtils.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/string/CssUtils.java b/wicket-core/src/main/java/org/apache/wicket/core/util/string/CssUtils.java
index a4944a3..b065ef5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/string/CssUtils.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/string/CssUtils.java
@@ -103,4 +103,18 @@ public final class CssUtils
}
response.write(" />");
}
+
+ /**
+ * Get a standardized key for a CSS class.
+ *
+ * @param scope
+ * scope of CSS class
+ * @param facet
+ * facet of CSS class
+ * @return CSS key
+ */
+ public static String key(Class<?> scope, String facet)
+ {
+ return scope.getSimpleName() + ".CSS." + facet;
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4b451b8/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 a144912..69adb70 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
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.wicket.Component;
+import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.model.IDetachable;
@@ -34,19 +35,22 @@ public class FeedbackMessage implements IDetachable
{
private static final long serialVersionUID = 1L;
- public static final String UNDEFINED_CSS_CLASS_KEY = "feedbackMessageUndefinedCssClass";
+ public static final String UNDEFINED_CSS_CLASS_KEY = CssUtils.key(FeedbackMessage.class,
+ "undefined");
- public static final String DEBUG_CSS_CLASS_KEY = "feedbackMessageDebugCssClass";
+ public static final String DEBUG_CSS_CLASS_KEY = CssUtils.key(FeedbackMessage.class, "debug");
- public static final String INFO_CSS_CLASS_KEY = "feedbackMessageInfoCssClass";
+ public static final String INFO_CSS_CLASS_KEY = CssUtils.key(FeedbackMessage.class, "info");
- public static final String SUCCESS_CSS_CLASS_KEY = "feedbackMessageSuccessCssClass";
+ public static final String SUCCESS_CSS_CLASS_KEY = CssUtils.key(FeedbackMessage.class,
+ "success");
- public static final String WARNING_CSS_CLASS_KEY = "feedbackMessageWarningCssClass";
+ public static final String WARNING_CSS_CLASS_KEY = CssUtils.key(FeedbackMessage.class,
+ "warning");
- public static final String ERROR_CSS_CLASS_KEY = "feedbackMessageErrorCssClass";
+ public static final String ERROR_CSS_CLASS_KEY = CssUtils.key(FeedbackMessage.class, "error");
- public static final String FATAL_CSS_CLASS_KEY = "feedbackMessageFatalCssClass";
+ public static final String FATAL_CSS_CLASS_KEY = CssUtils.key(FeedbackMessage.class, "fatal");
/**
* Constant for an undefined level; note that components might decide not to render anything
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4b451b8/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 5de06be..723bb83 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
@@ -19,6 +19,7 @@ package org.apache.wicket.markup.html.form;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
@@ -62,11 +63,11 @@ public class AutoLabelResolver implements IComponentResolver
private static final Logger logger = LoggerFactory.getLogger(AutoLabelResolver.class);
- public static final String REQUIRED_CSS_CLASS_KEY = "autoLabelRequiredCssClass";
+ public static final String REQUIRED_CSS_CLASS_KEY = CssUtils.key(AutoLabel.class, "required");
- public static final String INVALID_CSS_CLASS_KEY = "autoLabelInvalidCssClass";
+ public static final String INVALID_CSS_CLASS_KEY = CssUtils.key(AutoLabel.class, "invalid");
- public static final String DISABLED_CSS_CLASS_KEY = "autoLabelDisabledCssClass";
+ public static final String DISABLED_CSS_CLASS_KEY = CssUtils.key(AutoLabel.class, "disabled");
static final String WICKET_FOR = ":for";
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4b451b8/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 75af52f..51ed7d3 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
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.form;
+import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.parser.XmlTag.TagType;
@@ -32,11 +33,14 @@ public class FormComponentLabel extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
- public static final String REQUIRED_CSS_CLASS_KEY = "formComponentLabelRequiredCssClass";
+ public static final String REQUIRED_CSS_CLASS_KEY = CssUtils.key(FormComponentLabel.class,
+ "required");
- public static final String INVALID_CSS_CLASS_KEY = "formComponentLabelInvalidCssClass";
+ public static final String INVALID_CSS_CLASS_KEY = CssUtils.key(FormComponentLabel.class,
+ "invalid");
- public static final String DISABLED_CSS_CLASS_KEY = "formComponentLabelDisabledCssClass";
+ public static final String DISABLED_CSS_CLASS_KEY = CssUtils.key(FormComponentLabel.class,
+ "disabled");
private final LabeledWebMarkupContainer component;
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4b451b8/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 a808d5d..ece1288 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
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.html.list;
+import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
@@ -30,9 +31,9 @@ public class OddEvenListItem<T> extends ListItem<T>
{
private static final long serialVersionUID = 1L;
- public static final String ODD_CSS_CLASS_KEY = "oddListItemCssClass";
+ public static final String ODD_CSS_CLASS_KEY = CssUtils.key(OddEvenListItem.class, "odd");
- public static final String EVEN_CSS_CLASS_KEY = "evenListItemCssClass";
+ public static final String EVEN_CSS_CLASS_KEY = CssUtils.key(OddEvenListItem.class, "even");
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4b451b8/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 41c29fd..ca3a07d 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
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.markup.repeater;
+import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
@@ -31,9 +32,9 @@ public class OddEvenItem<T> extends Item<T>
{
private static final long serialVersionUID = 1L;
- public static final String ODD_CSS_CLASS_KEY = "oddItemCssClass";
+ public static final String ODD_CSS_CLASS_KEY = CssUtils.key(OddEvenItem.class, "odd");
- public static final String EVEN_CSS_CLASS_KEY = "evenItemCssClass";
+ public static final String EVEN_CSS_CLASS_KEY = CssUtils.key(OddEvenItem.class, "even");
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4b451b8/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 876cebb..070958d 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
@@ -22,10 +22,10 @@ UploadStatusResource.status=${percentageComplete}% finished, ${bytesUploadedStri
RfcCompliantEmailAddressValidator='${label}' is not a valid email address.
-orderByLinkSortAscendingCssClass=wicket_orderUp
-orderByLinkSortDescendingCssClass=wicket_orderDown
-orderByLinkSortNoneCssClass=wicket_orderNone
+OrderByLink.CSS.ascending=wicket_orderUp
+OrderByLink.CSS.descending=wicket_orderDown
+OrderByLink.CSS.none=wicket_orderNone
-tabbedPanelContainerCssClass=tab-row
-tabbedPanelSelectedCssClass=selected
-tabbedPanelLastCssClass=last
+TabbedPanel.CSS.container=tab-row
+TabbedPanel.CSS.selected=selected
+TabbedPanel.CSS.last=last
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4b451b8/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 5266837..c722e5b 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
@@ -16,6 +16,7 @@
*/
package org.apache.wicket.extensions.markup.html.repeater.data.sort;
+import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.lang.Args;
@@ -34,11 +35,13 @@ public class OrderByLink<S> extends Link<Void>
{
private static final long serialVersionUID = 1L;
- public static final String SORT_ASCENDING_CSS_CLASS_KEY = "orderByLinkSortAscendingCssClass";
+ public static final String SORT_ASCENDING_CSS_CLASS_KEY = CssUtils.key(OrderByLink.class,
+ "ascending");
- public static final String SORT_DESCENDING_CSS_CLASS_KEY = "orderByLinkSortDescendingCssClass";
+ public static final String SORT_DESCENDING_CSS_CLASS_KEY = CssUtils.key(OrderByLink.class,
+ "descending");
- public static final String SORT_NONE_CSS_CLASS_KEY = "orderByLinkSortNoneCssClass";
+ public static final String SORT_NONE_CSS_CLASS_KEY = CssUtils.key(OrderByLink.class, "none");
/** sortable property */
private final S property;
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4b451b8/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 ba92582..08bf3a7 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
@@ -20,6 +20,7 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.core.util.string.CssUtils;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -79,11 +80,12 @@ 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 = "tabbedPanelContainerCssClass";
+ public static final String CONTAINER_CSS_CLASS_KEY = CssUtils.key(TabbedPanel.class,
+ "container");
- public static final String SELECTED_CSS_CLASS_KEY = "tabbedPanelSelectedCssClass";
+ public static final String SELECTED_CSS_CLASS_KEY = CssUtils.key(TabbedPanel.class, "selected");
- public static final String LAST_CSS_CLASS_KEY = "tabbedPanelLastCssClass";
+ public static final String LAST_CSS_CLASS_KEY = CssUtils.key(TabbedPanel.class, "last");
private final List<T> tabs;