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/06/12 14:44:44 UTC

wicket git commit: WICKET-6395 Documentation should reflect that Link and Form are now typed

Repository: wicket
Updated Branches:
  refs/heads/master 3fd9c9836 -> d6c063998


WICKET-6395 Documentation should reflect that Link and Form are now
typed

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

Branch: refs/heads/master
Commit: d6c0639989ef1110c20ed5d55a20438186b89b90
Parents: 3fd9c98
Author: Andrea Del Bene <an...@innoteam.it>
Authored: Mon Jun 12 15:20:55 2017 +0200
Committer: Andrea Del Bene <an...@innoteam.it>
Committed: Mon Jun 12 15:20:55 2017 +0200

----------------------------------------------------------------------
 .../src/main/asciidoc/ajax/ajax_1.adoc          |  8 ++---
 .../src/main/asciidoc/ajax/ajax_2.adoc          |  4 +--
 .../src/main/asciidoc/ajax/ajax_3.adoc          |  4 +--
 .../asciidoc/bestpractices/bestpractices_7.adoc |  2 +-
 .../componentLifecycle_4.adoc                   |  2 +-
 .../componentQueueing/componentQueueing_1.adoc  | 10 +++---
 .../src/main/asciidoc/forms2/forms2_10.adoc     |  2 +-
 .../src/main/asciidoc/forms2/forms2_11.adoc     |  8 ++---
 .../src/main/asciidoc/forms2/forms2_2.adoc      |  2 +-
 .../src/main/asciidoc/forms2/forms2_3.adoc      | 34 ++++++++++----------
 .../src/main/asciidoc/forms2/forms2_5.adoc      | 10 +++---
 .../src/main/asciidoc/forms2/forms2_8.adoc      |  2 +-
 .../main/asciidoc/helloWorld/helloWorld_4.adoc  |  4 +--
 .../src/main/asciidoc/i18n/i18n_2.adoc          |  2 +-
 .../src/main/asciidoc/i18n/i18n_3.adoc          |  2 +-
 .../src/main/asciidoc/i18n/i18n_4.adoc          |  2 +-
 .../asciidoc/modelsforms/modelsforms_4.adoc     |  2 +-
 .../asciidoc/modelsforms/modelsforms_6.adoc     |  8 ++---
 .../src/main/asciidoc/security/security_1.adoc  |  6 ++--
 .../src/main/asciidoc/urls/urls_1.adoc          |  4 +--
 .../src/main/asciidoc/urls/urls_2.adoc          |  2 +-
 .../src/main/asciidoc/urls/urls_6.adoc          |  2 +-
 .../versioningCaching/versioningCaching_2.adoc  |  2 +-
 23 files changed, 62 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/ajax/ajax_1.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/ajax/ajax_1.adoc b/wicket-user-guide/src/main/asciidoc/ajax/ajax_1.adoc
index 12ad03f..cbf096e 100644
--- a/wicket-user-guide/src/main/asciidoc/ajax/ajax_1.adoc
+++ b/wicket-user-guide/src/main/asciidoc/ajax/ajax_1.adoc
@@ -9,7 +9,7 @@ For example component AjaxLink (in package _org.apache.wicket.ajax.markup.html_)
 
 [source,java]
 ----
