Minor guide fixes This closes #213
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/da071f7a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/da071f7a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/da071f7a Branch: refs/heads/master Commit: da071f7a6294bbedbb6848f6dd19232eee534e97 Parents: 77602c0 Author: Tim Fleming <tflem...@flemm-aspire.flem-geo.com> Authored: Sat Feb 18 02:01:48 2017 -0600 Committer: Sven Meier <svenme...@apache.org> Committed: Sat Feb 18 11:10:28 2017 +0100 ---------------------------------------------------------------------- .../src/main/asciidoc/helloWorld/helloWorld_2.adoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/da071f7a/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 45e5226..ade0c59 100644 --- a/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_2.adoc +++ b/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_2.adoc @@ -1,5 +1,5 @@ -In this chapter we will see a classic Hello World! example implemented using a Wicket page with a built-in component called _Label_ (the code is from project the HelloWorldExample). Since this is the first example of the guide, before looking at Java code we will go through the common artifacts needed to build a Wicket application from scratch. +In this chapter we will see a classic Hello World! example implemented using a Wicket page with a built-in component called _Label_ (the code is from the HelloWorldExample project). Since this is the first example of the guide, before looking at Java code we will go through the common artifacts needed to build a Wicket application from scratch. NOTE: All the example projects presented in this document have been generated using Maven and the utility page at http://wicket.apache.org/start/quickstart.html[http://wicket.apache.org/start/quickstart.html] . *Appendix A* contains the instructions needed to use these projects and build a quickstart application using Apache Maven. All the artifacts used in the next example (files web.xml, HomePage.class and HomePage.html) are automatically generated by Maven. @@ -60,7 +60,7 @@ Class _Application_ comes with a set of configuration methods that we can overri public abstract Class<? extends Page> getHomePage() ---- -As you may guess from its name, this method specifies which page to use as homepage for our application. +As you may guess from its name, this method specifies which page to use as a homepage for our application. Another important method is _init()_: [source,java] @@ -68,9 +68,9 @@ Another important method is _init()_: protected void init() ---- -This method is called when our application is loaded by the web server (Tomcat, Jetty, etc...) and is the ideal place to put our configuration code. The _Application_ class exposes its settings grouping them into interfaces (you can find them in package _org.apache.wicket.settings_). We can access these interfaces through getter methods that will be gradually introduced in the next chapters when we will cover the related settings. +This method is called when our application is loaded by the web server (Tomcat, Jetty, etc...) and is the ideal place to put our configuration code. The _Application_ class exposes its settings grouping them into interfaces (you can find them in package _org.apache.wicket.settings_). We can access these interfaces through getter methods, which will be gradually introduced in the next chapters when covering related settings. -The current application's instance can be retrieved at any time calling static method _Application.get()_ in our code. We will give more details about this method in <<requestProcessing.adoc#_the_director_of_request_processing_requestcycle,chapter 9.3>>. The content of the application class from project HelloWorldExample is the following: +The current application's instance can be retrieved at any time by calling static method _Application.get()_ in our code. We will give more details about this method in <<requestProcessing.adoc#_the_director_of_request_processing_requestcycle,chapter 9.3>>. The content of the application class from the HelloWorldExample project is the following: [source,java] ---- @@ -91,8 +91,8 @@ public class WicketApplication extends WebApplication } ---- -Since this is a very basic example of a Wicket application, we don't need to specify anything inside the _init_ method. The home page of the application is the _HomePage_ class. In the next paragraph we will see how this page is implemented and which conventions we have to follow to create a page in Wicket. +Since this is a very basic example of a Wicket application, we don't need to specify anything inside the _init_ method. The home page of the application is the _HomePage_ class. In the next paragraph we will see how this page is implemented and what conventions we have to follow to create a page in Wicket. -NOTE: Declaring a _WicketFilter_ inside web.xml descriptor is not the only way we have to kickstart our application. +NOTE: Declaring a _WicketFilter_ inside web.xml descriptor is not the only way we have to kick-start our application. If we prefer to use a servlet instead of a filter, we can use class _org.apache.wicket.protocol.http.WicketServlet_. See the JavaDoc for further details.
