Repository: wicket Updated Branches: refs/heads/master cbda2bc42 -> 40ab5ecfa
Removed AbstractReadOnlyModel from example code Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/40ab5ecf Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/40ab5ecf Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/40ab5ecf Branch: refs/heads/master Commit: 40ab5ecfa8a375e511b51075a60f56efafd2debf Parents: cbda2bc Author: Andrea Del Bene <[email protected]> Authored: Mon Apr 24 18:08:21 2017 +0200 Committer: Andrea Del Bene <[email protected]> Committed: Mon Apr 24 18:09:22 2017 +0200 ---------------------------------------------------------------------- .../main/asciidoc/bestpractices/bestpractices_12.adoc | 14 ++------------ .../src/main/asciidoc/forms2/forms2_9.adoc | 9 +-------- wicket-user-guide/src/main/asciidoc/i18n/i18n_2.adoc | 9 +-------- 3 files changed, 4 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/40ab5ecf/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 3cd7a23..a0bdf28 100644 --- a/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc +++ b/wicket-user-guide/src/main/asciidoc/bestpractices/bestpractices_12.adoc @@ -9,12 +9,7 @@ The factory pattern is useful, but nevertheless not suitable for Wicket componen ---- public class CmsFactory { public Label getCmsLabel(String markupId, final String url) { - IModel<String> fragment = new AbstractReadOnlyModel<String>() { - @Override - public String getObject() { - return loadSomeContent(url); - } - }; + IModel<String> fragment = () -> loadSomeContent(url); Label result = new Label(markupId, fragment); result.setRenderBodyOnly(true); result.setEscapeModelStrings(false); @@ -48,12 +43,7 @@ public class CmsLabel extends Label { CmsResource cmsResource; public CmsLabel(String id, IModel<String> urlModel) { super(id, urlModel); - IModel<String> fragment = new AbstractReadOnlyModel<String>(){ - @Override - public String getObject() { - return cmsResource.loadSomeContent(urlModel.getObject()); - } - }; + IModel<String> fragment = () -> cmsResource.loadSomeContent(urlModel.getObject()); setRenderBodyOnly(true); setEscapeModelStrings(false); } http://git-wip-us.apache.org/repos/asf/wicket/blob/40ab5ecf/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 6722442..af0177e 100644 --- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_9.adoc +++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_9.adoc @@ -54,14 +54,7 @@ public class TemperatureDegreeField extends FormComponentPanel<Double> { protected void onInitialize() { super.onInitialize(); - AbstractReadOnlyModel<String> labelModel=new AbstractReadOnlyModel<String>(){ - @Override - public String getObject() { - if(getLocale().equals(Locale.US)) - return "°F"; - return "°C"; - } - }; + IModel<String> labelModel = () -> getLocale().equals(Locale.US) ? "°F" : "°C"; add(new Label("mesuramentUnit", labelModel)); add(userDegree=new TextField<Double>("registeredTemperature", new http://git-wip-us.apache.org/repos/asf/wicket/blob/40ab5ecf/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 4d2af29..62b3ae8 100644 --- a/wicket-user-guide/src/main/asciidoc/i18n/i18n_2.adoc +++ b/wicket-user-guide/src/main/asciidoc/i18n/i18n_2.adoc @@ -88,18 +88,11 @@ The label displaying the greeting message has a custom read-only model which ret [source,java] ---- -IModel<String> model = new AbstractReadOnlyModel<String>() { - @Override - public String getObject() { - return getString("greetingMessage"); - } -}; +IModel<String> model = () -> getString("greetingMessage"); add(new Label("greetingMessage", model)); ---- -Class _org.apache.wicket.model.AbstractReadOnlyModel_ is a convenience class for implementing read-only models. In this project we have implemented a custom read-only model for illustrative purposes only because Wicket already provides built-in models for the same task. We will see them in paragraph <<i18n.adoc#_internationalization_and_models,paragraph 15.5>>. - The rest of the code of the home page builds the stateless form and the drop-down menu used to change the locale. [source,java]