-new AjaxLink("ajaxLink"){
+new AjaxLink<Void>("ajaxLink"){
 	@Override
 	public void onClick(AjaxRequestTarget target) {
 	    //some server side code...
@@ -21,7 +21,7 @@ Using AjaxRequestTarget we can specify the content that must be sent back to the
 
 [source,java]
 ----
-new AjaxLink("ajaxLink"){
+new AjaxLink<Void>("ajaxLink"){
 	@Override
 	public void onClick(AjaxRequestTarget target) {
 	    //modify the model of a label and refresh it on browser
@@ -40,7 +40,7 @@ final Label label = new Label("labelComponent", "Initial value.");
 label.setOutputMarkupId(true);
 add(label);
 //...
-new AjaxLink("ajaxLink"){
+new AjaxLink<Void>("ajaxLink"){
 	@Override
 	public void onClick(AjaxRequestTarget target) {
 	    //modify the model of a label and refresh it on client side
@@ -54,7 +54,7 @@ Another common use of AjaxRequestTarget is to prepend or append some JavaScript
 
 [source,java]
 ----
-new AjaxLink("ajaxLink"){
+new AjaxLink<Void>("ajaxLink"){
 	@Override
 	public void onClick(AjaxRequestTarget target) {
 	    target.appendJavaScript(";alert('Hello!!');");

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/ajax/ajax_2.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/ajax/ajax_2.adoc b/wicket-user-guide/src/main/asciidoc/ajax/ajax_2.adoc
index 69f6fe9..04ecd49 100644
--- a/wicket-user-guide/src/main/asciidoc/ajax/ajax_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/ajax/ajax_2.adoc
@@ -107,7 +107,7 @@ public HomePage(final PageParameters parameters) {
    	modalWindow.setTitle("Modal window");
     	
    	add(modalWindow);
-   	add(new AjaxLink("openWindow") {
+   	add(new AjaxLink<Void>("openWindow") {
 	  @Override
 	  public void onClick(AjaxRequestTarget target) {
 		modalWindow.show(target);				
@@ -341,7 +341,7 @@ label.setVisible(false);
 label.setOutputMarkupPlaceholderTag(true);
 add(label);
 //...
-new AjaxLink("ajaxLink"){
+new AjaxLink<Void>("ajaxLink"){
 	@Override
 	public void onClick(AjaxRequestTarget target) {
 	    //turn label to visible

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/ajax/ajax_3.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/ajax/ajax_3.adoc b/wicket-user-guide/src/main/asciidoc/ajax/ajax_3.adoc
index 5fe8a4b..ed2db2b 100644
--- a/wicket-user-guide/src/main/asciidoc/ajax/ajax_3.adoc
+++ b/wicket-user-guide/src/main/asciidoc/ajax/ajax_3.adoc
@@ -73,7 +73,7 @@ This behavior allows to send a form via AJAX when the component it is attached t
 
 [source,java]
 ----
-Form form = new Form("form");		
+Form<Void> form = new Form<>("form");		
 Button submitButton = new Button("submitButton");
 //submit form when button is clicked		
 submitButton.add(new AjaxFormSubmitBehavior(form, "click"){});
@@ -91,7 +91,7 @@ The behavior doesn't work with radio buttons and checkboxes. For these kinds of
 
 [source,java]
 ----
-Form form = new Form("form");		
+Form<Void> form = new Form<>("form");		
 TextField textField = new TextField("textField", Model.of(""));
 //update the model of the text field each time event "change" occurs
 textField.add(new AjaxFormComponentUpdatingBehavior("change"){

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_7.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_7.adoc b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_7.adoc
index 1c6cf66..d8d8820 100644
--- a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_7.adoc
+++ b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_7.adoc
@@ -7,7 +7,7 @@ Avoid unwrapping models within the constructor hierarchy, i.e. do not call _IMod
 
 [source,java]
 ----
-new Form("register") {
+new Form<Void>("register") {
     public void onSubmit() {
         // correct, unwrap model in an event call
         Registration reg = registrationModel.getObject()

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/componentLifecycle/componentLifecycle_4.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/componentLifecycle/componentLifecycle_4.adoc b/wicket-user-guide/src/main/asciidoc/componentLifecycle/componentLifecycle_4.adoc
index db28a95..a5425d8 100644
--- a/wicket-user-guide/src/main/asciidoc/componentLifecycle/componentLifecycle_4.adoc
+++ b/wicket-user-guide/src/main/asciidoc/componentLifecycle/componentLifecycle_4.adoc
@@ -23,7 +23,7 @@ public class HomePage extends WebPage
 		secondLabel = new Label("label", "Second label");
 		
 		add(firstLabel);
-		add(new Link("reload"){
+		add(new Link<Void>("reload"){
 			@Override
 			public void onClick() {
 			}

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/componentQueueing/componentQueueing_1.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/componentQueueing/componentQueueing_1.adoc b/wicket-user-guide/src/main/asciidoc/componentQueueing/componentQueueing_1.adoc
index 74d023f..6aa2c59 100644
--- a/wicket-user-guide/src/main/asciidoc/componentQueueing/componentQueueing_1.adoc
+++ b/wicket-user-guide/src/main/asciidoc/componentQueueing/componentQueueing_1.adoc
@@ -18,7 +18,7 @@ and then we repeat the same hierarchy in Java code:
 
 [source,java]
 ----
-Form form=new Form("customer");
+Form<Void> form = new Form<>("customer");
 add(form);
  
 form.add(new TextField("first"));
@@ -36,7 +36,7 @@ The need for the hierarchy in the markup is obvious, it is simply how the markup
 
 [source,java]
 ----
-add(new Form("customer"));
+add(new Form<Void>("customer"));
 add(new TextField("first"));
 add(new TextField("last"));
 WebMarkupContainer child=new WebMarkupContainer("child");
@@ -88,7 +88,7 @@ Seems simple enough, but to do so we need to create the new container, find the
 
 [source,java]
 ----
-Form form=new Form("customer");
+Form<Void> form = new Form<>("customer");
 add(form);
  
 form.add(new TextField("first"));
@@ -99,7 +99,7 @@ Will become:
 
 [source,java]
 ----
-Form form=new Form("customer");
+Form<Void> form = new Form<>("customer");
 add(form);
  
 WebMarkupContainer container=new WebMarkupContainer("container");
@@ -121,7 +121,7 @@ That means we can go from code like this:
 
 [source,java]
 ----
-Form form=new Form("customer");
+Form<Void> form = new Form<>("customer");
 add(form);
  
 form.add(new TextField("first"));

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/forms2/forms2_10.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_10.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_10.adoc
index 99c4de5..7c0509c 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_10.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_10.adoc
@@ -47,7 +47,7 @@ public class HomePage extends WebPage {
     private String username;
     
     public HomePage(final PageParameters parameters) {
-       StatelessForm form = new StatelessForm("form"){
+       StatelessForm<Void> form = new StatelessForm<Void>("form"){
          @Override
          protected void onSubmit() {
             //sign in if username and password are “user”

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/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 3e86bda..ae67daa 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc
@@ -69,13 +69,13 @@ The markup and the code for this example are the following:
 [source,java]
 ----
 public HomePage(final PageParameters parameters) {
-    	RegistrationInfo registrtionInfo = new RegistrationInfo();
-    	registrtionInfo.setSubscribeList(true);
+    RegistrationInfo registrtionInfo = new RegistrationInfo();
+    registrtionInfo.setSubscribeList(true);
     	
-    	Form form = new Form("form", 
+    Form<Void> form = new Form<>("form", 
     			new CompoundPropertyModel<RegistrationInfo>(registrtionInfo));		
 		
-    	form.add(new TextField("name"));
+    form.add(new TextField("name"));
 	form.add(new TextField("surname"));
 	form.add(new TextField("address"));
 	form.add(new TextField("email"));

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/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 4ff62e3..15c2f2c 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_2.adoc
@@ -242,7 +242,7 @@ In the example seen in the previous paragraph we have a form which uses success
 public class HomePage extends WebPage {
 
     public HomePage(final PageParameters parameters) {	
-	Form form = new Form("form"){
+	Form<Void> form = new Form<Void>("form"){
 		@Override
 		protected void onSubmit() {
 			super.onSubmit();

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/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 cf3233b..2dd3cf5 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_3.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_3.adoc
@@ -114,26 +114,26 @@ public class HomePage extends WebPage {
     	TextField regExpPatternTxt;
 	TextField stringToSplitTxt;
 		
-    	Form form = new Form("form"){
-			@Override
-			protected void onSubmit() {
-				super.onSubmit();
-				String messageResult = "Tokens for the given string and pattern:<br/>";
-				String[] tokens = regExpPattern.split(stringToSplit);
-			
-				for (String token : tokens) {
-					messageResult += "- " + token + "<br/>";
-				}				
-				success(messageResult);
+    	Form<Void> form = new Form<Void>("form"){
+		@Override
+		protected void onSubmit() {
+			super.onSubmit();
+			String messageResult = "Tokens for the given string and pattern:<br/>";
+			String[] tokens = regExpPattern.split(stringToSplit);
+		
+			for (String token : tokens) {
+				messageResult += "- " + token + "<br/>";
+			}				
+			success(messageResult);
 		}
 	};
     	
-		form.setDefaultModel(new CompoundPropertyModel(this));
-		form.add(regExpPatternTxt = new TextField("regExpPattern"));
-		form.add(stringToSplitTxt = new TextField("stringToSplit"));
-		add(new FeedbackPanel("feedbackMessage").setEscapeModelStrings(false));
-		
-		add(form);
+	form.setDefaultModel(new CompoundPropertyModel(this));
+	form.add(regExpPatternTxt = new TextField("regExpPattern"));
+	form.add(stringToSplitTxt = new TextField("stringToSplit"));
+	add(new FeedbackPanel("feedbackMessage").setEscapeModelStrings(false));
+	
+	add(form);
     }
 }
 ----

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/forms2/forms2_5.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_5.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_5.adoc
index 4d65fd2..9c22052 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_5.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_5.adoc
@@ -50,14 +50,14 @@ In the following snippet we have a form with two submit buttons bound to an <inp
 public class HomePage extends WebPage {
 	
 	public HomePage(final PageParameters parameters) {		
-		Form form = new Form("form");
+		Form<Void> form = new Form<>("form");
 	
-	     	form.add(new TextField("username", Model.of("")));
-	    	form.add(new Button("submit1", Model.of("First submitter")));
+	    form.add(new TextField("username", Model.of("")));
+	    form.add(new Button("submit1", Model.of("First submitter")));
 		Button secondSubmitter;
 		form.add(secondSubmitter = new Button("submit2", Model.of("Second submitter")));
 		
-	    	form.setDefaultButton(secondSubmitter);
+	    form.setDefaultButton(secondSubmitter);
 		add(form);
 	}
 }
@@ -110,7 +110,7 @@ A notable difference between this component and Button is that SubmitLink can be
 public class HomePage extends WebPage {
 	
 	public HomePage(final PageParameters parameters) {		
-		Form form = new Form("form");
+		Form<Void> form = new Form<>("form");
 	    
 		form.add(new PasswordTextField("password", Model.of("")));
 		//specify the form to submit

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/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 10f5c56..df4b665 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_8.adoc
@@ -35,7 +35,7 @@ public class HomePage extends BootstrapBasePage {
         
         fileUploadField = new FileUploadField("fileUploadField");
         
-        Form form = new Form("form"){
+        Form<Void> form = new Form<Void>("form"){
             @Override
             protected void onSubmit() {
               super.onSubmit();

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_4.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_4.adoc b/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_4.adoc
index 40851cf..0c60adc 100644
--- a/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_4.adoc
+++ b/wicket-user-guide/src/main/asciidoc/helloWorld/helloWorld_4.adoc
@@ -8,7 +8,7 @@ That said, you shouldn't be surprised to find an abstract method called _onClick
 ----
 public class HomePage extends WebPage {
 	public HomePage(){
-		add(new Link("id"){
+		add(new Link<Void>("id"){
 			@Override
 			public void onClick() {
 				//link code goes here
@@ -24,7 +24,7 @@ By default after _onClick_ has been executed, Wicket will send back to the curre
 ----
 public class HomePage extends WebPage {
 	public HomePage(){
-		add(new Link("id"){
+		add(new Link<Void>("id"){
 			@Override
 			public void onClick() {			   
                          //we redirect browser to another page.

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/i18n/i18n_2.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/i18n/i18n_2.adoc b/wicket-user-guide/src/main/asciidoc/i18n/i18n_2.adoc
index 62b3ae8..fb82e0c 100644
--- a/wicket-user-guide/src/main/asciidoc/i18n/i18n_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/i18n/i18n_2.adoc
@@ -101,7 +101,7 @@ List<Locale> locales = Arrays.asList(Locale.ENGLISH, Locale.CHINESE, Locale.GERM
 final DropDownChoice<Locale> changeLocale = 
              new DropDownChoice<Locale>("changeLocale", new Model<Locale>(), locales);
 		
-StatelessForm form = new StatelessForm("form"){
+StatelessForm<Void> form = new StatelessForm<Void>("form"){
 	@Override
 	protected void onSubmit() {
 		Session.get().setLocale(changeLocale.getModelObject());

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/i18n/i18n_3.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/i18n/i18n_3.adoc b/wicket-user-guide/src/main/asciidoc/i18n/i18n_3.adoc
index 6fc8570..7558a3a 100644
--- a/wicket-user-guide/src/main/asciidoc/i18n/i18n_3.adoc
+++ b/wicket-user-guide/src/main/asciidoc/i18n/i18n_3.adoc
@@ -49,7 +49,7 @@ Page code:
 
 [source,java]
 ----
-Form form = new Form("form");
+Form<Void> form = new Form<>("form");
 form.add(new Label("anotherLabel",new ResourceModel("labelValue")));
 add(form);
 ----

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/i18n/i18n_4.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/i18n/i18n_4.adoc b/wicket-user-guide/src/main/asciidoc/i18n/i18n_4.adoc
index 674bd67..bcf6955 100644
--- a/wicket-user-guide/src/main/asciidoc/i18n/i18n_4.adoc
+++ b/wicket-user-guide/src/main/asciidoc/i18n/i18n_4.adoc
@@ -16,7 +16,7 @@ public HomePage(final PageParameters parameters) {
 	final DropDownChoice<Locale> changeLocale = new DropDownChoice<Locale>("changeLocale", 
                                                     new Model<Locale>(), locales);
 		
-	StatelessForm form = new StatelessForm("form"){
+	StatelessForm<Void> form = new StatelessForm<Void>("form"){
 		@Override
 		protected void onSubmit() {
 			Session.get().setLocale(changeLocale.getModelObject());

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/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 446c7b2..ea54a44 100644
--- a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_4.adoc
+++ b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_4.adoc
@@ -17,7 +17,7 @@ Java code:
 
 [source,java]
 ----
-Form form = new Form("form"){
+Form<Void> form = new Form<Void>("form"){
     @Override
     protected void onSubmit() {
     	System.out.println("Form submitted.");

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_6.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_6.adoc b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_6.adoc
index 3a4f39e..955226b 100644
--- a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_6.adoc
+++ b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_6.adoc
@@ -66,7 +66,7 @@ Here is the whole code of the page (except for the loadPersons() method):
 [source,java]
 ----
 public class PersonListDetails extends WebPage {
-  private Form form;
+  private Form<Void> form;
   private DropDownChoice<Person> personsList;
   
   public PersonListDetails(){
@@ -78,7 +78,7 @@ public class PersonListDetails extends WebPage {
 
     add(personsList);
 
-    form = new Form("form", new CompoundPropertyModel<Person>(listModel));    
+    form = new Form<>("form", new CompoundPropertyModel<Person>(listModel));    
     form.add(new TextField("name"));
     form.add(new TextField("surname"));
     form.add(new TextField("address"));
@@ -87,8 +87,8 @@ public class PersonListDetails extends WebPage {
     add(form);
   }
 
-       //loadPersons()
-       //...
+   //loadPersons()
+   //...
 }
 ----
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/security/security_1.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/security/security_1.adoc b/wicket-user-guide/src/main/asciidoc/security/security_1.adoc
index 2c288a1..33d454a 100644
--- a/wicket-user-guide/src/main/asciidoc/security/security_1.adoc
+++ b/wicket-user-guide/src/main/asciidoc/security/security_1.adoc
@@ -50,9 +50,9 @@ public class AuthenticatedPage extends WebPage {
    @Override
    protected void onInitialize() {
       super.onInitialize();
-      add(new BookmarkablePageLink("goToHomePage", getApplication().getHomePage()));
+      add(new BookmarkablePageLink<Void>("goToHomePage", getApplication().getHomePage()));
 
-      add(new Link("logOut") {
+      add(new Link<Void>("logOut") {
 
          @Override
          public void onClick() {
@@ -78,7 +78,7 @@ public class SignInPage extends WebPage {
    protected void onInitialize() {
       super.onInitialize();
       
-      StatelessForm form = new StatelessForm("form") {
+      StatelessForm<Void> form = new StatelessForm<Void>("form") {
          @Override
          protected void onSubmit() {
             if(Strings.isEmpty(username))

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/urls/urls_1.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/urls/urls_1.adoc b/wicket-user-guide/src/main/asciidoc/urls/urls_1.adoc
index af25221..2e438d8 100644
--- a/wicket-user-guide/src/main/asciidoc/urls/urls_1.adoc
+++ b/wicket-user-guide/src/main/asciidoc/urls/urls_1.adoc
@@ -27,7 +27,7 @@ Link code:
 
 [source,java]
 ----
-add(new Link("pageWithIndexParam") {
+add(new Link<Void>("pageWithIndexParam") {
 
 	@Override
 	public void onClick() {
@@ -95,7 +95,7 @@ Project PageParametersExample comes also with a link to a page with both indexed
 
 [source,java]
 ----
-add(new Link("pageWithNamedIndexParam") {
+add(new Link<Void>("pageWithNamedIndexParam") {
 
 	@Override
  	public void onClick() {

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/urls/urls_2.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/urls/urls_2.adoc b/wicket-user-guide/src/main/asciidoc/urls/urls_2.adoc
index a03ddb9..b2552d0 100644
--- a/wicket-user-guide/src/main/asciidoc/urls/urls_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/urls/urls_2.adoc
@@ -5,7 +5,7 @@ A link to a bookmarkable page can be built with the link component _org.apache.w
 
 [source,java]
 ----
-BookmarkablePageLink bpl=new BookmarkablePageLink(PageWithParameters.class, pageParameters);
+BookmarkablePageLink bpl=new BookmarkablePageLink<Void>(PageWithParameters.class, pageParameters);
 ----
 
 The specific purpose of this component is to provide an anchor to a bookmarkable page, hence we don't have to implement any abstract method like we do with Link component.

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc b/wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc
index 853b14f..c432345 100644
--- a/wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc
+++ b/wicket-user-guide/src/main/asciidoc/urls/urls_6.adoc
@@ -181,7 +181,7 @@ Link code:
 
 [source,java]
 ----
-add(new Link("mountedPage") {
+add(new Link<Void>("mountedPage") {
 
 	@Override
 	public void onClick() {

http://git-wip-us.apache.org/repos/asf/wicket/blob/d6c06399/wicket-user-guide/src/main/asciidoc/versioningCaching/versioningCaching_2.adoc
----------------------------------------------------------------------
diff --git a/wicket-user-guide/src/main/asciidoc/versioningCaching/versioningCaching_2.adoc b/wicket-user-guide/src/main/asciidoc/versioningCaching/versioningCaching_2.adoc
index de22018..499f166 100644
--- a/wicket-user-guide/src/main/asciidoc/versioningCaching/versioningCaching_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/versioningCaching/versioningCaching_2.adoc
@@ -25,7 +25,7 @@ public class HomePage extends WebPage
 		
 		add(firstLabel);
 		
-		add(new Link("reload"){
+		add(new Link<Void>("reload"){
 			@Override
 			public void onClick() {				
 				if(getPage().contains(firstLabel, true))