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/06/14 15:52:18 UTC
git commit: WICKET-5235 exception should not be silently ignored,
workaround for button in compoundPropertyModel is not needed
Updated Branches:
refs/heads/master b5cb9887f -> 11ef03bd1
WICKET-5235 exception should not be silently ignored, workaround for
button in compoundPropertyModel is not needed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/11ef03bd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/11ef03bd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/11ef03bd
Branch: refs/heads/master
Commit: 11ef03bd10bd41ca1041d4937d99d73a3038a323
Parents: b5cb988
Author: svenmeier <sv...@meiers.net>
Authored: Fri Jun 14 15:51:43 2013 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Fri Jun 14 15:51:43 2013 +0200
----------------------------------------------------------------------
.../apache/wicket/markup/html/form/Button.java | 13 +++---------
.../wicket/markup/html/form/ButtonTest.java | 21 ++++++++++++++------
2 files changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef03bd/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Button.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Button.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Button.java
index 99dbfe5..3815600 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Button.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Button.java
@@ -193,17 +193,10 @@ public class Button extends FormComponent<String> implements IFormSubmittingComp
// Default handling for component tag
super.onComponentTag(tag);
- try
+ String value = getDefaultModelObjectAsString();
+ if (value != null && !"".equals(value))
{
- String value = getDefaultModelObjectAsString();
- if (value != null && !"".equals(value))
- {
- tag.put("value", value);
- }
- }
- catch (Exception e)
- {
- // ignore.
+ tag.put("value", value);
}
// If the subclass specified javascript, use that
http://git-wip-us.apache.org/repos/asf/wicket/blob/11ef03bd/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
index 106663f..1f448d8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/ButtonTest.java
@@ -20,6 +20,7 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.resource.IResourceStream;
@@ -39,25 +40,33 @@ public class ButtonTest extends WicketTestCase
@Test
public void valueAttribute()
{
- TestPage testPage = new TestPage();
String text = "some text & another text";
- testPage.buttonModel.setObject(text);
+ TestPage testPage = new TestPage(Model.of(text));
tester.startPage(testPage);
assertTrue(tester.getLastResponseAsString().contains(Strings.escapeMarkup(text)));
}
+ /**
+ * WICKET-5235 button does not use an inherited model
+ */
+ @Test
+ public void buttonDoesNotInheritModel()
+ {
+ TestPage testPage = new TestPage(null);
+ tester.startPage(testPage);
+ }
+
/** */
public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
private static final long serialVersionUID = 1L;
- Form<Void> form;
+ Form<Object> form;
Button button;
- IModel<String> buttonModel = Model.of((String)null);
/** */
- public TestPage()
+ public TestPage(IModel<String> buttonModel)
{
- add(form = new Form<Void>("form"));
+ add(form = new Form<Object>("form", new CompoundPropertyModel<>(new Object())));
form.add(button = new Button("button", buttonModel));
}