Updated Branches: refs/heads/master 73daaec32 -> 842043034
WICKET-4621 Add constructor that accepts IModel<String> for AbstractColumn's header Add such constructor for all specializations of AbstractColumn Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/84204303 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/84204303 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/84204303 Branch: refs/heads/master Commit: 8420430347aa320a3b54b0074055d314e72d36f0 Parents: 73daaec Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Jun 22 11:43:30 2012 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Jun 22 11:43:30 2012 +0300 ---------------------------------------------------------------------- .../ajax/builtin/tree/PropertyEditableColumn.java | 14 ++++++++++ .../html/tree/table/AbstractPropertyColumn.java | 20 ++++++++++++++- .../html/tree/table/PropertyRenderableColumn.java | 18 +++++++++++++ .../markup/html/tree/table/PropertyTreeColumn.java | 19 ++++++++++++++ 4 files changed, 70 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/84204303/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/PropertyEditableColumn.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/PropertyEditableColumn.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/PropertyEditableColumn.java index 23db08f..28cf09d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/PropertyEditableColumn.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/PropertyEditableColumn.java @@ -24,6 +24,8 @@ import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation; import org.apache.wicket.extensions.markup.html.tree.table.IColumn; import org.apache.wicket.extensions.markup.html.tree.table.IRenderable; import org.apache.wicket.extensions.markup.html.tree.table.PropertyRenderableColumn; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -48,6 +50,18 @@ public class PropertyEditableColumn<T> extends PropertyRenderableColumn<T> */ public PropertyEditableColumn(ColumnLocation location, String header, String propertyExpression) { + this(location, Model.of(header), propertyExpression); + } + + /** + * Column constructor. + * + * @param location + * @param header + * @param propertyExpression + */ + public PropertyEditableColumn(ColumnLocation location, IModel<String> header, String propertyExpression) + { super(location, header, propertyExpression); } http://git-wip-us.apache.org/repos/asf/wicket/blob/84204303/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractPropertyColumn.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractPropertyColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractPropertyColumn.java index cdc3fcf..c3a5ac1 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractPropertyColumn.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/AbstractPropertyColumn.java @@ -22,8 +22,10 @@ import javax.swing.tree.TreeNode; import org.apache.wicket.Application; import org.apache.wicket.Session; -import org.apache.wicket.util.convert.IConverter; import org.apache.wicket.core.util.lang.PropertyResolver; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; +import org.apache.wicket.util.convert.IConverter; /** @@ -56,6 +58,22 @@ public abstract class AbstractPropertyColumn<T> extends AbstractColumn public AbstractPropertyColumn(final ColumnLocation location, final String header, final String propertyExpression) { + this(location, Model.of(header), propertyExpression); + } + + /** + * Creates the tree column. + * + * @param location + * Specifies how the column should be aligned and what his size should be + * @param header + * Header caption + * @param propertyExpression + * Expression for property access + */ + public AbstractPropertyColumn(final ColumnLocation location, final IModel<String> header, + final String propertyExpression) + { super(location, header); this.propertyExpression = propertyExpression; http://git-wip-us.apache.org/repos/asf/wicket/blob/84204303/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java index eaa7731..2712660 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyRenderableColumn.java @@ -20,6 +20,8 @@ import javax.swing.tree.TreeNode; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; import org.apache.wicket.request.Response; import org.apache.wicket.util.string.Strings; @@ -52,6 +54,22 @@ public class PropertyRenderableColumn<T> extends AbstractPropertyColumn<T> public PropertyRenderableColumn(final ColumnLocation location, final String header, final String propertyExpression) { + this(location, Model.of(header), propertyExpression); + } + + /** + * Creates the column + * + * @param location + * Specifies how the column should be aligned and what his size should be + * @param header + * Header caption + * @param propertyExpression + * Expression for property access + */ + public PropertyRenderableColumn(final ColumnLocation location, final IModel<String> header, + final String propertyExpression) + { super(location, header, propertyExpression); } http://git-wip-us.apache.org/repos/asf/wicket/blob/84204303/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java index 9509872..47fc087 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/PropertyTreeColumn.java @@ -20,6 +20,8 @@ import javax.swing.tree.TreeNode; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; /** @@ -47,6 +49,23 @@ public class PropertyTreeColumn<T> extends AbstractPropertyColumn<T> public PropertyTreeColumn(final ColumnLocation location, final String header, final String propertyExpression) { + this(location, Model.of(header), propertyExpression); + } + + /** + * Creates new column. Checks if the column is not aligned in middle. In case it is, throws an + * exception. + * + * @param location + * Specifies how the column should be aligned and what his size should be + * @param header + * Header caption + * @param propertyExpression + * Expression for property access + */ + public PropertyTreeColumn(final ColumnLocation location, final IModel<String> header, + final String propertyExpression) + { super(location, header, propertyExpression); }
