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 2015/08/26 14:12:51 UTC
wicket git commit: WICKET-5975 move ordering CSS classes to
OrderByBorder as the default in Wicket 6.x
Repository: wicket
Updated Branches:
refs/heads/master 8d23f188e -> 64e07c372
WICKET-5975 move ordering CSS classes to OrderByBorder as the default in Wicket 6.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/64e07c37
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/64e07c37
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/64e07c37
Branch: refs/heads/master
Commit: 64e07c372ddb168078afa3153a74accce045f4c8
Parents: 8d23f18
Author: Sven Meier <sv...@apache.org>
Authored: Wed Aug 26 14:11:43 2015 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Wed Aug 26 14:11:55 2015 +0200
----------------------------------------------------------------------
.../html/repeater/data/sort/OrderByBorder.java | 45 +++++++++++++++++++
.../html/repeater/data/sort/OrderByLink.java | 47 +++++++-------------
2 files changed, 61 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/64e07c37/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
index 291221b..1482a50 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/sort/OrderByBorder.java
@@ -16,7 +16,10 @@
*/
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.border.Border;
+import org.apache.wicket.util.string.Strings;
/**
* A component that wraps markup with an OrderByLink. This has the advantage of being able to add
@@ -36,6 +39,16 @@ public class OrderByBorder<S> extends Border
{
private static final long serialVersionUID = 1L;
+ public static final String SORT_ASCENDING_CSS_CLASS_KEY = CssUtils.key(OrderByLink.class, "ascending");
+
+ public static final String SORT_DESCENDING_CSS_CLASS_KEY = CssUtils.key(OrderByLink.class, "descending");
+
+ public static final String SORT_NONE_CSS_CLASS_KEY = CssUtils.key(OrderByLink.class, "none");
+
+ private final ISortStateLocator<S> stateLocator;
+
+ private final S property;
+
/**
* @param id
* see
@@ -52,6 +65,9 @@ public class OrderByBorder<S> extends Border
{
super(id);
+ this.stateLocator = stateLocator;
+ this.property = property;
+
OrderByLink<S> link = newOrderByLink("orderByLink", property, stateLocator);
addToBorder(link);
link.add(getBodyContainer());
@@ -91,4 +107,33 @@ public class OrderByBorder<S> extends Border
// noop
}
+ @Override
+ public void onComponentTag(final ComponentTag tag)
+ {
+ super.onComponentTag(tag);
+
+ final ISortState<S> sortState = stateLocator.getSortState();
+
+ SortOrder dir = sortState.getPropertySortOrder(property);
+ String cssClass;
+ if (dir == SortOrder.ASCENDING)
+ {
+ cssClass = getString(SORT_ASCENDING_CSS_CLASS_KEY);
+ }
+ else if (dir == SortOrder.DESCENDING)
+ {
+ cssClass = getString(SORT_DESCENDING_CSS_CLASS_KEY);
+ }
+ else
+ {
+ cssClass = getString(SORT_NONE_CSS_CLASS_KEY);
+ }
+
+ if (!Strings.isEmpty(cssClass))
+ {
+ tag.append("class", cssClass, " ");
+ }
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/64e07c37/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 c722e5b..1d77eba 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,11 +16,9 @@
*/
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;
-import org.apache.wicket.util.string.Strings;
/**
* A component that represents a sort header. When the link is clicked it will toggle the state of a
@@ -35,13 +33,20 @@ public class OrderByLink<S> extends Link<Void>
{
private static final long serialVersionUID = 1L;
- public static final String SORT_ASCENDING_CSS_CLASS_KEY = CssUtils.key(OrderByLink.class,
- "ascending");
+ /**
+ * @deprecated use {@link OrderByBorder#SORT_ASCENDING_CSS_CLASS_KEY} instead
+ */
+ public static final String SORT_ASCENDING_CSS_CLASS_KEY = OrderByBorder.SORT_ASCENDING_CSS_CLASS_KEY;
- public static final String SORT_DESCENDING_CSS_CLASS_KEY = CssUtils.key(OrderByLink.class,
- "descending");
+ /**
+ * @deprecated use {@link OrderByBorder#SORT_DESCENDING_CSS_CLASS_KEY} instead
+ */
+ public static final String SORT_DESCENDING_CSS_CLASS_KEY = OrderByBorder.SORT_DESCENDING_CSS_CLASS_KEY;
- public static final String SORT_NONE_CSS_CLASS_KEY = CssUtils.key(OrderByLink.class, "none");
+ /**
+ * @deprecated use {@link OrderByBorder#SORT_NONE_CSS_CLASS_KEY} instead
+ */
+ public static final String SORT_NONE_CSS_CLASS_KEY = OrderByBorder.SORT_NONE_CSS_CLASS_KEY;
/** sortable property */
private final S property;
@@ -135,32 +140,12 @@ public class OrderByLink<S> extends Link<Void>
}
}
+ /**
+ * @deprecated delegates to super implementation only
+ */
@Override
public void onComponentTag(final ComponentTag tag)
{
super.onComponentTag(tag);
-
- final ISortState<S> sortState = stateLocator.getSortState();
-
- SortOrder dir = sortState.getPropertySortOrder(property);
- String cssClass;
- if (dir == SortOrder.ASCENDING)
- {
- cssClass = getString(SORT_ASCENDING_CSS_CLASS_KEY);
- }
- else if (dir == SortOrder.DESCENDING)
- {
- cssClass = getString(SORT_DESCENDING_CSS_CLASS_KEY);
- }
- else
- {
- cssClass = getString(SORT_NONE_CSS_CLASS_KEY);
- }
-
- if (!Strings.isEmpty(cssClass))
- {
- tag.append("class", cssClass, " ");
- }
-
}
-}
+}
\ No newline at end of file