You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/02/06 09:52:00 UTC
[19/38] git commit: WICKET-5011 added hook #isSelected(IModel) to
support non-equals() objects
WICKET-5011 added hook #isSelected(IModel) to support non-equals()
objects
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5d821d28
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5d821d28
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5d821d28
Branch: refs/heads/reference-guide
Commit: 5d821d28cf60efed1096a004681afc4d4c266859
Parents: a908236
Author: svenmeier <sv...@apache.org>
Authored: Wed Jan 30 10:09:24 2013 +0100
Committer: svenmeier <sv...@apache.org>
Committed: Wed Jan 30 10:09:24 2013 +0100
----------------------------------------------------------------------
.../extensions/markup/html/form/select/Select.java | 14 +++-
.../markup/html/form/select/SelectTest.java | 23 +++--
.../markup/html/form/select/SelectTestPage2.html | 10 ++
.../markup/html/form/select/SelectTestPage2.java | 68 +++++++++++++++
4 files changed, 104 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5d821d28/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
index a3f96ad..1434f84 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/Select.java
@@ -247,7 +247,19 @@ public class Select<T> extends FormComponent<T>
return false;
}
- return compareModels(getDefaultModelObject(), option.getDefaultModelObject());
+ return isSelected(option.getDefaultModel());
+ }
+
+ /**
+ * Does the given model contain a selected value.
+ *
+ * @param model
+ * model to test on selection
+ * @return selected
+ */
+ protected boolean isSelected(IModel<?> model)
+ {
+ return compareModels(getDefaultModelObject(), model.getObject());
}
private boolean compareModels(final Object selected, final Object value)
http://git-wip-us.apache.org/repos/asf/wicket/blob/5d821d28/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java
index 429298c..8753a66 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTest.java
@@ -17,7 +17,6 @@
package org.apache.wicket.extensions.markup.html.form.select;
import org.apache.wicket.WicketTestCase;
-import org.junit.Before;
import org.junit.Test;
/**
@@ -26,15 +25,6 @@ import org.junit.Test;
public class SelectTest extends WicketTestCase
{
- private SelectTestPage page;
-
- @Before
- public void setUp() throws Exception
- {
- page = new SelectTestPage();
- tester.startPage(page);
- }
-
/**
* WICKET-4276
*
@@ -43,6 +33,10 @@ public class SelectTest extends WicketTestCase
@Test
public void rawInputKeepsSelectionOnError() throws Exception
{
+ SelectTestPage page = new SelectTestPage();
+
+ tester.startPage(page);
+
tester.getRequest().setParameter("select", page.option1.getValue());
page.form.onFormSubmitted();
@@ -54,4 +48,13 @@ public class SelectTest extends WicketTestCase
// ... but option1 is selected anyway through rawInput
assertTrue(page.select.isSelected(page.option1));
}
+
+ @Test
+ public void selectionWithouEquals()
+ {
+
+ SelectTestPage2 page = new SelectTestPage2();
+
+ assertTrue(page.select.isSelected(page.option0));
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/5d821d28/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.html
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.html b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.html
new file mode 100644
index 0000000..d62a8db
--- /dev/null
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>SelectTestPage</title></head>
+<body>
+ <form wicket:id="form">
+ <select wicket:id="select">
+ <option wicket:id="option0"></option>
+ </select>
+ </form>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/5d821d28/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.java
new file mode 100644
index 0000000..4a22e72
--- /dev/null
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/select/SelectTestPage2.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.extensions.markup.html.form.select;
+
+import java.io.Serializable;
+
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+/**
+ */
+public class SelectTestPage2 extends WebPage
+{
+
+ public Form<Void> form;
+ public Select<Foo> select;
+ public SelectOption<Foo> option0;
+
+ public SelectTestPage2()
+ {
+ form = new Form<Void>("form");
+ add(form);
+
+ select = new Select<Foo>("select", new Model<Foo>(new Foo("foo")))
+ {
+ /**
+ * Selection based custom equality.
+ */
+ @Override
+ protected boolean isSelected(IModel<?> model)
+ {
+ return ((Foo)model.getObject()).string == getModelObject().string;
+ }
+ };
+ form.add(select);
+
+ select.add(option0 = new SelectOption<Foo>("option0", new Model<Foo>(new Foo("foo"))));
+ }
+
+ /**
+ * Model object without equals implementation.
+ */
+ public static class Foo implements Serializable
+ {
+ public String string;
+
+ public Foo(String string)
+ {
+ this.string = string;
+ }
+ }
+}
\ No newline at end of file