Author: adelbene
Date: Fri Feb 21 19:12:04 2014
New Revision: 1570670
URL: http://svn.apache.org/r1570670
Log:
Corrections suggested by Javier Presti
Modified:
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/forms2/forms2_10.gdoc
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/forms2/forms2_5.gdoc
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/helloWorld/helloWorld_4.gdoc
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/layout/layout_2.gdoc
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/modelsforms/modelsforms_2.gdoc
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/modelsforms/modelsforms_5.gdoc
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/repeaters/repeaters_4.gdoc
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/urls/urls_3.gdoc
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/versioningCaching/versioningCaching_2.gdoc
Modified:
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/forms2/forms2_10.gdoc
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/forms2/forms2_10.gdoc?rev=1570670&r1=1570669&r2=1570670&view=diff
==============================================================================
---
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/forms2/forms2_10.gdoc
(original)
+++
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/forms2/forms2_10.gdoc
Fri Feb 21 19:12:04 2014
@@ -131,7 +131,7 @@ Person bob = new Person("Bob", "Smith");
Person jill = new Person("Jill", "Smith");
List<Person> theSmiths = Arrays.asList(john, bob, jill);
ChoiceRenderer render = new ChoiceRenderer("name");
- form.add(new CheckBoxMultipleChoice("checkGroup", new
ListModel<String>(ArrayList<String>()),
+ form.add(new CheckBoxMultipleChoice("checkGroup", new
ListModel<String>(new ArrayList<String>()),
theSmiths, render));
{code}
Modified:
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/forms2/forms2_5.gdoc
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/forms2/forms2_5.gdoc?rev=1570670&r1=1570669&r2=1570670&view=diff
==============================================================================
---
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/forms2/forms2_5.gdoc
(original)
+++
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/forms2/forms2_5.gdoc
Fri Feb 21 19:12:04 2014
@@ -1,6 +1,6 @@
-As you might already known, HTLM doesn't allow to have nested forms1. However
with Wicket we can overcome this limitation by adding one or more form
components to a parent form.
+As you might already known, HTLM doesn't allow to have nested forms. However
with Wicket we can overcome this limitation by adding one or more form
components to a parent form.
This can be useful if we want to split a big form into smaller ones in order
to reuse them and to better distribute responsibilities among different
components.
Forms can be nested to an arbitrary level:
Modified:
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/helloWorld/helloWorld_4.gdoc
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/helloWorld/helloWorld_4.gdoc?rev=1570670&r1=1570669&r2=1570670&view=diff
==============================================================================
---
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/helloWorld/helloWorld_4.gdoc
(original)
+++
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/helloWorld/helloWorld_4.gdoc
Fri Feb 21 19:12:04 2014
@@ -32,7 +32,7 @@ public class HomePage extends WebPage {
}
{code}
-In the example above we used a version of @setResponsePage@ which takes as
input the class of the target page. In this way a new instance of @AnotherPage@
will be create each time we click on the link. The other version of
@setResponsePage@ takes in input a page instance instead of a page class:
+In the example above we used a version of @setResponsePage@ which takes as
input the class of the target page. In this way a new instance of @AnotherPage@
will be created each time we click on the link. The other version of
@setResponsePage@ takes in input a page instance instead of a page class:
{code}
@Override
Modified:
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/layout/layout_2.gdoc
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/layout/layout_2.gdoc?rev=1570670&r1=1570669&r2=1570670&view=diff
==============================================================================
---
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/layout/layout_2.gdoc
(original)
+++
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/layout/layout_2.gdoc
Fri Feb 21 19:12:04 2014
@@ -3,7 +3,7 @@ One of the goals of Wicket is to overcom
h3. Markup inheritance
-As we have seen in the previous chapter, Wicket pages are pure Java classes,
so we can easily write a page which is a subclass of another parent page. But
in Wicket inheritance is not limited to the classic object-oriented code
inheritance. When a class subclasses a @WebPage@ it also inherits the HTML file
of to the parent class. This type of inheritance is called markup inheritance.
+As we have seen in the previous chapter, Wicket pages are pure Java classes,
so we can easily write a page which is a subclass of another parent page. But
in Wicket inheritance is not limited to the classic object-oriented code
inheritance. When a class subclasses a @WebPage@ it also inherits the HTML file
of the parent class. This type of inheritance is called markup inheritance.
To better illustrate this concept let's consider the following example where
we have a page class called @GenericSitePage@ with the corresponding HTML file
GenericSitePage.html. Now let's create a specific page called
@OrderCheckOutPage@ where users can check out their orders on our web site.
This class extends @GenericSitePage@ but we don't provide it with any
corresponding HTML file.
In this scenario @OrderCheckOutPage@ will use GenericSitePage.html as markup
file:
Modified:
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/modelsforms/modelsforms_2.gdoc
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/modelsforms/modelsforms_2.gdoc?rev=1570670&r1=1570669&r2=1570670&view=diff
==============================================================================
---
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/modelsforms/modelsforms_2.gdoc
(original)
+++
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/modelsforms/modelsforms_2.gdoc
Fri Feb 21 19:12:04 2014
@@ -67,7 +67,12 @@ If property is an array or a List, we ca
Label label = new Label("firstChildName", new PropertyModel(person,
"children.0.name"));
{code}
-Indexes and map keys can be also specified using squared brackets like
âchildren[0].nameâ or âmapField[key].subfieldâ.
+Indexes and map keys can be also specified using squared brackets:
+
+{code}
+children[0].name ...
+mapField[key].subfield ...
+{code}
h3. CompoundPropertyModel and model inheritance
Modified:
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/modelsforms/modelsforms_5.gdoc
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/modelsforms/modelsforms_5.gdoc?rev=1570670&r1=1570669&r2=1570670&view=diff
==============================================================================
---
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/modelsforms/modelsforms_5.gdoc
(original)
+++
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/modelsforms/modelsforms_5.gdoc
Fri Feb 21 19:12:04 2014
@@ -6,7 +6,7 @@ The example page will look like this:
!model-chaining.png!
-What we want to do in this example is to chain the model of the DropDownChoice
(which contains the selected Person) with the model of the Form. In this way
the Form will work with the selected Person as backing object. The
DropDownChoice component can be configured to automatically update its model
each time we change the selected item on the client side. All we have to do is
to override method wantOn SelectionChangedNotifications to make it return true.
In practice, when this method returns true, DropDownChoice will submit its
value every time JavaScript event onChange occurs, and its model will be
consequently updated. To leverage this functionality, DropDownChoice doesn't
need to be inside a form.
+What we want to do in this example is to chain the model of the DropDownChoice
(which contains the selected Person) with the model of the Form. In this way
the Form will work with the selected Person as backing object. The
DropDownChoice component can be configured to automatically update its model
each time we change the selected item on the client side. All we have to do is
to override method wantOnSelectionChangedNotifications to make it return true.
In practice, when this method returns true, DropDownChoice will submit its
value every time JavaScript event onChange occurs, and its model will be
consequently updated. To leverage this functionality, DropDownChoice doesn't
need to be inside a form.
The following is the resulting markup of the example page:
Modified:
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/repeaters/repeaters_4.gdoc
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/repeaters/repeaters_4.gdoc?rev=1570670&r1=1570669&r2=1570670&view=diff
==============================================================================
---
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/repeaters/repeaters_4.gdoc
(original)
+++
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/repeaters/repeaters_4.gdoc
Fri Feb 21 19:12:04 2014
@@ -33,7 +33,7 @@ Class @org.apache.wicket.markup.repeater
List<Person> persons = loadPersons();
ListDataProvider<Person> listDataProvider = new
ListDataProvider<Person>(persons);
-DataView<Person> dataView = new DataView<Person>("row", listDataProvider) {
+DataView<Person> dataView = new DataView<Person>("rows", listDataProvider) {
@Override
protected void populateItem(Item<Person> item) {
@@ -56,11 +56,11 @@ In the next paragraph we will see a simi
h3. Data paging
-To enable data paging on a pageable repeaters, we must first set the number of
items to display per page with method setItemsPerPage(long items). Then, we
must attach the repeater to panel PagingNavigator (placed in package
@org.apache.wicket.markup.html.navigation.paging@) which is responsible for
rendering a navigation bar containing the links illustrated in the following
picture:
+To enable data paging on a pageable repeater, we must first set the number of
items to display per page with method setItemsPerPage(long items). Then, we
must attach the repeater to panel PagingNavigator (placed in package
@org.apache.wicket.markup.html.navigation.paging@) which is responsible for
rendering a navigation bar containing the links illustrated in the following
picture:
!paging-navigator.png!
-Project PageDataViewExample mixes a DataView component with a PagingNavigator
to display the list of all countries of the world sorted by alphabetical
order1. Here is the initialization code of the project home page:
+Project PageDataViewExample mixes a DataView component with a PagingNavigator
to display the list of all countries of the world sorted by alphabetical order.
Here is the initialization code of the project home page:
*HTML:*
{code:html}
Modified:
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/urls/urls_3.gdoc
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/urls/urls_3.gdoc?rev=1570670&r1=1570669&r2=1570670&view=diff
==============================================================================
--- wicket/common/site/trunk/_site/guide/guide/src/docs/guide/urls/urls_3.gdoc
(original)
+++ wicket/common/site/trunk/_site/guide/guide/src/docs/guide/urls/urls_3.gdoc
Fri Feb 21 19:12:04 2014
@@ -65,4 +65,4 @@ public void init()
}
{code}
-The purpose of <wicket:link> tag is not limited to just simplifying the usage
of bookmarkable pages. As we we will see in chapter 13, this tag can also be
adopted to manage web resources like pictures, CSS files, JavaScript files and
so on.
+The purpose of <wicket:link> tag is not limited to just simplifying the usage
of bookmarkable pages. As we will see in chapter 13, this tag can also be
adopted to manage web resources like pictures, CSS files, JavaScript files and
so on.
Modified:
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/versioningCaching/versioningCaching_2.gdoc
URL:
http://svn.apache.org/viewvc/wicket/common/site/trunk/_site/guide/guide/src/docs/guide/versioningCaching/versioningCaching_2.gdoc?rev=1570670&r1=1570669&r2=1570670&view=diff
==============================================================================
---
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/versioningCaching/versioningCaching_2.gdoc
(original)
+++
wicket/common/site/trunk/_site/guide/guide/src/docs/guide/versioningCaching/versioningCaching_2.gdoc
Fri Feb 21 19:12:04 2014
@@ -4,7 +4,7 @@ Stateful pages are versioned in order to
A new page version is created when a stateful page is requested for the first
time or when an existing instance is modified (for example changing its
component hierarchy). To identify each page version Wicket uses a
session-relative identifier called page id. This is a unique number and it is
increased every time a new page version is created.
-In the final example of the previous chapter (project LifeCycleStages), you
may have noticed the number appended at the and of URL. This number is the page
id we are talking about:
+In the final example of the previous chapter (project LifeCycleStages), you
may have noticed the number appended at the end of URL. This number is the page
id we are talking about:
!page-id.png!
