From 0b223545fa8f5c3a6007004b604898c486bbcaee Mon Sep 17 00:00:00 2001 From: meno Date: Tue, 8 Mar 2016 08:51:09 +0100 Subject: [PATCH 1/9] Update forms2_3.gdoc TextField for regexp pattern was named mail, renamed to regExpPatternTxt for consistency. --- wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc index b99ccf4f9ef..8cf5665a870 100644 --- a/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc +++ b/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc @@ -101,19 +101,19 @@ Finally, in the home page of the project we build the form which displays (with {code} public class HomePage extends WebPage { - private Pattern regExpPatter; + private Pattern regExpPattern; private String stringToSplit; public HomePage(final PageParameters parameters) { - TextField mail; + TextField regExpPatternTxt; TextField stringToSplitTxt; Form form = new Form("form"){ @Override protected void onSubmit() { super.onSubmit(); - String messageResult = "Tokens for the given string and pattern:
"; - String[] tokens = regExpPatter.split(stringToSplit); + String mmessageResult = "Tokens for the given string and pattern:
"; + String[] tokens = regExpPattern.split(stringToSplit); for (String token : tokens) { messageResult += "- " + token + "
"; @@ -123,7 +123,7 @@ public class HomePage extends WebPage { }; form.setDefaultModel(new CompoundPropertyModel(this)); - form.add(mail = new TextField("regExpPatter")); + form.add(regExpPatternTxt = new TextField("regExpPattern")); form.add(stringToSplitTxt = new TextField("stringToSplit")); add(new FeedbackPanel("feedbackMessage").setEscapeModelStrings(false)); From 24009683036234c841a7ccb2fd5a402d967de86d Mon Sep 17 00:00:00 2001 From: meno Date: Tue, 8 Mar 2016 08:52:43 +0100 Subject: [PATCH 2/9] Update forms2_3.gdoc typo fix --- wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc index 8cf5665a870..2478a2779a1 100644 --- a/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc +++ b/wicket-user-guide/src/docs/guide/forms2/forms2_3.gdoc @@ -112,7 +112,7 @@ public class HomePage extends WebPage { @Override protected void onSubmit() { super.onSubmit(); - String mmessageResult = "Tokens for the given string and pattern:
"; + String messageResult = "Tokens for the given string and pattern:
"; String[] tokens = regExpPattern.split(stringToSplit); for (String token : tokens) { From fca0cfc3130dc0e2caf034597faa9d771d9d2b3a Mon Sep 17 00:00:00 2001 From: meno Date: Tue, 8 Mar 2016 09:19:37 +0100 Subject: [PATCH 3/9] Update forms2_5.gdoc fixed formatting of sample java and html snippets, some of them were quiet cumbersome to read --- .../src/docs/guide/forms2/forms2_5.gdoc | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_5.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_5.gdoc index 46a2b0be6ed..f5869b4614e 100644 --- a/wicket-user-guide/src/docs/guide/forms2/forms2_5.gdoc +++ b/wicket-user-guide/src/docs/guide/forms2/forms2_5.gdoc @@ -33,12 +33,12 @@ In the following snippet we have a form with two submit buttons bound to an -
- Username: -
- - -
+
+ Username: +
+ + +
{code} @@ -47,17 +47,17 @@ In the following snippet we have a form with two submit buttons bound to an - + -
+ Password:
@@ -104,14 +104,14 @@ A notable difference between this component and Button is that SubmitLink can be {code} public class HomePage extends WebPage { - public HomePage(final PageParameters parameters) { + public HomePage(final PageParameters parameters) { Form form = new Form("form"); - + form.add(new PasswordTextField("password", Model.of(""))); //specify the form to submit add(new SubmitLink("externalSubmitter", form)); add(form); - } + } } {code} @@ -121,4 +121,4 @@ With an IFormSubmittingComponent we can choose to skip the default form submissi This can be useful if we want to implement a “Cancel” button on our form which redirects user to another page without validating his/her input. -When we set this flag to false we can decide to manually invoke the form processing by calling the process(IFormSubmittingComponent) method. \ No newline at end of file +When we set this flag to false we can decide to manually invoke the form processing by calling the process(IFormSubmittingComponent) method. From ea11f1c4f44af3bb7889c7fcf6d0d3089a73f447 Mon Sep 17 00:00:00 2001 From: meno Date: Tue, 8 Mar 2016 09:36:37 +0100 Subject: [PATCH 4/9] sample code formatted --- .../src/docs/guide/forms2/forms2_8.gdoc | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_8.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_8.gdoc index 8b03d1b2878..9543c2951a5 100644 --- a/wicket-user-guide/src/docs/guide/forms2/forms2_8.gdoc +++ b/wicket-user-guide/src/docs/guide/forms2/forms2_8.gdoc @@ -11,13 +11,13 @@ In the next example (project UploadSingleFile) we will see a form which allows u -

Upload your file here!

-
- - -
-
-
+

Upload your file here!

+
+ + +
+
+
{code} @@ -26,36 +26,36 @@ In the next example (project UploadSingleFile) we will see a form which allows u {code} public class HomePage extends WebPage { - private FileUploadField fileUploadField; - - public HomePage(final PageParameters parameters) { - fileUploadField = new FileUploadField("fileUploadField"); - - Form form = new Form("form"){ - @Override - protected void onSubmit() { - super.onSubmit(); - - FileUpload fileUpload = fileUploadField.getFileUpload(); - - try { - File file = new File(System.getProperty("java.io.tmpdir") + "/" + - fileUpload.getClientFileName()); - - fileUpload.writeTo(file); - } catch (IOException e) { - e.printStackTrace(); - } - } - }; + private FileUploadField fileUploadField; + + public HomePage(final PageParameters parameters) { + fileUploadField = new FileUploadField("fileUploadField"); + + Form form = new Form("form"){ + @Override + protected void onSubmit() { + super.onSubmit(); + + FileUpload fileUpload = fileUploadField.getFileUpload(); + + try { + File file = new File(System.getProperty("java.io.tmpdir") + "/" + + fileUpload.getClientFileName()); + + fileUpload.writeTo(file); + } catch (IOException e) { + e.printStackTrace(); + } + } + }; - form.setMultiPart(true); - //set a limit for uploaded file's size - form.setMaxSize(Bytes.kilobytes(100)); - form.add(fileUploadField); - add(new FeedbackPanel("feedbackPanel")); - add(form); - } + form.setMultiPart(true); + //set a limit for uploaded file's size + form.setMaxSize(Bytes.kilobytes(100)); + form.add(fileUploadField); + add(new FeedbackPanel("feedbackPanel")); + add(form); + } } {code} @@ -70,7 +70,7 @@ The maximum size for uploaded files can also be set at application's level using @Override public void init() { - getApplicationSettings().setDefaultMaximumUploadSize(Bytes.kilobytes(100)); + getApplicationSettings().setDefaultMaximumUploadSize(Bytes.kilobytes(100)); } {code} {note} From 632e775b8e5ce1bdec1089087b313d19a1951828 Mon Sep 17 00:00:00 2001 From: meno Date: Tue, 8 Mar 2016 09:38:43 +0100 Subject: [PATCH 5/9] sample code formatted --- wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc index 4f6dd73f496..aa95cf6ae19 100644 --- a/wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc +++ b/wicket-user-guide/src/docs/guide/forms2/forms2_9.gdoc @@ -51,7 +51,7 @@ public class TemperatureDegreeField extends FormComponentPanel { protected void onInitialize() { super.onInitialize(); - AbstractReadOnlyModel labelModel=new AbstractReadOnlyModel(){ + AbstractReadOnlyModel labelModel=new AbstractReadOnlyModel(){ @Override public String getObject() { if(getLocale().equals(Locale.US)) @@ -62,7 +62,7 @@ public class TemperatureDegreeField extends FormComponentPanel { add(new Label("mesuramentUnit", labelModel)); add(userDegree=new TextField("registeredTemperature", new - Model())); + Model())); userDegree.setType(Double.class); } {code} From 8c0860d4e7604afa5a911cf01803b11c12e812dc Mon Sep 17 00:00:00 2001 From: meno Date: Tue, 8 Mar 2016 09:40:12 +0100 Subject: [PATCH 6/9] sample code formatted --- wicket-user-guide/src/docs/guide/forms2/forms2_11.gdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wicket-user-guide/src/docs/guide/forms2/forms2_11.gdoc b/wicket-user-guide/src/docs/guide/forms2/forms2_11.gdoc index fa656f6d1ff..e591240c7de 100644 --- a/wicket-user-guide/src/docs/guide/forms2/forms2_11.gdoc +++ b/wicket-user-guide/src/docs/guide/forms2/forms2_11.gdoc @@ -131,7 +131,7 @@ Person bob = new Person("Bob", "Smith"); Person jill = new Person("Jill", "Smith"); List theSmiths = Arrays.asList(john, bob, jill); ChoiceRenderer render = new ChoiceRenderer("name"); - form.add(new CheckBoxMultipleChoice("checkGroup", new ListModel(new ArrayList()), +form.add(new CheckBoxMultipleChoice("checkGroup", new ListModel(new ArrayList()), theSmiths, render)); {code} From 9446ce2e24f56663bb0f8d2b2272a7bf502abec0 Mon Sep 17 00:00:00 2001 From: meno Date: Tue, 8 Mar 2016 10:40:35 +0100 Subject: [PATCH 7/9] sample code formatted --- .../src/docs/guide/repeaters/repeaters_2.gdoc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/wicket-user-guide/src/docs/guide/repeaters/repeaters_2.gdoc b/wicket-user-guide/src/docs/guide/repeaters/repeaters_2.gdoc index 6b06ea8ba1c..c3bcc713425 100644 --- a/wicket-user-guide/src/docs/guide/repeaters/repeaters_2.gdoc +++ b/wicket-user-guide/src/docs/guide/repeaters/repeaters_2.gdoc @@ -23,14 +23,14 @@ To generate its children, ListView calls its abstract method populateItem(ListIt *Java Code (Page Constructor):* {code} public HomePage(final PageParameters parameters) { - List persons = Arrays.asList(new Person("John", "Smith"), + List persons = Arrays.asList(new Person("John", "Smith"), new Person("Dan", "Wong")); - add(new ListView("persons", persons) { - @Override - protected void populateItem(ListItem item) { - item.add(new Label("fullName", new PropertyModel(item.getModel(), "fullName"))); - } + add(new ListView("persons", persons) { + @Override + protected void populateItem(ListItem item) { + item.add(new Label("fullName", new PropertyModel(item.getModel(), "fullName"))); + } }); } {code} @@ -45,4 +45,4 @@ h3. ListView and Form By default @ListView@ replaces its children components with new instances every time is rendered. Unfortunately this behavior is a problem if @ListView@ is inside a form and it contains form components. The problem is caused by the fact that children components are replaced by new ones before form is rendered, hence they can't keep their input value if validation fails and, furthermore, their feedback messages can not be displayed. -To avoid this kind of problem we can force @ListView@ to reuse its children components using its method setReuseItems and passing true as parameter. If for any reason we need to refresh children components after we have invoked setReuseItems(true), we can use MarkupContainer's method @removeAll()@ to force @ListView@ to rebuild them. \ No newline at end of file +To avoid this kind of problem we can force @ListView@ to reuse its children components using its method setReuseItems and passing true as parameter. If for any reason we need to refresh children components after we have invoked setReuseItems(true), we can use MarkupContainer's method @removeAll()@ to force @ListView@ to rebuild them. From 4a2dd15f48cb149bfdb6bae71f29b912fa96459c Mon Sep 17 00:00:00 2001 From: meno Date: Tue, 8 Mar 2016 10:41:23 +0100 Subject: [PATCH 8/9] sample code formatted --- wicket-user-guide/src/docs/guide/repeaters/repeaters_3.gdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wicket-user-guide/src/docs/guide/repeaters/repeaters_3.gdoc b/wicket-user-guide/src/docs/guide/repeaters/repeaters_3.gdoc index ec217191c48..5ad775f710c 100644 --- a/wicket-user-guide/src/docs/guide/repeaters/repeaters_3.gdoc +++ b/wicket-user-guide/src/docs/guide/repeaters/repeaters_3.gdoc @@ -35,10 +35,10 @@ public HomePage(final PageParameters parameters) { item.add(new Label("fullName", new PropertyModel(item.getModel(), "fullName"))); } -@Override + @Override protected Iterator> getItemModels() { return persons.iterator(); -} + } }); } {code} @@ -47,4 +47,4 @@ h3. Item reuse strategy Similar to @ListView@, the default behavior of the @RefreshingView@ is to replace its children with new instances every time is rendered. The strategy that decides if and how children components must be refreshed is returned by method @getItemReuseStrategy@. This strategy is an implementation of interface IItemReuseStrategy. The default implementation used by @RefreshingView@ is class @DefaultItemReuseStrategy@ but Wicket provides also strategy @ReuseIfModelsEqualStrategy@ which reuses an item if its model has been returned by the iterator obtained with method @getItemModels@. -To set a custom strategy we must use method @setItemReuseStrategy@. \ No newline at end of file +To set a custom strategy we must use method @setItemReuseStrategy@. From e79cc6a27c699901096cf623c8e2f90bc9bd3c65 Mon Sep 17 00:00:00 2001 From: meno Date: Tue, 8 Mar 2016 11:52:17 +0100 Subject: [PATCH 9/9] grammar/typo fix --- wicket-user-guide/src/docs/guide/repeaters/repeaters_4.gdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wicket-user-guide/src/docs/guide/repeaters/repeaters_4.gdoc b/wicket-user-guide/src/docs/guide/repeaters/repeaters_4.gdoc index 71c579330b9..94241151edc 100644 --- a/wicket-user-guide/src/docs/guide/repeaters/repeaters_4.gdoc +++ b/wicket-user-guide/src/docs/guide/repeaters/repeaters_4.gdoc @@ -103,10 +103,10 @@ public HomePage(final PageParameters parameters) { } {code} -The data of a single country (ISO code, name, long name, capital and population) are handled with an array of strings. The usage of PagingNavigator it's quite straightforward as we need to simply pass the pageable repeater to its constructor. +The data of a single country (ISO code, name, long name, capital and population) are handled with an array of strings. The usage of PagingNavigator is quite straightforward as we need to simply pass the pageable repeater to its constructor. To explore the other pageable repeaters shipped with Wicket you can visit the page at "http://www.wicket-library.com/wicket-examples/repeater/":http://www.wicket-library.com/wicket-examples/repeater/ where you can find live examples of these components. {note} -Wicket provides also component PageableListView which is a sublcass of ListView that implements interface IPageable, hence it can be considered a pageable repeaters even if it doesn't use interface IDataProvider as data source. +Wicket provides also component PageableListView which is a sublcass of ListView that implements interface IPageable, hence it can be considered a pageable repeater even if it doesn't use interface IDataProvider as data source. {note}