Updated Branches: refs/heads/master 011d7daa0 -> 8742ff52a
WICKET-4815 let palette be an IGenericComponent Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8742ff52 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8742ff52 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8742ff52 Branch: refs/heads/master Commit: 8742ff52acb948512aed1124b4a5449235bf32c6 Parents: 011d7da Author: svenmeier <[email protected]> Authored: Tue Oct 23 18:01:45 2012 +0200 Committer: svenmeier <[email protected]> Committed: Tue Oct 23 18:01:45 2012 +0200 ---------------------------------------------------------------------- .../wicket/examples/compref/PalettePage.java | 11 +++++++++-- .../markup/html/form/palette/Palette.java | 7 ++++--- 2 files changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/8742ff52/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java index 3fc3a8e..655bb25 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/PalettePage.java @@ -36,6 +36,8 @@ import org.apache.wicket.model.util.ListModel; */ public class PalettePage extends WicketExamplePage { + private static final long serialVersionUID = 1L; + /** * Constructor */ @@ -48,12 +50,17 @@ public class PalettePage extends WicketExamplePage new ArrayList<Person>()), new CollectionModel<Person>(persons), renderer, 10, true); - Form<?> form = new Form("form") + Form<Void> form = new Form<Void>("form") { + private static final long serialVersionUID = 1L; + @Override protected void onSubmit() { - info("selected person(s): " + palette.getDefaultModelObjectAsString()); + for (Person person : palette.getModelObject()) + { + info("selected person: " + person); + } } }; http://git-wip-us.apache.org/repos/asf/wicket/blob/8742ff52/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java index 23d1872..3b89c36 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/Palette.java @@ -33,7 +33,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.html.form.IChoiceRenderer; -import org.apache.wicket.markup.html.panel.Panel; +import org.apache.wicket.markup.html.panel.GenericPanel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.ResourceModel; @@ -74,7 +74,7 @@ import org.apache.wicket.request.resource.ResourceReference; * Type of model object * */ -public class Palette<T> extends Panel +public class Palette<T> extends GenericPanel<Collection<? extends T>> { private static final String SELECTED_HEADER_ID = "selectedHeader"; @@ -155,11 +155,12 @@ public class Palette<T> extends Panel * @param allowOrder * Allow user to move selections up and down */ + @SuppressWarnings("unchecked") public Palette(final String id, final IModel<? extends List<? extends T>> model, final IModel<? extends Collection<? extends T>> choicesModel, final IChoiceRenderer<T> choiceRenderer, final int rows, final boolean allowOrder) { - super(id, model); + super(id, (IModel<Collection<? extends T>>)(IModel<?>)model); this.choicesModel = choicesModel; this.choiceRenderer = choiceRenderer;
