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 2016/03/07 14:42:24 UTC

[1/3] wicket git commit: Update modelsforms_3.gdoc

Repository: wicket
Updated Branches:
  refs/heads/master ad994436d -> 29b7b571e


Update modelsforms_3.gdoc

Wicket forms - CompoundPropertyModel - traversed components ID not taken into account when creating expression for evaluation of model property

The java code example used two variables with identical name and of different type, not only this would not compile, but the used name could potentially steer wicket beginners in wrong direction of thinking (regarding the matter of topic in this code snippet).

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

Branch: refs/heads/master
Commit: c2b433572d291d01209e908a7440165067b618d0
Parents: ad99443
Author: meno <am...@users.noreply.github.com>
Authored: Mon Mar 7 13:52:38 2016 +0100
Committer: meno <am...@users.noreply.github.com>
Committed: Mon Mar 7 13:52:38 2016 +0100

----------------------------------------------------------------------
 .../src/docs/guide/modelsforms/modelsforms_3.gdoc            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/c2b43357/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_3.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_3.gdoc b/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_3.gdoc
index 91baa8d..25c7840 100644
--- a/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_3.gdoc
+++ b/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_3.gdoc
@@ -174,12 +174,12 @@ Person spouse = new Person("Jill", "Smith");
 person.setSpouse(spouse);
 
 setDefaultModel(new CompoundPropertyModel(person));
-WebMarkupContainer spouse = new WebMarkupContainer("spouse");
+WebMarkupContainer spouseContainer = new WebMarkupContainer("spouse");
 Label name;
-spouse.add(name = new Label("name"));
+spouseContainer.add(name = new Label("name"));
 
-add(spouse);
+add(spouseContainer);
 {code}
 
 The value displayed by label "name" will be "John" and not the spouse's name  "Jill" as you may expect. In this example the label doesn't own a model, so it must search up its container hierarchy for an inheritable model. However, its container (WebMarkup Container with id 'spouse') doesn't own a model, hence the request for a model is forwarded to the parent container, which in this case is the page. In the end the label inherits CompoundPropertyModel from page but only its own id is used for the property expression. The containers in between are never taken into account for the final property expression.
-{note}
\ No newline at end of file
+{note}


[3/3] wicket git commit: Merge branch 'pr-162-master'

Posted by mg...@apache.org.
Merge branch 'pr-162-master'


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

Branch: refs/heads/master
Commit: 29b7b571e65f0fa7431bb911728b001c4e4da669
Parents: ad99443 c010e2d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 7 14:42:04 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 7 14:42:04 2016 +0100

----------------------------------------------------------------------
 .../src/docs/guide/modelsforms/modelsforms_3.gdoc            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------



[2/3] wicket git commit: Merge pull request #1 from amilor/amilor-forms-cpm-sample-code-fix

Posted by mg...@apache.org.
Merge pull request #1 from amilor/amilor-forms-cpm-sample-code-fix

Update modelsforms_3.gdoc

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

Branch: refs/heads/master
Commit: c010e2d9643c467feff09071c3a5b721e40582be
Parents: ad99443 c2b4335
Author: meno <am...@users.noreply.github.com>
Authored: Mon Mar 7 13:56:00 2016 +0100
Committer: meno <am...@users.noreply.github.com>
Committed: Mon Mar 7 13:56:00 2016 +0100

----------------------------------------------------------------------
 .../src/docs/guide/modelsforms/modelsforms_3.gdoc            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------