You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/04/28 17:27:18 UTC
wicket git commit: fix to cross-references take 2
Repository: wicket
Updated Branches:
refs/heads/master aec25d3c1 -> a3e24052e
fix to cross-references take 2
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a3e24052
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a3e24052
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a3e24052
Branch: refs/heads/master
Commit: a3e24052e672bc5f60dde89b92ac528c66f08fce
Parents: aec25d3
Author: Andrea Del Bene <“adelbene@apache.org”>
Authored: Tue Apr 28 17:27:02 2015 +0200
Committer: Andrea Del Bene <“adelbene@apache.org”>
Committed: Tue Apr 28 17:27:02 2015 +0200
----------------------------------------------------------------------
wicket-user-guide/src/docs/guide/ajax/ajax_6.gdoc | 2 +-
.../src/docs/guide/componentLifecycle/componentLifecycle_4.gdoc | 2 +-
wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc | 2 +-
wicket-user-guide/src/docs/guide/helloWorld/helloWorld_3.gdoc | 2 +-
.../src/docs/guide/jsintegration/jsintegration_2.gdoc | 2 +-
wicket-user-guide/src/docs/guide/keepControl/keepControl_2.gdoc | 2 +-
wicket-user-guide/src/docs/guide/keepControl/keepControl_6.gdoc | 2 +-
wicket-user-guide/src/docs/guide/modelsforms/modelsforms_3.gdoc | 2 +-
wicket-user-guide/src/docs/guide/modelsforms/modelsforms_4.gdoc | 2 +-
.../src/docs/guide/requestProcessing/requestProcessing_3.gdoc | 2 +-
.../src/docs/guide/requestProcessing/requestProcessing_6.gdoc | 2 +-
wicket-user-guide/src/docs/guide/urls/urls_6.gdoc | 2 +-
wicket-user-guide/src/docs/guide/whyLearn/whyLearn_3.gdoc | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/ajax/ajax_6.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/ajax/ajax_6.gdoc b/wicket-user-guide/src/docs/guide/ajax/ajax_6.gdoc
index 1ca5e55..4fcf114 100644
--- a/wicket-user-guide/src/docs/guide/ajax/ajax_6.gdoc
+++ b/wicket-user-guide/src/docs/guide/ajax/ajax_6.gdoc
@@ -152,7 +152,7 @@ Global AJAX call events are handled with JavaScript. We can register a callback
The callback function takes in input the following parameters: attrs, jqXHR, textStatus, jqEvent and errorThrown. The first three parameters are the same seen before with @IAjaxCallListener@ while jqEvent is an event internally fired by Wicket. The last parameter errorThrown indicates if an error has occurred during the AJAX call.
-To see a basic example of use of a global AJAX call listener, let's go back to our custom datepicker created in [chapter 16|guide:jsintegration]. When we built it we didn't think about a possible use of the component with AJAX. When a complex component like our datepicker is refreshed via AJAX, the following two side effects can occur:
+To see a basic example of use of a global AJAX call listener, let's go back to our custom datepicker created in [chapter 19|guide:jsintegration]. When we built it we didn't think about a possible use of the component with AJAX. When a complex component like our datepicker is refreshed via AJAX, the following two side effects can occur:
* After been refreshed, the component loses every JavaScript handler set on it. This is not a problem for our datepicker as it sets a new JQuery datepicker every time is rendered (inside method renderHead).
* The markup previously created with JavaScript is not removed. For our datepicker this means that the icon used to open the calendar won't be removed while a new one will be added each time the component is refreshed.
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/componentLifecycle/componentLifecycle_4.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/componentLifecycle/componentLifecycle_4.gdoc b/wicket-user-guide/src/docs/guide/componentLifecycle/componentLifecycle_4.gdoc
index 7710ed7..b271f05 100644
--- a/wicket-user-guide/src/docs/guide/componentLifecycle/componentLifecycle_4.gdoc
+++ b/wicket-user-guide/src/docs/guide/componentLifecycle/componentLifecycle_4.gdoc
@@ -102,7 +102,7 @@ public class HomePage extends WebPage {
Just like we do with @onInitialize@, if we decide to override @onComponentTag@ we must remember to call the same method of the super class because also this class may also customize the tag. Overriding @onComponentTag@ is perfectly fine if we have to customize the tag of a specific component, but if we wanted to reuse the code across different components we should consider to use a behavior in place of this hook method.
-We have already seen in [chapter 6.2|guide:keepControl_2] how to use behavior @AttributeModifier@ to manipulate the tag's attribute. In [chapter 17.1|guide:advanced_1] we will see that base class @Behavior@ offers also a callback method named @onComponentTag(ComponentTag, Component)@ that can be used in place of the hook method @onComponentTag(ComponentTag)@.
+We have already seen in [chapter 6.2|guide:keepControl_2] how to use behavior @AttributeModifier@ to manipulate the tag's attribute. In [chapter 19.1|guide:advanced_1] we will see that base class @Behavior@ offers also a callback method named @onComponentTag(ComponentTag, Component)@ that can be used in place of the hook method @onComponentTag(ComponentTag)@.
h3. Methods onComponentTagBody
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc
index ce4ac69..c9d7df8 100644
--- a/wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc
+++ b/wicket-user-guide/src/docs/guide/forms2/forms2_2.gdoc
@@ -24,7 +24,7 @@ Wicket generates a feedback message for each field that doesn't satisfy one of i
The entire infrastructure of feedback messages is built on top of the Java internationalization (I18N) support and it uses "resource bundles":http://docs.oracle.com/javase/tutorial/i18n/resbundle/index.html to store messages.
{note}
-The topics of internationalization will be covered in [chapter 14|guide:i18n]. For now we will give just few notions needed to understand the examples from this chapter.
+The topics of internationalization will be covered in [chapter 15|guide:i18n]. For now we will give just few notions needed to understand the examples from this chapter.
{note}
By default resource bundles are stored into properties files but we can easily configure other sources as described later in [paragraph 15.2|guide:i18n_2].
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/helloWorld/helloWorld_3.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/helloWorld/helloWorld_3.gdoc b/wicket-user-guide/src/docs/guide/helloWorld/helloWorld_3.gdoc
index 327aa27..e338122 100644
--- a/wicket-user-guide/src/docs/guide/helloWorld/helloWorld_3.gdoc
+++ b/wicket-user-guide/src/docs/guide/helloWorld/helloWorld_3.gdoc
@@ -9,7 +9,7 @@ By default this HTML file must have the same name of the related page class and
_Illustration :Page class and its related HTML file_
-If you don't like to put class and html side by side (let's say you want all your HTML files in a separated folder) you can use Wicket settings to specify where HTML files can be found. We will cover this topic later in [chapter 15.9|guide:resources_9].
+If you don't like to put class and html side by side (let's say you want all your HTML files in a separated folder) you can use Wicket settings to specify where HTML files can be found. We will cover this topic later in [chapter 16.9|guide:resources_9].
The Java code for the @HomePage@ class is the following:
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/jsintegration/jsintegration_2.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/jsintegration/jsintegration_2.gdoc b/wicket-user-guide/src/docs/guide/jsintegration/jsintegration_2.gdoc
index ef18256..3b289e4 100644
--- a/wicket-user-guide/src/docs/guide/jsintegration/jsintegration_2.gdoc
+++ b/wicket-user-guide/src/docs/guide/jsintegration/jsintegration_2.gdoc
@@ -133,5 +133,5 @@ This does not apply to the init script which is dynamically generated and is ren
{note}
{warning}
-Our datepicker is not ready yet to be used with AJAX. In [chapter 18|guide:ajax] we will see how to modify it to make it AJAX-compatible.
+Our datepicker is not ready yet to be used with AJAX. In [chapter 19|guide:ajax] we will see how to modify it to make it AJAX-compatible.
{warning}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/keepControl/keepControl_2.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/keepControl/keepControl_2.gdoc b/wicket-user-guide/src/docs/guide/keepControl/keepControl_2.gdoc
index d69f720..c231cf0 100644
--- a/wicket-user-guide/src/docs/guide/keepControl/keepControl_2.gdoc
+++ b/wicket-user-guide/src/docs/guide/keepControl/keepControl_2.gdoc
@@ -1,4 +1,4 @@
-To modify tag attributes we can use class @org.apache.wicket.AttributeModifier@. This class extends @org.apache.wicket.behavior.Behavior@ and can be added to any component via the @Component@'s @add@ method. Class @Behavior@ is used to expand component functionalities and it can also modify component markup. We will see this class in detail later in [chapter 17.1|guide:advanced_1].
+To modify tag attributes we can use class @org.apache.wicket.AttributeModifier@. This class extends @org.apache.wicket.behavior.Behavior@ and can be added to any component via the @Component@'s @add@ method. Class @Behavior@ is used to expand component functionalities and it can also modify component markup. We will see this class in detail later in [chapter 19.1|guide:advanced_1].
As first example of attribute manipulation let's consider a @Label@ component bound to the following markup:
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/keepControl/keepControl_6.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/keepControl/keepControl_6.gdoc b/wicket-user-guide/src/docs/guide/keepControl/keepControl_6.gdoc
index 5b82ba9..0aa20a7 100644
--- a/wicket-user-guide/src/docs/guide/keepControl/keepControl_6.gdoc
+++ b/wicket-user-guide/src/docs/guide/keepControl/keepControl_6.gdoc
@@ -34,5 +34,5 @@ The content of the @<wicket:head>@ tag is added to the header section once per c
{note}
{warning}
-The @<wicket:head>@ tag is ideal if we want to define small in-line blocks of CSS or JavaScript. However Wicket provides also a more sophisticated technique to let components contribute to header section with in-line blocks and resource files like CSS or JavaScript files. We will see this technique later in [chapter 15|guide:resources].
+The @<wicket:head>@ tag is ideal if we want to define small in-line blocks of CSS or JavaScript. However Wicket provides also a more sophisticated technique to let components contribute to header section with in-line blocks and resource files like CSS or JavaScript files. We will see this technique later in [chapter 16|guide:resources].
{warning}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/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 787f1ea..91baa8d 100644
--- a/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_3.gdoc
+++ b/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_3.gdoc
@@ -39,7 +39,7 @@ h3. Login form
As first example of interaction between the form and its models, we will build a classic login form which asks for username and password (project LoginForm).
{warning}
-The topic of security will be discussed later in chapter 20. The following form is for example purposes only and is not suited for a real application.
+The topic of security will be discussed later in chapter 22. The following form is for example purposes only and is not suited for a real application.
If you need to use a login form you should consider to use component @org.apache.wicket.authroles.authentication.panel.SignInPanel@ shipped with Wicket.
{warning}
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_4.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_4.gdoc b/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_4.gdoc
index d79b218..9d8695f 100644
--- a/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_4.gdoc
+++ b/wicket-user-guide/src/docs/guide/modelsforms/modelsforms_4.gdoc
@@ -38,7 +38,7 @@ In the example above the possible options are provided as a list of String objec
</select>
{code}
-The first option is a placeholder item corresponding to a null model value. By default DropDownChoice cannot have a null value so users are forced to select a not-null option. If we want to change this behavior we can set the nullValid flag to true via the setNullValid method. Please note that the placeholder text (“Chose one”) can be localized, as we will see in chapter 14. The other options are identified by the attribute value. By default the value of this attribute is the index of the single option inside the provided list of choices, while the text displayed to the user is obtained by calling toString()on the choice object. This default behavior works fine as long as our options are simple objects like strings, but when we move to more complex objects we may need to implement a more sophisticated algorithm to generate the value to use as the option id and the one to display to user. Wicket has solved this problem with @org.apache.wicket.markup.html.form.IChoiceRender@ inte
rface. This interface defines method getDisplayValue(T object) that is called to generate the value to display for the given choice object, and method getIdValue(T object, int index) that is called to generate the option id. The built-in implementation of this interface is class @org.apache.wicket.markup.html.form.ChoiceRenderer@ which renders the two values using property expressions.
+The first option is a placeholder item corresponding to a null model value. By default DropDownChoice cannot have a null value so users are forced to select a not-null option. If we want to change this behavior we can set the nullValid flag to true via the setNullValid method. Please note that the placeholder text (“Chose one”) can be localized, as we will see in chapter 15. The other options are identified by the attribute value. By default the value of this attribute is the index of the single option inside the provided list of choices, while the text displayed to the user is obtained by calling toString()on the choice object. This default behavior works fine as long as our options are simple objects like strings, but when we move to more complex objects we may need to implement a more sophisticated algorithm to generate the value to use as the option id and the one to display to user. Wicket has solved this problem with @org.apache.wicket.markup.html.form.IChoiceRender@ inte
rface. This interface defines method getDisplayValue(T object) that is called to generate the value to display for the given choice object, and method getIdValue(T object, int index) that is called to generate the option id. The built-in implementation of this interface is class @org.apache.wicket.markup.html.form.ChoiceRenderer@ which renders the two values using property expressions.
In the following code we want to show a list of Person objects using their full name as value to display and using their passport code as option id:
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_3.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_3.gdoc b/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_3.gdoc
index 37b5932..b49c74a 100644
--- a/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_3.gdoc
+++ b/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_3.gdoc
@@ -40,7 +40,7 @@ The RequestCycle is also responsible for generating the URL value (as CharSequen
* a page class, via the @urlFor(Class<C> pageClass, PageParameters parameters)@ method
* an IRequestHandler via the @urlFor(IRequestHandler handler)@ method
-* a ResourceReference via the @urlFor(ResourceReference reference, PageParameters params)@ method (resource entities will be introduced in [chapter 16|guide:resources]).
+* a ResourceReference via the @urlFor(ResourceReference reference, PageParameters params)@ method (resource entities will be introduced in [chapter 19|guide:resources]).
The overloaded @urlFor@ method from above also has a corresponding version that returns an instance of @org.apache.wicket.request.Url@ instead of a @CharSequence@. This version has the prefix 'map' in its name (i.e. it has @mapUrlFor@ as full name).
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_6.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_6.gdoc b/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_6.gdoc
index 61f28d8..4d9e5c3 100644
--- a/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_6.gdoc
+++ b/wicket-user-guide/src/docs/guide/requestProcessing/requestProcessing_6.gdoc
@@ -2,4 +2,4 @@
In this chapter we had a look at how Wicket internally handles a web request. Even if most of the time we won't need to customize this internal process, knowing how it works is essential to use the framework at 100%.
-Entities like Application and Session will come in handy again when we will tackle the topic of security in [chapter 21|guide:security].
+Entities like Application and Session will come in handy again when we will tackle the topic of security in [chapter 23|guide:security].
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/urls/urls_6.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/urls/urls_6.gdoc b/wicket-user-guide/src/docs/guide/urls/urls_6.gdoc
index 0b0b491..2394bf3 100644
--- a/wicket-user-guide/src/docs/guide/urls/urls_6.gdoc
+++ b/wicket-user-guide/src/docs/guide/urls/urls_6.gdoc
@@ -112,7 +112,7 @@ Interface @org.apache.wicket.request.mapper.IMapperContext@ is used by request m
* Namespace: it's the first URL segment of non-mounted pages. By default its value is wicket.
* Identifier for non-bookmarkable URLs: it's the segment that identifies non bookmarkable pages. By default its value is page.
* Identifier for bookmarkable URLs: it's the segment that identifies bookmarkable pages. By default its value is bookmarkable (as we have seen before in [paragraph 10.1.1|guide:urls_1]).
-* Identifier for resources: it's the segment that identifies Wicket resources. Its default value is resources. The topic of resource management will be covered in [chapter 15|guide:resources].
+* Identifier for resources: it's the segment that identifies Wicket resources. Its default value is resources. The topic of resource management will be covered in [chapter 16|guide:resources].
IMapperContext provides a getter method for any segment listed above. By default Wicket uses class @org.apache.wicket.DefaultMapperContext@ as mapper context.
http://git-wip-us.apache.org/repos/asf/wicket/blob/a3e24052/wicket-user-guide/src/docs/guide/whyLearn/whyLearn_3.gdoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/docs/guide/whyLearn/whyLearn_3.gdoc b/wicket-user-guide/src/docs/guide/whyLearn/whyLearn_3.gdoc
index 20e5575..864c821 100644
--- a/wicket-user-guide/src/docs/guide/whyLearn/whyLearn_3.gdoc
+++ b/wicket-user-guide/src/docs/guide/whyLearn/whyLearn_3.gdoc
@@ -3,5 +3,5 @@ Let's quickly review the main advantages that this paradigm can offer us:
* *Web pages are objects*: web pages are not just text files sent back to the client. They are object instances and we can harness OOP to design web pages and their components. With Wicket we can also apply inheritance to HTML markup in order to build a consistent graphic layout for our applications (we will see markup inheritance in [chapter 4.2|guide:layout_2]).
* *We don't have to worry about application's state*: pages and components can be considered stateful entities. They are Java objects and they can keep a state inside them and reference other objects. We can stop worrying about keeping track of user data stored inside the @HttpSession@ and we can start managing them in a natural and transparent way.
-* *Testing web applications is much easier*: since pages and components are pure objects, you can use JUnit to test their behavior and to ensure that they render as expected. Wicket has a set of utility classes for unit testing that simulate user interaction with web pages, hence we can write acceptance tests using just JUnit without any other test framework (unit testing is covered in [chapter 21|guide:testing]).
+* *Testing web applications is much easier*: since pages and components are pure objects, you can use JUnit to test their behavior and to ensure that they render as expected. Wicket has a set of utility classes for unit testing that simulate user interaction with web pages, hence we can write acceptance tests using just JUnit without any other test framework (unit testing is covered in [chapter 23|guide:testing]).