Updated Branches: refs/heads/master b19a3d69b -> e9273ff97
WICKET-4535 Inconsistent use of generics in sorting APIs Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e9273ff9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e9273ff9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e9273ff9 Branch: refs/heads/master Commit: e9273ff97eec59cd6f957ff759639141b988954a Parents: b19a3d6 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Jun 21 13:34:49 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Jun 21 13:34:49 2012 +0300 ---------------------------------------------------------------------- .../data/sort/AjaxFallbackOrderByBorder.java | 10 ++-- .../data/sort/AjaxFallbackOrderByLink.java | 8 +- .../html/repeater/data/sort/OrderByBorder.java | 24 ++++---- .../html/repeater/data/sort/OrderByLink.java | 50 ++++----------- .../html/repeater/data/table/AbstractColumn.java | 8 ++- .../markup/html/repeater/util/SingleSortState.java | 14 +--- 6 files changed, 43 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e9273ff9/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java index f413084..2160e7e 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByBorder.java @@ -49,7 +49,7 @@ public abstract class AjaxFallbackOrderByBorder<S> extends Border public AjaxFallbackOrderByBorder(final String id, final S sortProperty, final ISortStateLocator<S> stateLocator) { - this(id, sortProperty, stateLocator, AjaxFallbackOrderByLink.DefaultCssProvider.getInstance(), + this(id, sortProperty, stateLocator, new AjaxFallbackOrderByLink.DefaultCssProvider<S>(), null); } @@ -63,7 +63,7 @@ public abstract class AjaxFallbackOrderByBorder<S> extends Border * @param cssProvider */ public AjaxFallbackOrderByBorder(final String id, final S sortProperty, - final ISortStateLocator<S> stateLocator, final AjaxFallbackOrderByLink.ICssProvider<String> cssProvider) + final ISortStateLocator<S> stateLocator, final AjaxFallbackOrderByLink.ICssProvider<S> cssProvider) { this(id, sortProperty, stateLocator, cssProvider, null); } @@ -80,7 +80,7 @@ public abstract class AjaxFallbackOrderByBorder<S> extends Border public AjaxFallbackOrderByBorder(final String id, final S sortProperty, final ISortStateLocator<S> stateLocator, final IAjaxCallListener ajaxCallListener) { - this(id, sortProperty, stateLocator, AjaxFallbackOrderByLink.DefaultCssProvider.getInstance(), + this(id, sortProperty, stateLocator, new AjaxFallbackOrderByLink.DefaultCssProvider<S>(), ajaxCallListener); } @@ -96,7 +96,7 @@ public abstract class AjaxFallbackOrderByBorder<S> extends Border */ public AjaxFallbackOrderByBorder(final String id, final S sortProperty, final ISortStateLocator<S> stateLocator, - final AjaxFallbackOrderByLink.ICssProvider<String> cssProvider, final IAjaxCallListener ajaxCallListener) + final AjaxFallbackOrderByLink.ICssProvider<S> cssProvider, final IAjaxCallListener ajaxCallListener) { super(id); AjaxFallbackOrderByLink<S> link = new AjaxFallbackOrderByLink<S>("orderByLink", sortProperty, @@ -119,7 +119,7 @@ public abstract class AjaxFallbackOrderByBorder<S> extends Border } }; addToBorder(link); - add(new AjaxFallbackOrderByLink.CssModifier(link, cssProvider)); + add(new AjaxFallbackOrderByLink.CssModifier<S>(link, cssProvider)); link.add(getBodyContainer()); } http://git-wip-us.apache.org/repos/asf/wicket/blob/e9273ff9/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java index 833d7f8..ed4506d 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/repeater/data/sort/AjaxFallbackOrderByLink.java @@ -57,7 +57,7 @@ public abstract class AjaxFallbackOrderByLink<S> extends OrderByLink<S> implemen * @param cssProvider */ public AjaxFallbackOrderByLink(final String id, final S sortProperty, - final ISortStateLocator<S> stateLocator, final ICssProvider<String> cssProvider) + final ISortStateLocator<S> stateLocator, final ICssProvider<S> cssProvider) { this(id, sortProperty, stateLocator, cssProvider, null); } @@ -72,7 +72,7 @@ public abstract class AjaxFallbackOrderByLink<S> extends OrderByLink<S> implemen public AjaxFallbackOrderByLink(final String id, final S sortProperty, final ISortStateLocator<S> stateLocator) { - this(id, sortProperty, stateLocator, DefaultCssProvider.getInstance(), null); + this(id, sortProperty, stateLocator, new DefaultCssProvider<S>(), null); } /** @@ -86,7 +86,7 @@ public abstract class AjaxFallbackOrderByLink<S> extends OrderByLink<S> implemen public AjaxFallbackOrderByLink(final String id, final S sortProperty, final ISortStateLocator<S> stateLocator, final IAjaxCallListener ajaxCallListener) { - this(id, sortProperty, stateLocator, DefaultCssProvider.getInstance(), ajaxCallListener); + this(id, sortProperty, stateLocator, new DefaultCssProvider<S>(), ajaxCallListener); } /** @@ -99,7 +99,7 @@ public abstract class AjaxFallbackOrderByLink<S> extends OrderByLink<S> implemen * @param ajaxCallListener */ public AjaxFallbackOrderByLink(final String id, final S sortProperty, - final ISortStateLocator<S> stateLocator, final ICssProvider<String> cssProvider, + final ISortStateLocator<S> stateLocator, final ICssProvider<S> cssProvider, final IAjaxCallListener ajaxCallListener) { super(id, sortProperty, stateLocator, cssProvider); http://git-wip-us.apache.org/repos/asf/wicket/blob/e9273ff9/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 82ec252..e8ddcee 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 @@ -39,25 +39,25 @@ public class OrderByBorder<S> extends Border /** * @param id * see - * {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } + * {@link OrderByLink#OrderByLink(java.lang.String, java.lang.Object, org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } * @param property * see - * {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } + * {@link OrderByLink#OrderByLink(java.lang.String, java.lang.Object, org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } * @param stateLocator * see - * {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } + * {@link OrderByLink#OrderByLink(java.lang.String, java.lang.Object, org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } * @param cssProvider * see - * {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } + * {@link OrderByLink#OrderByLink(java.lang.String, java.lang.Object, org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator, org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider) } */ public OrderByBorder(final String id, final S property, - final ISortStateLocator<S> stateLocator, final OrderByLink.ICssProvider<String> cssProvider) + final ISortStateLocator<S> stateLocator, final OrderByLink.ICssProvider<S> cssProvider) { super(id); OrderByLink<S> link = newOrderByLink("orderByLink", property, stateLocator); addToBorder(link); - add(new OrderByLink.CssModifier(link, cssProvider)); + add(new OrderByLink.CssModifier<S>(link, cssProvider)); link.add(getBodyContainer()); } @@ -75,8 +75,8 @@ public class OrderByBorder<S> extends Border protected OrderByLink<S> newOrderByLink(final String id, final S property, final ISortStateLocator<S> stateLocator) { - return new OrderByLink(id, property, stateLocator, - OrderByLink.VoidCssProvider.getInstance()) + return new OrderByLink<S>(id, property, stateLocator, + new OrderByLink.VoidCssProvider<S>()) { private static final long serialVersionUID = 1L; @@ -98,16 +98,16 @@ public class OrderByBorder<S> extends Border /** * @param id - * see {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator)} + * see {@link OrderByLink#OrderByLink(java.lang.String, java.lang.Object, org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator) } * @param property - * see {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator)} + * see {@link OrderByLink#OrderByLink(java.lang.String, java.lang.Object, org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator) } * @param stateLocator - * see {@link OrderByLink#OrderByLink<S></S>(String, String, ISortStateLocator)} + * see {@link OrderByLink#OrderByLink(java.lang.String, java.lang.Object, org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortStateLocator) } */ public OrderByBorder(final String id, final S property, final ISortStateLocator<S> stateLocator) { - this(id, property, stateLocator, OrderByLink.DefaultCssProvider.getInstance()); + this(id, property, stateLocator, new OrderByLink.DefaultCssProvider<S>()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/e9273ff9/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 13e3a38..a7adff8 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 @@ -58,7 +58,7 @@ public class OrderByLink<S> extends Link<Void> */ public OrderByLink(final String id, final S sortProperty, final ISortStateLocator<S> stateLocator) { - this(id, sortProperty, stateLocator, DefaultCssProvider.getInstance()); + this(id, sortProperty, stateLocator, new DefaultCssProvider<S>()); } /** @@ -77,10 +77,10 @@ public class OrderByLink<S> extends Link<Void> * CSS provider that will be used generate the value of class attribute for this link * * @see OrderByLink.ICssProvider - * + * */ public OrderByLink(final String id, final S property, final ISortStateLocator<S> stateLocator, - final ICssProvider<String> cssProvider) + final ICssProvider<S> cssProvider) { super(id); @@ -89,7 +89,7 @@ public class OrderByLink<S> extends Link<Void> this.property = property; this.stateLocator = stateLocator; - add(new CssModifier(this, cssProvider)); + add(new CssModifier<S>(this, cssProvider)); } /** @@ -220,9 +220,9 @@ public class OrderByLink<S> extends Link<Void> * Easily constructible implementation of ICSSProvider * * @author Igor Vaynberg (ivaynberg) - * + * */ - public static class CssProvider implements ICssProvider<String> + public static class CssProvider<S> implements ICssProvider<S> { private static final long serialVersionUID = 1L; @@ -247,10 +247,8 @@ public class OrderByLink<S> extends Link<Void> this.none = none; } - /** - * @see org.apache.wicket.extensions.markup.html.repeater.data.sort.OrderByLink.ICssProvider#getClassAttributeValue(ISortState, Object) - */ - public String getClassAttributeValue(final ISortState<String> state, final String sortProperty) + @Override + public String getClassAttributeValue(final ISortState<S> state, final S sortProperty) { SortOrder dir = state.getPropertySortOrder(sortProperty); @@ -272,24 +270,14 @@ public class OrderByLink<S> extends Link<Void> /** * Convenience implementation of ICssProvider that always returns a null and so never adds a * class attribute - * + * * @author Igor Vaynberg ( ivaynberg ) */ - public static class VoidCssProvider extends CssProvider + public static class VoidCssProvider<S> extends CssProvider<S> { private static final long serialVersionUID = 1L; - private static ICssProvider<String> instance = new VoidCssProvider(); - - /** - * @return singleton instance - */ - public static ICssProvider<String> getInstance() - { - return instance; - } - - private VoidCssProvider() + public VoidCssProvider() { super("", "", ""); } @@ -297,27 +285,17 @@ public class OrderByLink<S> extends Link<Void> /** * Default implementation of ICssProvider - * + * * @author Igor Vaynberg ( ivaynberg ) */ - public static class DefaultCssProvider extends CssProvider + public static class DefaultCssProvider<S> extends CssProvider<S> { private static final long serialVersionUID = 1L; - private static DefaultCssProvider instance = new DefaultCssProvider(); - - private DefaultCssProvider() + public DefaultCssProvider() { super("wicket_orderUp", "wicket_orderDown", "wicket_orderNone"); } - - /** - * @return singleton instance - */ - public static DefaultCssProvider getInstance() - { - return instance; - } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/e9273ff9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java index 6426769..14a3005 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractColumn.java @@ -66,6 +66,7 @@ public abstract class AbstractColumn<T, S> implements IStyledColumn<T, S> /** * @see org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn#getSortProperty() */ + @Override public S getSortProperty() { return sortProperty; @@ -74,6 +75,7 @@ public abstract class AbstractColumn<T, S> implements IStyledColumn<T, S> /** * @see org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn#isSortable() */ + @Override public boolean isSortable() { return getSortProperty() != null; @@ -82,6 +84,7 @@ public abstract class AbstractColumn<T, S> implements IStyledColumn<T, S> /** * @see org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn#getHeader(java.lang.String) */ + @Override public Component getHeader(final String componentId) { return new Label(componentId, getDisplayModel()); @@ -90,6 +93,7 @@ public abstract class AbstractColumn<T, S> implements IStyledColumn<T, S> /** * @see org.apache.wicket.model.IDetachable#detach() */ + @Override public void detach() { if (displayModel != null) @@ -98,9 +102,7 @@ public abstract class AbstractColumn<T, S> implements IStyledColumn<T, S> } } - /** - * @ssee {@link IStyledColumn#getCssClass()} - */ + @Override public String getCssClass() { return null; http://git-wip-us.apache.org/repos/asf/wicket/blob/e9273ff9/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java index 453bb05..caf2d47 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SingleSortState.java @@ -35,10 +35,7 @@ public class SingleSortState<T> implements ISortState<T>, IClusterable SortParam<T> param; - /** - * @see org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState#setPropertySortOrder(T, - * org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder) - */ + @Override public void setPropertySortOrder(final T property, final SortOrder order) { Args.notNull(property, "property"); @@ -57,9 +54,7 @@ public class SingleSortState<T> implements ISortState<T>, IClusterable } } - /** - * @see org.apache.wicket.extensions.markup.html.repeater.data.sort.ISortState#getPropertySortOrder(T) - */ + @Override public SortOrder getPropertySortOrder(final T property) { Args.notNull(property, "property"); @@ -90,13 +85,10 @@ public class SingleSortState<T> implements ISortState<T>, IClusterable this.param = param; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "[SingleSortState sort=" + ((param == null) ? "null" : param.toString()) + "]"; + return "[SingleSortState sort=" + ((param == null) ? "null" : param.toString()) + ']'; } }
