Repository: wicket Updated Branches: refs/heads/master c1a7ef050 -> e1661fe61
Make IColumn#isSortable() a default method that uses #getSortProperty() to decide, as AbstractColumn was doing until now. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e1661fe6 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e1661fe6 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e1661fe6 Branch: refs/heads/master Commit: e1661fe61d15c19975af17ab9eabfaa8831c2633 Parents: c1a7ef0 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Mar 16 21:30:52 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Mar 16 21:30:52 2016 +0100 ---------------------------------------------------------------------- .../html/repeater/data/table/AbstractColumn.java | 18 ------------------ .../markup/html/repeater/data/table/IColumn.java | 5 ++++- 2 files changed, 4 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e1661fe6/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 4f55f81..3ef1f61 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,36 +66,18 @@ public abstract class AbstractColumn<T, S> implements IStyledColumn<T, S> return displayModel; } - /** - * @see org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn#getSortProperty() - */ @Override public S getSortProperty() { return sortProperty; } - /** - * @see org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn#isSortable() - */ - @Override - public boolean isSortable() - { - return getSortProperty() != null; - } - - /** - * @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()); } - /** - * @see org.apache.wicket.model.IDetachable#detach() - */ @Override public void detach() { http://git-wip-us.apache.org/repos/asf/wicket/blob/e1661fe6/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java index 6eba7b0..48f0f51 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/IColumn.java @@ -56,7 +56,10 @@ public interface IColumn<T, S> extends ICellPopulator<T> * * @return true if header should be sortable */ - boolean isSortable(); + default boolean isSortable() + { + return getSortProperty() != null; + } /** * @return The number of rows the header of this column should span
