You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/08/14 03:00:35 UTC
svn commit: r985419 - in
/wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput:
FormInput.html FormInput.java
Author: ivaynberg
Date: Sat Aug 14 01:00:35 2010
New Revision: 985419
URL: http://svn.apache.org/viewvc?rev=985419&view=rev
Log:
WICKET-2978
Modified:
wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html
wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
Modified: wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html?rev=985419&r1=985418&r2=985419&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html (original)
+++ wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.html Sat Aug 14 01:00:35 2010
@@ -53,15 +53,13 @@
<span wicket:id="numbersGroup">
<label><wicket:message key="select.a.number" /> (RadioGroup)</label>
<span wicket:id="numbers">
- <input type="radio" wicket:id="radio"/>
- <span wicket:id="number"></span>
+ <input type="radio" wicket:id="radio"/><label wicket:id="number" style="display:inline"></label>
</span>
</span>
<span wicket:id="numbersCheckGroup">
<label><wicket:message key="select.one.or.more.numbers" /> (CheckGroup)</label>
<span wicket:id="numbers">
- <input type="checkbox" wicket:id="check"/>
- <span wicket:id="number"></span>
+ <input type="checkbox" wicket:id="check"/><label wicket:id="number" style="display:inline;"></label>
</span>
</span>
<label for="siteSelection"><wicket:message key="your.favorite.sites" /></label>
Modified: wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?rev=985419&r1=985418&r2=985419&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java Sat Aug 14 01:00:35 2010
@@ -35,6 +35,7 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.Radio;
import org.apache.wicket.markup.html.form.RadioChoice;
import org.apache.wicket.markup.html.form.RadioGroup;
+import org.apache.wicket.markup.html.form.SimpleFormComponentLabel;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
@@ -121,8 +122,10 @@ public class FormInput extends WicketExa
@Override
protected void populateItem(ListItem<String> item)
{
- item.add(new Radio<String>("radio", item.getModel()));
- item.add(new Label("number", item.getDefaultModelObjectAsString()));
+ Radio<String> radio = new Radio<String>("radio", item.getModel());
+ radio.setLabel(item.getModel());
+ item.add(radio);
+ item.add(new SimpleFormComponentLabel("number", radio));
};
}.setReuseItems(true);
group.add(persons);
@@ -134,8 +137,10 @@ public class FormInput extends WicketExa
@Override
protected void populateItem(ListItem<String> item)
{
- item.add(new Check<String>("check", item.getModel()));
- item.add(new Label("number", item.getDefaultModelObjectAsString()));
+ Check<String> check = new Check<String>("check", item.getModel());
+ check.setLabel(item.getModel());
+ item.add(check);
+ item.add(new SimpleFormComponentLabel("number", check));
};
}.setReuseItems(true);
checks.add(checksList);