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 2013/03/26 23:48:50 UTC

git commit: WICKET-5086 AbstractOptions does not use its model

Updated Branches:
  refs/heads/master ed780cc72 -> ba516f020


WICKET-5086 AbstractOptions does not use its model

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ba516f02
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ba516f02
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ba516f02

Branch: refs/heads/master
Commit: ba516f02026d2f0aadb5c2b5c2c1e159b4d31875
Parents: ed780cc
Author: svenmeier <sv...@apache.org>
Authored: Tue Mar 26 23:48:18 2013 +0100
Committer: svenmeier <sv...@apache.org>
Committed: Tue Mar 26 23:48:18 2013 +0100

----------------------------------------------------------------------
 .../form/palette/component/AbstractOptions.java    |    9 +++++++++
 .../markup/html/form/palette/PaletteTestPage.java  |    5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/ba516f02/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
index 73d6e82..f5d3fc0 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java
@@ -199,4 +199,13 @@ public abstract class AbstractOptions<T> extends FormComponent<T>
 	public void updateModel()
 	{
 	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	protected String getModelValue()
+	{
+		return null;
+	}
 }

http://git-wip-us.apache.org/repos/asf/wicket/blob/ba516f02/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTestPage.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTestPage.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTestPage.java
index e987bbf..9e565c4 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTestPage.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteTestPage.java
@@ -21,6 +21,7 @@ import java.util.List;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 
 /**
@@ -31,7 +32,7 @@ public class PaletteTestPage extends WebPage
 
 	private static final long serialVersionUID = 1L;
 
-	public Form<Void> form;
+	public Form<Object> form;
 
 	public Palette<String> palette;
 
@@ -40,7 +41,7 @@ public class PaletteTestPage extends WebPage
 	 */
 	public PaletteTestPage(IModel<List<String>> selected, IModel<List<String>> all)
 	{
-		form = new Form<Void>("form");
+		form = new Form<Object>("form", new CompoundPropertyModel<Object>("WICKET-5086"));
 		add(form);
 
 		IChoiceRenderer<String> choiceRenderer = new IChoiceRenderer<String>()