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 2017/05/11 10:26:45 UTC
wicket git commit: WICKET-6367 additional fix
Repository: wicket
Updated Branches:
refs/heads/master 324302079 -> 74e53e4de
WICKET-6367 additional fix
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/74e53e4d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/74e53e4d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/74e53e4d
Branch: refs/heads/master
Commit: 74e53e4de2f42c6db4acd5036e54a670d295880b
Parents: 3243020
Author: Andrea Del Bene <an...@innoteam.it>
Authored: Thu May 11 12:26:26 2017 +0200
Committer: Andrea Del Bene <an...@innoteam.it>
Committed: Thu May 11 12:26:26 2017 +0200
----------------------------------------------------------------------
.../src/main/asciidoc/bestpractices/bestpractices_12.adoc | 2 +-
.../src/main/asciidoc/bestpractices/bestpractices_3.adoc | 2 +-
wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc | 4 ++--
wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc | 4 ++--
wicket-user-guide/src/main/asciidoc/forms2/forms2_3.adoc | 4 ++--
wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc | 2 +-
wicket-user-guide/src/main/asciidoc/forms2/forms2_9.adoc | 2 +-
.../src/main/asciidoc/helloWorld/helloWorld_2.adoc | 2 +-
.../src/main/asciidoc/internals/autocomponents.adoc | 6 +++---
wicket-user-guide/src/main/asciidoc/jee/jee_1.adoc | 2 +-
wicket-user-guide/src/main/asciidoc/jee/jee_2.adoc | 2 +-
.../src/main/asciidoc/keepControl/keepControl_3.adoc | 1 -
wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc | 2 +-
.../src/main/asciidoc/modelsforms/modelsforms_1.adoc | 2 +-
.../src/main/asciidoc/modelsforms/modelsforms_4.adoc | 2 +-
.../src/main/asciidoc/modelsforms/modelsforms_9.adoc | 6 +++---
.../src/main/asciidoc/monitoring/monitoring_4.adoc | 4 ++--
wicket-user-guide/src/main/asciidoc/resources/resources_6.adoc | 2 +-
.../src/main/asciidoc/testingspring/testingspring_1.adoc | 4 ++--
.../src/main/asciidoc/testingspring/testingspring_2.adoc | 4 ++--
wicket-user-guide/src/main/asciidoc/urls.adoc | 2 +-
21 files changed, 30 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc
index a0bdf28..01a94b6 100644
--- a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc
+++ b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc
@@ -57,4 +57,4 @@ public class MyPage extends WebPage {
}
----
-The label in listing 16 is clearly encapsulated in a component without using a factory. Now you can easily create inline implementations and override _isVisible()_ or other stuff. Naturally, you might claim "I need a factory to initialize some values in the component, e.g. a Spring service". For this you can create a implementation of _IComponentInstantiationListener_. This listener gets called on the super-constructor of every component. The most popular implementation of this interface is the _SpringComponentInjector_ which injects Spring beans in components when the fields are annotated with _\_SpringBean_. You can easliy write and add your own implementation of _IComponentInstantiationListener_. So there is no reason for using a factory anymore. More information about the instanciation listener is located in Wicket's JavaDoc.
+The label in listing 16 is clearly encapsulated in a component without using a factory. Now you can easily create inline implementations and override _isVisible()_ or other stuff. Naturally, you might claim "I need a factory to initialize some values in the component, e.g. a Spring service". For this you can create a implementation of _IComponentInstantiationListener_. This listener gets called on the super-constructor of every component. The most popular implementation of this interface is the _SpringComponentInjector_ which injects Spring beans in components when the fields are annotated with _SpringBean_. You can easliy write and add your own implementation of _IComponentInstantiationListener_. So there is no reason for using a factory anymore. More information about the instanciation listener is located in Wicket's JavaDoc.
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_3.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_3.adoc b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_3.adoc
index 1bd4c86..68447f7 100644
--- a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_3.adoc
+++ b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_3.adoc
@@ -3,4 +3,4 @@
For many developers, naming is a dispensable thing, but I think it is one of the major topics in software development. With the help of correct naming, you can easily identify the business aspects of a software component. Additionally good naming avoids unneccessary and bad comments.
-Bad namings for Wicket-IDs are _birthdateTextField_, _firstnameField_ and _addressPanel_. Why? The naming contains two aspects: A technical aspect (_ )[TextField] and the business aspect (_ ).[birthdate] Only the the business aspect is relevant because both the HTML template as well as the Java code already contain the technical details ( [")@)] xtField( [")@)] te [)@)] Additionally, such names add a lot of effort when you do technical refactorings, e.g. if you have to replace a _TextField_ by a _DatePicker_ and the Wicket ID _birthdateTextField_ becomes _birthdateDatePicker_. Another reason for avoiding technical aspects in Wicket IDs is the _CompoundPropertyModel_. This model delegates the properties to its child components named by Wicket IDs (see listing 3). For example the _TextField username_ automatically calls _setUsername()_ and _getUsername()_ on the _Registration_ object. A setter like _setUsernameTextfield()_ would be very inconvenient here.
+Bad namings for Wicket-IDs are _birthdateTextField_, _firstnameField_ and _addressPanel_. Why? The naming contains two aspects: A technical aspect (_"TextField"_) and the business aspect (_"birthdate"_ ). Only the the business aspect is relevant because both the HTML template as well as the Java code already contain the technical details (_new TextField("birthdate")_). Additionally, such names add a lot of effort when you do technical refactorings, e.g. if you have to replace a _TextField_ by a _DatePicker_ and the Wicket ID _birthdateTextField_ becomes _birthdateDatePicker_. Another reason for avoiding technical aspects in Wicket IDs is the _CompoundPropertyModel_. This model delegates the properties to its child components named by Wicket IDs (see listing 3). For example the _TextField username_ automatically calls _setUsername()_ and _getUsername()_ on the _Registration_ object. A setter like _setUsernameTextfield()_ would be very inconvenient here.
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc
index 371350d..3e86bda 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc
@@ -5,7 +5,7 @@ In this paragraph we will see which components can be used to handle HTML radio
image::../img/choice-form-screenshot.png[]
-A check box can be used as single component to set a boolean property. For this purpose Wicket provides the _org.apache.wicket.markup.html.form.CheckBox_ component which must be attached to <input type= ../>[checkbox] tag. In the next example (project SingleCheckBox) we will consider a form similar to the one used in <<modelsforms.adoc#_component_dropdownchoice,paragraph 11.5>> to edit a Person object, but with an additional checkbox to let the user decide if she wants to subscribe to our mailing list or not. The form uses the following bean as backing object:
+A check box can be used as single component to set a boolean property. For this purpose Wicket provides the _org.apache.wicket.markup.html.form.CheckBox_ component which must be attached to <input type="checkbox"/> tag. In the next example (project SingleCheckBox) we will consider a form similar to the one used in <<modelsforms.adoc#_component_dropdownchoice,paragraph 11.5>> to edit a Person object, but with an additional checkbox to let the user decide if she wants to subscribe to our mailing list or not. The form uses the following bean as backing object:
[source,java]
----
@@ -117,7 +117,7 @@ image::../img/grouped-checkbox.png[]
This component can be attached to a <div> tag or to a <span> tag. No specific content is required for this tag as it will be populated with the actual checkboxes. Since this component allows multiple selection, its model object is a list. In the example above we have used model class _org.apache.wicket.model.util.ListModel_ which is specifically designed to wrap a List object.
-By default CheckBoxMultipleChoice inserts a <br/> tag as suffix after each option. We can configure both the suffix and the prefix used by the component with the setPrefix and setSuffix methods.
+CheckBoxMultipleChoice can insert a prefix and a suffix before and after each option. To configure them we can use methods _setPrefix_ and _setSuffix_.
When our options are more complex objects than simple strings, we can render them using an IChoiceRender, as we did for DropDownChoice in <<modelsforms.adoc#_component_dropdownchoice,paragraph 11.5>>:
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc
index 925574e..4ff62e3 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc
@@ -75,7 +75,7 @@ Wicket already provides a number of built-in validators ready to be used. The fo
==== EmailAddressValidator
-Checks if input respects the format local-part\_domain.
+Checks if input respects the format local-part@domain.
*Message:*
@@ -91,7 +91,7 @@ _The value of '${label}' is not a valid URL._
==== DateValidator
-Validator class that can be extended or used as a factory class to get date validators to check if a date is bigger than a lower bound (method minimum(Date min)), smaller than a upper bound (method maximum(Date max)) or inside a range (method range(Date min, Date max)).
+Validator class that can be extended or used as a factory class to get date validators to check if a date is greater than a lower bound (method minimum(Date min)), smaller than a upper bound (method maximum(Date max)) or inside a range (method range(Date min, Date max)).
*Messages:*
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/forms2/forms2_3.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_3.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_3.adoc
index 1eada76..cf3233b 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_3.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_3.adoc
@@ -25,7 +25,7 @@ Application.get().getConverterLocator().getConverter(Boolean.class);
NOTE: Components which are subclasses of AbstractSingleSelectChoice don't follow the schema illustrated above to convert user input.
-These kinds of components (like DropDownChoice and RadioChoice1) use their choice render and their collection of possible choices to perform input conversion.
+These kinds of components (like DropDownChoice and RadioChoice) use their choice render and their collection of possible choices to perform input conversion.
=== Creating custom application-scoped converters
@@ -86,7 +86,7 @@ public class RegExpPatternConverter implements IConverter<Pattern> {
----
Methods declared by interface IConverter take as input a Locale parameter in order to deal with locale-sensitive data and conversions. We will learn more about locales and internationalization in
-<<_internationalization_with_wicket,paragraph 15>>.
+<<_internationalization_with_wicket,Chapter 15>>.
Once we have implemented our custom converter, we must override method newConverterLocator() inside our application class and tell it to add our new converter to the default set:
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc
index 4c59680..10f5c56 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc
@@ -1,7 +1,7 @@
-Wicket supports file uploading with the FileUploadField component which must be used with the <input> tag whose type attribute must be set to "file" In order to send a file on form submission we must enable multipart mode calling MultiPart(true)on our form.
+Wicket supports file uploading with the FileUploadField component which must be used with the <input> tag whose type attribute must be set to "file" In order to send a file on form submission we must enable multipart mode calling setMultiPart(true) on our form.
In the next example (project UploadSingleFile) we will see a form which allows users to upload a file into the temporary directory of the server (path /tmp on Unix/Linux systems):
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/forms2/forms2_9.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_9.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_9.adoc
index af0177e..2bca34c 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_9.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_9.adoc
@@ -64,7 +64,7 @@ public class TemperatureDegreeField extends FormComponentPanel<Double> {
----
Inside the onInitialize method we have created a read-only model for the label that displays the letter corresponding to the user's temperature scale. To determinate which temperature scale is in use, we retrieve the Locale from the session by calling Component's getLocale() method (we will talk more about this method in
-<<_internationalization_with_wicket,paragraph 15>>). Then, if locale is the one corresponding to the United States, the chosen scale will be Fahrenheit, otherwise it will be considered as Celsius.
+<<_internationalization_with_wicket,Chapter 15>>). Then, if locale is the one corresponding to the United States, the chosen scale will be Fahrenheit, otherwise it will be considered as Celsius.
In the final part of onInitialize() we add the two components to our custom form component. You may have noticed that we have explicitly set the type of model object for the text field to double. This is necessary as the starting model object is a null reference and this prevents the component from automatically determining the type of its model object.
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_2.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_2.adoc b/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_2.adoc
index ade0c59..8d7d968 100644
--- a/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_2.adoc
@@ -35,7 +35,7 @@ The content of web.xml declares a servlet filter (class _org.apache.wicket.Proto
Since this is a standard servlet filter we must map it to a specific set of URLs through the _<filter-mapping>_ tag). In the xml above we have mapped every URL to our Wicket filter.
-If we are using Servlet 3 or a later version, we can of course use a class in place of web.xml to configure our application. The following example uses annotation _WebFilter.
+If we are using Servlet 3 or a later version, we can of course use a class in place of web.xml to configure our application. The following example uses annotation _WebFilter_.
[source,java]
----
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc b/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc
index 2124a30..7c6198f 100644
--- a/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc
+++ b/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc
@@ -11,7 +11,7 @@ Before rendering any component Wicket must retrieve its markup calling method _g
After the markup has been loaded by _MarkupFactory_, it's parsed with class _org.apache.wicket.markup.MarkupParser_. _MarkupFactory_ creates a new _MarkupParser_ with method _newMarkupParser(MarkupResourceStream resource)_. The effective markup parsing is performed with a chain of entities implementing interface _org.apache.wicket.markup.parser.IMarkupFilter_. The default set of _IMarkupFilters_ used by _MarkupParser_ takes care of different tasks such as HTML validation, comments removing, Wicket tags handling, etc...
-To customize the set of _IMarkupFilters_S used in our application we can create a subclass of _MarkupFactory_ overriding method _newMarkupParser(MarkupResourceStream resource)_:
+To customize the set of _IMarkupFiltersS_ used in our application we can create a subclass of _MarkupFactory_ overriding method _newMarkupParser(MarkupResourceStream resource)_:
[source,java]
----
@@ -39,7 +39,7 @@ public void init()
}
----
-Usually we won't need to change the default configuration of _IMarkupFilters_S, but it's important to be aware of this internal mechanism before we talk about another advanced feature, which is building auto components resolvers.
+Usually we won't need to change the default configuration of _IMarkupFiltersS_, but it's important to be aware of this internal mechanism before we talk about another advanced feature, which is building auto components resolvers.
=== Auto components resolvers
@@ -68,7 +68,7 @@ public interface IComponentResolver extends IClusterable
}
----
-Registered _IComponentResolver_s can be retrieved through Application's settings:
+Registered _IComponentResolverS_ can be retrieved through Application's settings:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/jee/jee_1.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/jee/jee_1.adoc b/wicket-user-guide/src/main/asciidoc/jee/jee_1.adoc
index 464d285..09ef16a 100644
--- a/wicket-user-guide/src/main/asciidoc/jee/jee_1.adoc
+++ b/wicket-user-guide/src/main/asciidoc/jee/jee_1.adoc
@@ -32,7 +32,7 @@ public class EnterpriseMessage {
}
----
-Please note that we have used annotation ManagedBean to decorate our object. Now to inject it into the home page we must add a field of type EnterpriseMessage and annotate it with annotation _EJB:
+Please note that we have used annotation ManagedBean to decorate our object. Now to inject it into the home page we must add a field of type EnterpriseMessage and annotate it with annotation _EJB_:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/jee/jee_2.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/jee/jee_2.adoc b/wicket-user-guide/src/main/asciidoc/jee/jee_2.adoc
index a3fc3f3..80a4712 100644
--- a/wicket-user-guide/src/main/asciidoc/jee/jee_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/jee/jee_2.adoc
@@ -38,7 +38,7 @@ public class EnterpriseMessage {
}
----
-In the home page of the project the object is injected using Wicket annotation _SpringBean:
+In the home page of the project the object is injected using Wicket annotation _SpringBean_:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_3.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_3.adoc b/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_3.adoc
index a6e7146..d7706f4 100644
--- a/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_3.adoc
+++ b/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_3.adoc
@@ -10,7 +10,6 @@ Wicket generates markup ids using an instance of interface _org.apache.wicket.IM
public void init()
{
super.init();
- //wrap disabled links with <b> tag
getMarkupSettings().setMarkupIdGenerator(myGenerator);
}
----
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc b/wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc
index c934f21..70d7fe3 100644
--- a/wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/layout/layout_2.adoc
@@ -26,7 +26,7 @@ Subclasses of _MarkupContainer_ can contain children components that can be adde
* add one or more children components (with method _add_).
* remove a specific child component (with method _remove_).
-* retrieve a specific child component with method _get(String)_. The string parameter is the id of the component or its relative path if the component is nested inside other _MarkupContainer_s. This path is a colon-separated string containing also the ids of the intermediate containers traversed to get to the child component. To illustrate an example of component path, let's consider the code of the following page:
+* retrieve a specific child component with method _get(String)_. The string parameter is the id of the component or its relative path if the component is nested inside other _MarkupContainer_s_. This path is a colon-separated string containing also the ids of the intermediate containers traversed to get to the child component. To illustrate an example of component path, let's consider the code of the following page:
[source,java]
----
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_1.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_1.adoc b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_1.adoc
index a604238..b4212bd 100644
--- a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_1.adoc
+++ b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_1.adoc
@@ -54,5 +54,5 @@ From now on we will use these factory methods in our examples.
It's quite clear that if our Label must display a static text it doesn't make much sense to build a model by hand like we did in the last code example.
However is not unusual to have a Label that must display a dynamic value, like the input provided by a user or a value read from a database. Wicket models are designed to solve these kinds of problems.
-By default the class Component escapes HTML sensitive characters (like '<', '>' or '&') from the textual representation of its model object. The term 'escape' means that these characters will be replaced with their corresponding HTML http://en.wikipedia.org/wiki/Character_entity_reference[entity] (for example '<' becomes '< '). This is done for security reasons as a malicious user could attempt to inject markup or JavaScript into our pages. If we want to display the raw content stored inside a model, we can tell the Component class not to escape characters by calling the setEscapeModelStrings(false) method.
+By default the class Component escapes HTML sensitive characters (like '<', '>' or '&') from the textual representation of its model object. The term 'escape' means that these characters will be replaced with their corresponding HTML http://en.wikipedia.org/wiki/Character_entity_reference[entity] (for example '<' becomes '>'). This is done for security reasons as a malicious user could attempt to inject markup or JavaScript into our pages. If we want to display the raw content stored inside a model, we can tell the Component class not to escape characters by calling the setEscapeModelStrings(false) method.
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_4.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_4.adoc b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_4.adoc
index 160f0c8..446c7b2 100644
--- a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_4.adoc
+++ b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_4.adoc
@@ -44,7 +44,7 @@ As first example of interaction between the form and its models, we will build a
WARNING: 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.
-This form needs two text fields, one of which must be a password field. We should also use a label to display the result of login process1. For the sake of simplicity, the login logic is all inside onSubmit and is quite trivial.
+This form needs two text fields, one of which must be a password field. We should also use a label to display the result of login process. For the sake of simplicity, the login logic is all inside onSubmit and is quite trivial.
The following is a possible implementation of our form:
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_9.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_9.adoc b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_9.adoc
index ac6dc44..8579205 100644
--- a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_9.adoc
+++ b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_9.adoc
@@ -1,13 +1,13 @@
-Like many people new to Wicket, you may need a little time to fully understand the power and the advantages of using models. Taking your first steps with Wicket you may be tempted to pass row objects to your components instead of using models:
+Like many people new to Wicket, you may need a little time to fully understand the power and the advantages of using models. Taking your first steps with Wicket you may be tempted to pass raw objects to your components instead of using models:
[source,java]
----
/**
*
- * NOT TO DO: passing row objects to components instead of using models!
+ * NOT TO DO: passing raw objects to components instead of using models!
*
*/
public class CustomComponent extends Component{
@@ -21,4 +21,4 @@ public class CustomComponent extends Component{
}
----
-That's a bad practice and you must avoid it. Using models we do not only decouple our components from the data source, but we can also relay on them (if they are dynamic) to work with the most up-to-date version of our model object. If we decide to bypass models we lose all these advantages and we force model objects to be serialized.
+That's a bad practice and you must avoid it. By using models we do not only decouple our components from the data source, but we can also relay on them (if they are dynamic) to work with the most up-to-date version of our model object. If we decide to bypass models we lose all these advantages and we force model objects to be serialized.
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_4.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_4.adoc b/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_4.adoc
index e199e1e..60c57e5 100644
--- a/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_4.adoc
+++ b/wicket-user-guide/src/main/asciidoc/monitoring/monitoring_4.adoc
@@ -1,7 +1,7 @@
There are only a two steps required to write own measurements for life data statistics in Wicket:
-(1) Write a class which is named very close to what it measures. This class should extends WicketMetrics and should annotated with _Aspect and provide one method with a join point scanning for the target signature.
+(1) Write a class which is named very close to what it measures. This class should extends WicketMetrics and should annotated with _Aspect_ and provide one method with a join point scanning for the target signature.
[source,java]
----
@Aspect
@@ -14,7 +14,7 @@ There are only a two steps required to write own measurements for life data stat
}
}
----
-* To measure time you need _Around because measureTime of WicketMetrics requires the joinPoint - the class name is appended with a slash at the end
+* To measure time you need _Around_ because measureTime of WicketMetrics requires the joinPoint - the class name is appended with a slash at the end
* To only mark that a method is called you can use mark of WicketMetrics and apply null as a second parameter - if you apply a join point to mark the class name is appended with a slash at the end
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/resources/resources_6.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/resources/resources_6.adoc b/wicket-user-guide/src/main/asciidoc/resources/resources_6.adoc
index b40d8b4..725f918 100644
--- a/wicket-user-guide/src/main/asciidoc/resources/resources_6.adoc
+++ b/wicket-user-guide/src/main/asciidoc/resources/resources_6.adoc
@@ -1,7 +1,7 @@
-Class _ResourceReference_ allows to specify the resources it depends on overriding method _getDependencies()_. The method returns a list of _HeaderItem_s that must be rendered before the resource referenced by _ResourceReference_ can be used. This can be really helpful when our resources are JavaScript or CSS libraries that in turn depend on other libraries.
+Class _ResourceReference_ allows to specify the resources it depends on overriding method _getDependencies()_. The method returns a list of _HeaderItemS_ that must be rendered before the resource referenced by _ResourceReference_ can be used. This can be really helpful when our resources are JavaScript or CSS libraries that in turn depend on other libraries.
For example we can use this method to ensure that a custom reference to JQueryUI library will find JQuery already loaded in the page:
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/testingspring/testingspring_1.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/testingspring/testingspring_1.adoc b/wicket-user-guide/src/main/asciidoc/testingspring/testingspring_1.adoc
index b77358f..32db6f9 100644
--- a/wicket-user-guide/src/main/asciidoc/testingspring/testingspring_1.adoc
+++ b/wicket-user-guide/src/main/asciidoc/testingspring/testingspring_1.adoc
@@ -47,7 +47,7 @@ The additional configuration part containing listener and context parameter defi
</beans>
----
-or use powerful classpath scanning feature of the Spring framework and annotate the MyWebApplication implementation with the appropriate _\_Component_ annotation accordingly while enabling the Spring container to scan the according package(s) of your application for relevant bean definitions:
+or use powerful classpath scanning feature of the Spring framework and annotate the MyWebApplication implementation with the appropriate _Component_ annotation accordingly while enabling the Spring container to scan the according package(s) of your application for relevant bean definitions:
[source,xml]
----
@@ -91,4 +91,4 @@ public class MyWebApplication extends WebApplication {
}
----
-SpringComponentInjector provided by the Wicket framework enables you to get dependencies from the ApplicationContext directly injected into your Wicket components by simply annotating these with the according _\_SpringBean_ annotation.
+SpringComponentInjector provided by the Wicket framework enables you to get dependencies from the ApplicationContext directly injected into your Wicket components by simply annotating these with the according _SpringBean_ annotation.
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/testingspring/testingspring_2.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/testingspring/testingspring_2.adoc b/wicket-user-guide/src/main/asciidoc/testingspring/testingspring_2.adoc
index f72d4ec..4175c17 100644
--- a/wicket-user-guide/src/main/asciidoc/testingspring/testingspring_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/testingspring/testingspring_2.adoc
@@ -34,7 +34,7 @@ public class LoginPageTest {
}
----
-By defining three annotations on the class level (see code snippet above) in your test, Spring's TestContext framework takes care of preparing and initializing an ApplicationContext instance having all the beans defined in the according Spring context file as well as the transaction management in case your integration test includes some kind of database access. Fields marked with _\_Autowired_ annotation will be automatically dependency injected as well so that you can easily access and use these for your testing purposes. Since MyWebApplication, which extends Wicket's WebApplication type and represents the main class of our web application, is also a bean within the ApplicationContext managed by Spring, it will also be provided to us by the test framework itself and can be easily used in order to initialize a WicketTester instance later on during the execution of the test's setUp() method. With this kind of simple, annotation based test configuration we are able to run an integrati
on test that verifies whether a LoginPage gets started and initialized, whether the rendering of the page runs smoothly and whether the page itself contains a LoginComponent that we possibly need in order to process user's login successfully.
+By defining three annotations on the class level (see code snippet above) in your test, Spring's TestContext framework takes care of preparing and initializing an ApplicationContext instance having all the beans defined in the according Spring context file as well as the transaction management in case your integration test includes some kind of database access. Fields marked with _Autowired_ annotation will be automatically dependency injected as well so that you can easily access and use these for your testing purposes. Since MyWebApplication, which extends Wicket's WebApplication type and represents the main class of our web application, is also a bean within the ApplicationContext managed by Spring, it will also be provided to us by the test framework itself and can be easily used in order to initialize a WicketTester instance later on during the execution of the test's setUp() method. With this kind of simple, annotation based test configuration we are able to run an integration
test that verifies whether a LoginPage gets started and initialized, whether the rendering of the page runs smoothly and whether the page itself contains a LoginComponent that we possibly need in order to process user's login successfully.
When you run this test though, you'll unfortunately get the following exception raised:
@@ -105,7 +105,7 @@ public SpringComponentInjector(WebApplication webapp, ApplicationContext ctx,
}
----
-In order to use this constructor instead of the one we used previously, we now obviously need to get hold of the _ApplicationContext_ instance on our own in our _MyWebApplication_ implementation. The easiest way to do this is to use Spring's own concept of http://docs.spring.io/spring/docs/3.0.x/spring-framework-reference/html/beans.html#beans-factory-aware[lifecycle callbacks] provided to the beans managed by the Spring container. Since our _MyWebApplication_ is also a bean managed by the Spring container at runtime (enabled by the classpath scanning and _\_Component_ annotation on a type level), we can declare it to implement _ApplicationContextAware_ interface which ensures that it gets provided with the _ApplicationContext_ instance that it runs in by the Spring container itself during startup.
+In order to use this constructor instead of the one we used previously, we now obviously need to get hold of the _ApplicationContext_ instance on our own in our _MyWebApplication_ implementation. The easiest way to do this is to use Spring's own concept of http://docs.spring.io/spring/docs/3.0.x/spring-framework-reference/html/beans.html#beans-factory-aware[lifecycle callbacks] provided to the beans managed by the Spring container. Since our _MyWebApplication_ is also a bean managed by the Spring container at runtime (enabled by the classpath scanning and _Component_ annotation on a type level), we can declare it to implement _ApplicationContextAware_ interface which ensures that it gets provided with the _ApplicationContext_ instance that it runs in by the Spring container itself during startup.
[source,java]
----
http://git-wip-us.apache.org/repos/asf/wicket/blob/74e53e4d/wicket-user-guide/src/main/asciidoc/urls.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/urls.adoc b/wicket-user-guide/src/main/asciidoc/urls.adoc
index 069c83b..5ce413f 100644
--- a/wicket-user-guide/src/main/asciidoc/urls.adoc
+++ b/wicket-user-guide/src/main/asciidoc/urls.adoc
@@ -1,5 +1,5 @@
-Up to now we used component Link to move from a page to another and we have seen that it is quiet similar to a “click” event handler (see <<helloWorld.adoc#_wicket_links,paragraph 4.4>>).
+Up to now we used component Link to move from a page to another and we have seen that it is quite similar to a “click” event handler (see <<helloWorld.adoc#_wicket_links,paragraph 4.4>>).
However this component alone is not enough to build all possible kinds of links we may need in our pages. Therefore, Wicket offers other link components suited for those tasks which can not be accomplished with a basic Link.