Author: ehillenius
Date: Mon Apr 30 02:34:09 2007
New Revision: 533648
URL: http://svn.apache.org/viewvc?view=rev&rev=533648
Log:
separate updateModel call isn't needed anymore, added some additional
explaination and tweaked the border of multiplyLabel
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.html
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.html
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.html?view=diff&rev=533648&r1=533647&r2=533648
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.html
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.html
Mon Apr 30 02:34:09 2007
@@ -1,5 +1,5 @@
<html>
<body>
-<wicket:border>[[<wicket:body/>]]</wicket:border>
+<wicket:border>[ <wicket:body/> ]</wicket:border>
</body>
</html>
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.java?view=diff&rev=533648&r1=533647&r2=533648
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/BeforeAndAfterBorder.java
Mon Apr 30 02:34:09 2007
@@ -22,8 +22,10 @@
import org.apache.wicket.markup.html.border.MarkupComponentBorder;
/**
+ * Simple example to show how a border works. Adding this border to e.g. a
label
+ * that displays 'x' results in '[ x ]' being displayed.
+ *
* @author jcompagner
- *
*/
public class BeforeAndAfterBorder extends MarkupComponentBorder
{
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java?view=diff&rev=533648&r1=533647&r2=533648
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java
Mon Apr 30 02:34:09 2007
@@ -104,8 +104,13 @@
.range(0, 100)));
add(new CheckBox("booleanProperty"));
add(new Multiply("multiply"));
- add(new Label("multiplyLabel", new
PropertyModel(getModel(), "multiply"))
- .setComponentBorder(new
BeforeAndAfterBorder()));
+ // display the multiply result
+ Label multiplyLabel = new Label("multiplyLabel", new
PropertyModel(getModel(),
+ "multiply"));
+ // just for fun, add a border so that our result will
be displayed
+ // as '[ x ]'
+ multiplyLabel.setComponentBorder(new
BeforeAndAfterBorder());
+ add(multiplyLabel);
RadioChoice rc = new RadioChoice("numberRadioChoice",
NUMBERS).setSuffix("");
rc.setLabel(new Model("number"));
rc.setRequired(true);
Modified:
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java?view=diff&rev=533648&r1=533647&r2=533648
==============================================================================
---
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java
(original)
+++
incubator/wicket/trunk/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java
Mon Apr 30 02:34:09 2007
@@ -102,11 +102,8 @@
*/
public void updateModel()
{
- // childs are currently updated *after* this component,
- // so if we want to use the updated models of these
- // components, we have to trigger the update manually
- left.updateModel();
- right.updateModel();
+ // note that form components are updated in post order form, so
lhs and
+ // rhs are already updated
setModelObject(new Integer(lhs * rhs));
}
