http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java index 1886f64..6d6d3f1 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/Home.java @@ -66,69 +66,30 @@ public final class Home extends WicketExamplePage // Add a couple of links to be able to play around with the session // locale - add(new Link<Void>("goCanadian") - { - @Override - public void onClick() - { - getSession().setLocale(Locale.CANADA); - } - }); - add(new Link<Void>("goUS") - { - @Override - public void onClick() - { - getSession().setLocale(Locale.US); - } - }); - add(new Link<Void>("goDutch") - { - @Override - public void onClick() - { - getSession().setLocale(new Locale("nl", "NL")); - } - }); - add(new Link<Void>("goGerman") - { - @Override - public void onClick() - { - getSession().setLocale(new Locale("de", "DE")); - } - }); - add(new Link<Void>("goChinese") - { - @Override - public void onClick() - { - getSession().setLocale(new Locale("zh", "CN")); - } - }); - add(new Link<Void>("goDanish") - { - @Override - public void onClick() - { - getSession().setLocale(new Locale("da", "DK")); - } - }); - add(new Link<Void>("goKorean") + add(new SetLocaleLink("goCanadian", Locale.CANADA)); + add(new SetLocaleLink("goUS", Locale.US)); + add(new SetLocaleLink("goDutch", new Locale("nl", "NL"))); + add(new SetLocaleLink("goGerman", new Locale("de", "DE"))); + add(new SetLocaleLink("goChinese", new Locale("zh", "CN"))); + add(new SetLocaleLink("goDanish", new Locale("da", "DK"))); + add(new SetLocaleLink("goKorean", new Locale("ko", "KR"))); + add(new SetLocaleLink("goHungarian", new Locale("hu"))); + } + + private static class SetLocaleLink extends Link<Void> { + + private final Locale locale; + + private SetLocaleLink(String id, Locale locale) { - @Override - public void onClick() - { - getSession().setLocale(new Locale("ko", "KR")); - } - }); - add(new Link<Void>("goHungarian") + super(id); + this.locale = locale; + } + + @Override + public void onClick() { - @Override - public void onClick() - { - getSession().setLocale(new Locale("hu")); - } - }); + getSession().setLocale(locale); + } } }
http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java index 8d6a1f5..b0a5e91 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub/PubApplication.java @@ -20,22 +20,12 @@ import org.apache.wicket.Page; import org.apache.wicket.examples.WicketExampleApplication; /** - * Application class for the linkomatic example. + * Application class for the pub example. * * @author Jonathan Locke */ public class PubApplication extends WicketExampleApplication { - /** - * Constructor - */ - public PubApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class< ? extends Page> getHomePage() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java index 29e9942..088400c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/Home.java @@ -62,69 +62,30 @@ public final class Home extends WicketExamplePage // Add a couple of links to be able to play around with the session // locale - add(new Link<Void>("goCanadian") - { - @Override - public void onClick() - { - getSession().setLocale(Locale.CANADA); - } - }); - add(new Link<Void>("goUS") - { - @Override - public void onClick() - { - getSession().setLocale(Locale.US); - } - }); - add(new Link<Void>("goDutch") - { - @Override - public void onClick() - { - getSession().setLocale(new Locale("nl", "NL")); - } - }); - add(new Link<Void>("goGerman") - { - @Override - public void onClick() - { - getSession().setLocale(new Locale("de", "DE")); - } - }); - add(new Link<Void>("goChinese") - { - @Override - public void onClick() - { - getSession().setLocale(new Locale("zh", "CN")); - } - }); - add(new Link<Void>("goDanish") - { - @Override - public void onClick() - { - getSession().setLocale(new Locale("da", "DK")); - } - }); - add(new Link<Void>("goKorean") + add(new SetLocaleLink("goCanadian", Locale.CANADA)); + add(new SetLocaleLink("goUS", Locale.US)); + add(new SetLocaleLink("goDutch", new Locale("nl", "NL"))); + add(new SetLocaleLink("goGerman", new Locale("de", "DE"))); + add(new SetLocaleLink("goChinese", new Locale("zh", "CN"))); + add(new SetLocaleLink("goDanish", new Locale("da", "DK"))); + add(new SetLocaleLink("goKorean", new Locale("ko", "KR"))); + add(new SetLocaleLink("goHungarian", new Locale("hu"))); + } + + private static class SetLocaleLink extends Link<Void> { + + private final Locale locale; + + private SetLocaleLink(String id, Locale locale) { - @Override - public void onClick() - { - getSession().setLocale(new Locale("ko", "KR")); - } - }); - add(new Link<Void>("goHungarian") + super(id); + this.locale = locale; + } + + @Override + public void onClick() { - @Override - public void onClick() - { - getSession().setLocale(new Locale("hu")); - } - }); + getSession().setLocale(locale); + } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java index 44777bf..60be297 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/pub2/PubApplication.java @@ -20,22 +20,12 @@ import org.apache.wicket.Page; import org.apache.wicket.examples.WicketExampleApplication; /** - * Application class for the linkomatic example. + * Application class for the pub2 example. * * @author Jonathan Locke */ public class PubApplication extends WicketExampleApplication { - /** - * Constructor - */ - public PubApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class< ? extends Page> getHomePage() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java index be8e6c4..25b2d1f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/BasePage.java @@ -56,9 +56,6 @@ public class BasePage extends ExamplePage } } - /** - * - */ class ActionPanel extends Panel { /** http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java index 00adc84..8db58ce 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java @@ -158,37 +158,13 @@ public class ContactsDatabase private void updateIndecies() { - Collections.sort(fnameIdx, new Comparator<Contact>() - { - public int compare(Contact arg0, Contact arg1) - { - return (arg0).getFirstName().compareTo((arg1).getFirstName()); - } - }); + Collections.sort(fnameIdx, (arg0, arg1) -> (arg0).getFirstName().compareTo((arg1).getFirstName())); - Collections.sort(lnameIdx, new Comparator<Contact>() - { - public int compare(Contact arg0, Contact arg1) - { - return (arg0).getLastName().compareTo((arg1).getLastName()); - } - }); + Collections.sort(lnameIdx, (arg0, arg1) -> (arg0).getLastName().compareTo((arg1).getLastName())); - Collections.sort(fnameDescIdx, new Comparator<Contact>() - { - public int compare(Contact arg0, Contact arg1) - { - return (arg1).getFirstName().compareTo((arg0).getFirstName()); - } - }); + Collections.sort(fnameDescIdx, (arg0, arg1) -> (arg1).getFirstName().compareTo((arg0).getFirstName())); - Collections.sort(lnameDescIdx, new Comparator<Contact>() - { - public int compare(Contact arg0, Contact arg1) - { - return (arg1).getLastName().compareTo((arg0).getLastName()); - } - }); + Collections.sort(lnameDescIdx, (arg0, arg1) -> (arg1).getLastName().compareTo((arg0).getLastName())); } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DetachableContactModel.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DetachableContactModel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DetachableContactModel.java index 039273f..d7df973 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DetachableContactModel.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DetachableContactModel.java @@ -53,9 +53,6 @@ public class DetachableContactModel extends LoadableDetachableModel<Contact> this.id = id; } - /** - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java index 678d4bd..272c22b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java @@ -89,33 +89,17 @@ public class OIRPage extends BasePage { Contact contact = item.getModelObject(); item.add(new ActionPanel("actions", item.getModel())); - item.add(new Link<Void>("toggleHighlite") - { - private static final long serialVersionUID = 1L; - - @Override - public void onClick() - { - HighlitableDataItem<Contact> hitem = (HighlitableDataItem<Contact>)item; - hitem.toggleHighlite(); - } - }); + item.add(Link.onClick("toggleHighlite", (link) -> { + HighlitableDataItem<Contact> hitem = (HighlitableDataItem<Contact>)item; + hitem.toggleHighlite(); + })); item.add(new Label("contactid", String.valueOf(contact.getId()))); item.add(new Label("firstname", contact.getFirstName())); item.add(new Label("lastname", contact.getLastName())); item.add(new Label("homephone", contact.getHomePhone())); item.add(new Label("cellphone", contact.getCellPhone())); - item.add(AttributeModifier.replace("class", new IModel<String>() - { - private static final long serialVersionUID = 1L; - - @Override - public String getObject() - { - return (item.getIndex() % 2 == 1) ? "even" : "odd"; - } - })); + item.add(AttributeModifier.replace("class", () -> (item.getIndex() % 2 == 1) ? "even" : "odd")); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java index 5175ac0..74474ae 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RefreshingPage.java @@ -80,30 +80,12 @@ public class RefreshingPage extends BasePage item.add(new Label("homephone", contact.getHomePhone())); item.add(new Label("cellphone", contact.getCellPhone())); - item.add(AttributeModifier.replace("class", new IModel<String>() - { - private static final long serialVersionUID = 1L; - - @Override - public String getObject() - { - return (item.getIndex() % 2 == 1) ? "even" : "odd"; - } - })); + item.add(AttributeModifier.replace("class", () -> (item.getIndex() % 2 == 1) ? "even" : "odd")); } }; add(view); - add(new Link<Void>("refreshLink") - { - private static final long serialVersionUID = 1L; - - @Override - public void onClick() - { - // noop - } - }); + add(Link.onClick("refreshLink", (link) -> {})); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java index a7feae4..ee0ee5e 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeatingPage.java @@ -60,16 +60,7 @@ public class RepeatingPage extends BasePage item.add(new Label("cellphone", contact.getCellPhone())); final int idx = index; - item.add(AttributeModifier.replace("class", new IModel<String>() - { - private static final long serialVersionUID = 1L; - - @Override - public String getObject() - { - return (idx % 2 == 1) ? "even" : "odd"; - } - })); + item.add(AttributeModifier.replace("class", () -> (idx % 2 == 1) ? "even" : "odd")); index++; } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java index 691b472..04ecc1a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SimplePage.java @@ -51,16 +51,7 @@ public class SimplePage extends BasePage item.add(new Label("homephone", contact.getHomePhone())); item.add(new Label("cellphone", contact.getCellPhone())); - item.add(AttributeModifier.replace("class", new IModel<String>() - { - private static final long serialVersionUID = 1L; - - @Override - public String getObject() - { - return (item.getIndex() % 2 == 1) ? "even" : "odd"; - } - })); + item.add(AttributeModifier.replace("class", () -> (item.getIndex() % 2 == 1) ? "even" : "odd")); } }); } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortableContactDataProvider.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortableContactDataProvider.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortableContactDataProvider.java index c98948e..3195e27 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortableContactDataProvider.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortableContactDataProvider.java @@ -87,18 +87,12 @@ public class SortableContactDataProvider extends SortableDataProvider<Contact, S return result; } - /** - * @see org.apache.wicket.markup.repeater.data.IDataProvider#size() - */ @Override public long size() { return filterContacts(getContactsDB().getIndex(getSort())).size(); } - /** - * @see org.apache.wicket.markup.repeater.data.IDataProvider#model(java.lang.Object) - */ @Override public IModel<Contact> model(Contact object) { @@ -116,6 +110,4 @@ public class SortableContactDataProvider extends SortableDataProvider<Contact, S { contactFilter = state; } - - } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java index a27fd7f..acc1c3b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java @@ -55,16 +55,7 @@ public class SortingPage extends BasePage item.add(new Label("homephone", contact.getHomePhone())); item.add(new Label("cellphone", contact.getCellPhone())); - item.add(AttributeModifier.replace("class", new IModel<String>() - { - private static final long serialVersionUID = 1L; - - @Override - public String getObject() - { - return (item.getIndex() % 2 == 1) ? "even" : "odd"; - } - })); + item.add(AttributeModifier.replace("class", () -> (item.getIndex() % 2 == 1) ? "even" : "odd")); } }; http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java index a778c4f..44dea02 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleFirstMapper.java @@ -35,7 +35,6 @@ import org.apache.wicket.util.string.Strings; */ public class LocaleFirstMapper extends AbstractComponentMapper { - private final IRequestMapper chain; /** @@ -48,9 +47,6 @@ public class LocaleFirstMapper extends AbstractComponentMapper this.chain = chain; } - /** - * @see org.apache.wicket.request.IRequestMapper#getCompatibilityScore(org.apache.wicket.request.Request) - */ @Override public int getCompatibilityScore(Request request) { @@ -85,9 +81,6 @@ public class LocaleFirstMapper extends AbstractComponentMapper return null; } - /** - * @see org.apache.wicket.request.IRequestMapper#mapRequest(org.apache.wicket.request.Request) - */ @Override public IRequestHandler mapRequest(Request request) { @@ -104,13 +97,9 @@ public class LocaleFirstMapper extends AbstractComponentMapper return chain.mapRequest(request); } - /** - * @see org.apache.wicket.request.IRequestMapper#mapHandler(org.apache.wicket.request.IRequestHandler) - */ @Override public Url mapHandler(IRequestHandler handler) { - // let the chain create the url Url url = chain.mapHandler(handler); http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java index d120233..e16399a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocaleHelper.java @@ -20,8 +20,6 @@ import java.util.Locale; /** * A helper class to deal with {@link Locale} as string - * - * @author mgrigorov */ public class LocaleHelper { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.java index 460d126..460eab9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/LocalizedPage.java @@ -27,7 +27,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; */ public class LocalizedPage extends WicketExamplePage { - /** * Construct. * http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperApplication.java index 933f0bd..e8f193a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperApplication.java @@ -31,20 +31,12 @@ import org.apache.wicket.core.request.mapper.MountedMapper; */ public class RequestMapperApplication extends WicketExampleApplication { - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return RequestMapperHomePage.class; } - /** - * - * @see org.apache.wicket.examples.WicketExampleApplication#init() - */ @Override public void init() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.java index 8302d5c..4db502c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/RequestMapperHomePage.java @@ -19,14 +19,9 @@ package org.apache.wicket.examples.requestmapper; import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.request.mapper.parameter.PageParameters; -/** - * @author mgrigorov - */ public class RequestMapperHomePage extends WicketExamplePage { - /** - * * Construct. * * @param pageParameters http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java index 2959223..fd59c14 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/HomePage.java @@ -120,7 +120,7 @@ public class HomePage extends WicketExamplePage { private static final long serialVersionUID = 1L; - public AjaxProofContainer(String id) + private AjaxProofContainer(String id) { super(id); setOutputMarkupId(true); http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java index 80ce478..5af41de 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/resourcedecoration/ResourceDecorationApplication.java @@ -17,7 +17,6 @@ package org.apache.wicket.examples.resourcedecoration; import org.apache.wicket.Application; -import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse; import org.apache.wicket.markup.html.IHeaderResponseDecorator; import org.apache.wicket.protocol.http.WebApplication; @@ -35,7 +34,6 @@ import org.apache.wicket.request.resource.CssResourceReference; */ public class ResourceDecorationApplication extends WebApplication { - @Override protected void init() { @@ -45,15 +43,10 @@ public class ResourceDecorationApplication extends WebApplication new CssResourceReference(HomePage.class, "footer.css"), new CssResourceReference(HomePage.class, "header.css")); - setHeaderResponseDecorator(new IHeaderResponseDecorator() - { - @Override - public IHeaderResponse decorate(IHeaderResponse response) - { - // use this header resource decorator to load all JavaScript resources in the page - // footer (after </body>) - return new JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS"); - } + setHeaderResponseDecorator(response -> { + // use this header resource decorator to load all JavaScript resources in the page + // footer (after </body>) + return new JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS"); }); } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java index 1f93f44..1f411f8 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java @@ -136,7 +136,7 @@ public class SourcesPage extends WebPage /** * Model for retrieving the contents of a package directory from the class path. */ - public class PackagedResourcesModel extends LoadableDetachableModel<List<String>> + private class PackagedResourcesModel extends LoadableDetachableModel<List<String>> { /** * Returns the list of resources found in the package of the page. @@ -274,7 +274,7 @@ public class SourcesPage extends WebPage /** * Displays the resources embedded in a package in a list. */ - public class FilesBrowser extends WebMarkupContainer + private class FilesBrowser extends WebMarkupContainer { /** * Constructor. @@ -282,7 +282,7 @@ public class SourcesPage extends WebPage * @param id * the component identifier */ - public FilesBrowser(String id) + private FilesBrowser(String id) { super(id); ListView<String> lv = new ListView<String>("file", new PackagedResourcesModel()) @@ -339,7 +339,7 @@ public class SourcesPage extends WebPage * Container for displaying the source of the selected page, resource or other element from the * package. */ - public class CodePanel extends WebMarkupContainer + private class CodePanel extends WebMarkupContainer { /** * Constructor. @@ -347,7 +347,7 @@ public class SourcesPage extends WebPage * @param id * the component id */ - public CodePanel(String id) + private CodePanel(String id) { super(id); Label code = new Label("code", new SourceModel()); @@ -413,17 +413,7 @@ public class SourcesPage extends WebPage { super(params); - filename = new Label("filename", new IModel<String>() - { - - @Override - public String getObject() - { - return name != null ? name : getPage().getRequest().getRequestParameters() - .getParameterValue(SOURCE).toOptionalString(); - } - - }); + filename = new Label("filename", () -> name != null ? name : params.get(SOURCE).toOptionalString()); filename.setOutputMarkupId(true); add(filename); codePanel = new CodePanel("codepanel").setOutputMarkupId(true); @@ -465,21 +455,15 @@ public class SourcesPage extends WebPage String pageParam = getPageParameters().get(PAGE_CLASS).toOptionalString(); if (pageParam == null) { - if (log.isErrorEnabled()) - { - log.error("key: " + PAGE_CLASS + " is null."); - } + log.error("key: {} is null.", PAGE_CLASS); getRequestCycle().replaceAllRequestHandlers( new ErrorCodeRequestHandler(404, "Could not find sources for the page you requested")); } else if (!pageParam.startsWith("org.apache.wicket.examples")) { - if (log.isErrorEnabled()) - { - log.error("user is trying to access class: " + pageParam - + " which is not in the scope of org.apache.wicket.examples"); - } + log.error("user is trying to access class: {} which is not in the scope of org.apache.wicket.examples", + pageParam); throw new UnauthorizedInstantiationException(getClass()); } page = WicketObjects.resolveClass(pageParam); http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java index b894f54..c7cdda0 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.java @@ -19,7 +19,6 @@ package org.apache.wicket.examples.spring.annot.web; import org.apache.wicket.examples.spring.common.ContactDao; import org.apache.wicket.examples.spring.common.web.ContactDataProvider; import org.apache.wicket.examples.spring.common.web.ContactsDisplayPage; -import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider; import org.apache.wicket.spring.injection.annot.SpringBean; @@ -27,18 +26,9 @@ import org.apache.wicket.spring.injection.annot.SpringBean; */ public class AnnotPage extends ContactsDisplayPage { - @SpringBean private ContactDao dao; - /** - * Construct. - */ - public AnnotPage() - { - - } - @Override protected ContactDataProvider getDataProvider() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java index 6bedd3e..0bae307 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/Contact.java @@ -44,9 +44,6 @@ public class Contact implements IClusterable } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -55,9 +52,6 @@ public class Contact implements IClusterable } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(Object obj) { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java index 8cdb729..c28dc51 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactDaoImpl.java @@ -18,7 +18,6 @@ package org.apache.wicket.examples.spring.common; import java.util.ArrayList; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -163,41 +162,13 @@ public class ContactDaoImpl implements ContactDao private void updateIndecies() { - Collections.sort(fnameIdx, new Comparator<Contact>() - { - @Override - public int compare(Contact arg0, Contact arg1) - { - return (arg0).getFirstName().compareTo((arg1).getFirstName()); - } - }); - - Collections.sort(lnameIdx, new Comparator<Contact>() - { - @Override - public int compare(Contact arg0, Contact arg1) - { - return (arg0).getLastName().compareTo((arg1).getLastName()); - } - }); - - Collections.sort(fnameDescIdx, new Comparator<Contact>() - { - @Override - public int compare(Contact arg0, Contact arg1) - { - return (arg1).getFirstName().compareTo((arg0).getFirstName()); - } - }); - - Collections.sort(lnameDescIdx, new Comparator<Contact>() - { - @Override - public int compare(Contact arg0, Contact arg1) - { - return (arg1).getLastName().compareTo((arg0).getLastName()); - } - }); + Collections.sort(fnameIdx, (arg0, arg1) -> (arg0).getFirstName().compareTo((arg1).getFirstName())); + + Collections.sort(lnameIdx, (arg0, arg1) -> (arg0).getLastName().compareTo((arg1).getLastName())); + + Collections.sort(fnameDescIdx, (arg0, arg1) -> (arg1).getFirstName().compareTo((arg0).getFirstName())); + + Collections.sort(lnameDescIdx, (arg0, arg1) -> (arg1).getLastName().compareTo((arg0).getLastName())); } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java index 5cc1a4e..1be0c41 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/ContactGenerator.java @@ -76,7 +76,7 @@ public class ContactGenerator } /** - * generats <code>count</code> number contacts and puts them into <code>collection</code> + * generates <code>count</code> number contacts and puts them into <code>collection</code> * collection * * @param collection http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java index 50b133c..255e7be 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactDetachableModel.java @@ -29,7 +29,6 @@ import org.apache.wicket.model.LoadableDetachableModel; */ public abstract class ContactDetachableModel extends LoadableDetachableModel<Contact> { - private long id; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java index 88677f8..fa5207a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ContactsDisplayPage.java @@ -40,10 +40,10 @@ public abstract class ContactsDisplayPage extends BasePage public ContactsDisplayPage() { List<IColumn<Contact, String>> cols = new ArrayList<>(4); - cols.add(new PropertyColumn<Contact, String>(new Model<>("first name"), "firstName", "firstName")); - cols.add(new PropertyColumn<Contact, String>(new Model<>("last name"), "lastName", "lastName")); - cols.add(new PropertyColumn<Contact, String>(new Model<>("home phone"), "homePhone")); - cols.add(new PropertyColumn<Contact, String>(new Model<>("cell phone"), "cellPhone")); + cols.add(new PropertyColumn<>(new Model<>("first name"), "firstName", "firstName")); + cols.add(new PropertyColumn<>(new Model<>("last name"), "lastName", "lastName")); + cols.add(new PropertyColumn<>(new Model<>("home phone"), "homePhone")); + cols.add(new PropertyColumn<>(new Model<>("cell phone"), "cellPhone")); add(new DefaultDataTable<>("contacts", cols, getDataProvider(), 5)); } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java index 7fc6784..af52440 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/common/web/ExampleApplication.java @@ -28,7 +28,6 @@ import org.apache.wicket.spring.injection.annot.SpringComponentInjector; */ public class ExampleApplication extends WebApplication { - /** * this field holds a contact dao proxy that is safe to use in wicket components */ @@ -52,7 +51,7 @@ public class ExampleApplication extends WebApplication } @Override - public Class getHomePage() + public Class<HomePage> getHomePage() { return HomePage.class; } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.java index 991a7a9..de89dc9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/AjaxStatelessExample.java @@ -43,7 +43,6 @@ import org.apache.wicket.util.string.StringValue; public class AjaxStatelessExample extends WicketExamplePage { - private static final String COUNTER_PARAM = "counter"; /** @@ -60,27 +59,18 @@ public class AjaxStatelessExample extends WicketExamplePage add(new Label("message", new SessionModel())); add(new BookmarkablePageLink<>("indexLink", Index.class)); - final Label incrementLabel = new Label("incrementLabel", new AbstractReadOnlyModel<Integer>() - { - private static final long serialVersionUID = 1L; - - @Override - public Integer getObject() - { - final String counter = getParameter(parameters, COUNTER_PARAM); - return counter != null ? Integer.parseInt(counter) : 0; - } - + final Label incrementLabel = new Label("incrementLabel", () -> { + String counter = getParameter(parameters, COUNTER_PARAM); + return counter != null ? Integer.parseInt(counter) : 0; }); final Link<?> incrementLink = new AjaxFallbackLink<Void>("incrementLink") { - @Override public void onClick(final Optional<AjaxRequestTarget> target) - { + { Integer counter = (Integer)incrementLabel.getDefaultModelObject(); updateParams(getPageParameters(), counter); - + target.ifPresent(ajaxTarget -> ajaxTarget.add(incrementLabel, this)); } @@ -94,27 +84,23 @@ public class AjaxStatelessExample extends WicketExamplePage add(incrementLink); add(incrementLabel.setOutputMarkupId(true)); - final TextField<String> nameField = new TextField<String>("name", new Model<String>("")); - final TextField<String> surnameField = new TextField<String>("surname", new Model<String>("")); + final TextField<String> nameField = new TextField<>("name", new Model<>("")); + final TextField<String> surnameField = new TextField<>("surname", new Model<>("")); final Form<String> form = new StatelessForm<String>("inputForm") { - @Override protected void onSubmit() { - } - }; - final DropDownChoice<String> select = new DropDownChoice<String>("select", - new Model<String>("2"), Arrays.asList(new String[] { "1", "2", "3" })); + final DropDownChoice<String> select = new DropDownChoice<>("select", + new Model<>("2"), Arrays.asList("1", "2", "3")); final Label selectedValue = new Label("selectedValue", ""); add(selectedValue.setOutputMarkupId(true)); select.add(new AjaxFormComponentUpdatingBehavior("change") { - @Override protected void onUpdate(final AjaxRequestTarget target) { @@ -235,4 +221,4 @@ public class AjaxStatelessExample extends WicketExamplePage { pageParameters.set(COUNTER_PARAM, Integer.toString(counter + 1)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java index 95b7dea..b772905 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/Index.java @@ -48,43 +48,11 @@ public class Index extends WicketExamplePage add(new BookmarkablePageLink<>("linkToStatelessPage3", StatelessPage3.class)); // The second with a stateless link, so the onclick will be called but // on a stateless page. - add(new StatelessLink<Void>("linkToStatefulPage") - { - private static final long serialVersionUID = 1L; - - /** - * @see org.apache.wicket.markup.html.link.Link#onClick() - */ - @Override - public void onClick() - { - setResponsePage(StatefulPage.class); - } - }); - add(new StatelessLink<Void>("linkToAjaxExamples") - { - private static final long serialVersionUID = 1L; - - /** - * @see org.apache.wicket.markup.html.link.Link#onClick() - */ - @Override - public void onClick() - { - setResponsePage(AjaxStatelessExample.class); - } - }); - add(new StatelessLink<Void>("invalidatesession") - { - private static final long serialVersionUID = 1L; - - @Override - public void onClick() - { - Session.get().invalidate(); - setResponsePage(Index.class); - } - - }); + add(StatelessLink.onClick("linkToStatefulPage", (link) -> setResponsePage(StatefulPage.class))); + add(StatelessLink.onClick("linkToAjaxExamples", (link) -> setResponsePage(AjaxStatelessExample.class))); + add(StatelessLink.onClick("invalidatesession", (link) -> { + Session.get().invalidate(); + setResponsePage(Index.class); + })); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java index c5ec84b..65ab223 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatefulPage.java @@ -33,9 +33,6 @@ import org.apache.wicket.model.PropertyModel; */ public class StatefulPage extends WicketExamplePage { - /** - * - */ private static final long serialVersionUID = 1L; /** click count for Link. */ @@ -50,25 +47,15 @@ public class StatefulPage extends WicketExamplePage add(new BookmarkablePageLink<>("indexLink", Index.class)); // Action link counts link clicks - final Link actionLink = new Link<Void>("actionLink") - { - @Override - public void onClick() - { - linkClickCount++; - } - }; + final Link actionLink = Link.onClick("actionLink", (link) -> linkClickCount++); add(actionLink); actionLink.add(new Label("linkClickCount", new PropertyModel<Integer>(this, "linkClickCount"))); final TextField<String> field = new TextField<>("textfield", new Model<String>()); - StatelessForm<?> statelessForm = new StatelessForm("statelessform") + StatelessForm<Void> statelessForm = new StatelessForm<Void>("statelessform") { - /** - * @see org.apache.wicket.markup.html.form.Form#onSubmit() - */ @Override protected void onSubmit() { @@ -101,4 +88,4 @@ public class StatefulPage extends WicketExamplePage { this.linkClickCount = linkClickCount; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java index a4ce21c..4fbcfff 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessApplication.java @@ -26,25 +26,12 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class StatelessApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public StatelessApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Index.class; } - /** - * @see org.apache.wicket.examples.WicketExampleApplication#init() - */ @Override protected void init() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java index 317a59e..c58df3f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage.java @@ -32,9 +32,6 @@ import org.apache.wicket.validation.validator.RangeValidator; */ public class StatelessPage extends WicketExamplePage { - /** - * - */ private static final long serialVersionUID = 1L; private final Integer number = 10; @@ -47,8 +44,8 @@ public class StatelessPage extends WicketExamplePage setStatelessHint(true); add(new Label("message", new SessionModel())); add(new BookmarkablePageLink<>("indexLink", Index.class)); - final TextField<Integer> field = new TextField<Integer>("textfield", - new PropertyModel<Integer>(this, "number")); + final TextField<Integer> field = new TextField<>("textfield", + new PropertyModel<>(this, "number")); field.add(new RangeValidator<>(null, 20)); field.setRequired(true); @@ -67,4 +64,4 @@ public class StatelessPage extends WicketExamplePage add(new FeedbackPanel("feedback")); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java index eae6646..1682c8c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage1.java @@ -32,9 +32,6 @@ import org.apache.wicket.validation.validator.RangeValidator; */ public class StatelessPage1 extends WicketExamplePage { - /** - * - */ private static final long serialVersionUID = 1L; private final Integer number = 10; @@ -47,16 +44,13 @@ public class StatelessPage1 extends WicketExamplePage setStatelessHint(true); add(new Label("message", new SessionModel())); add(new BookmarkablePageLink<>("indexLink", Index.class)); - final TextField<Integer> field = new TextField<Integer>("textfield", - new PropertyModel<Integer>(this, "number")); + final TextField<Integer> field = new TextField<>("textfield", + new PropertyModel<>(this, "number")); field.add(new RangeValidator<>(null, 20)); field.setRequired(true); - StatelessForm<?> statelessForm = new StatelessForm("statelessform") + StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform") { - /** - * @see org.apache.wicket.markup.html.form.Form#onSubmit() - */ @Override protected void onSubmit() { @@ -68,4 +62,4 @@ public class StatelessPage1 extends WicketExamplePage add(new FeedbackPanel("feedback")); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java index db807bd..912a320 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage2.java @@ -32,9 +32,6 @@ import org.apache.wicket.validation.validator.RangeValidator; */ public class StatelessPage2 extends WicketExamplePage { - /** - * - */ private static final long serialVersionUID = 1L; private final Integer number = 10; @@ -52,11 +49,8 @@ public class StatelessPage2 extends WicketExamplePage field.add(new RangeValidator<>(0, 20)); field.setRequired(true); - StatelessForm<?> statelessForm = new StatelessForm("statelessform") + StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform") { - /** - * @see org.apache.wicket.markup.html.form.Form#onSubmit() - */ @Override protected void onSubmit() { @@ -68,4 +62,4 @@ public class StatelessPage2 extends WicketExamplePage add(new FeedbackPanel("feedback")); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java index 38e9735..d9fba82 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stateless/StatelessPage3.java @@ -33,18 +33,12 @@ import org.apache.wicket.validation.validator.RangeValidator; */ public class StatelessPage3 extends WicketExamplePage { - /** - * - */ private static final long serialVersionUID = 1L; private Integer number; private static final String PARAMETER_NAME = "value"; - /** - * @see org.apache.wicket.Page#onBeforeRender() - */ @Override protected void onBeforeRender() { @@ -67,11 +61,8 @@ public class StatelessPage3 extends WicketExamplePage field.add(new RangeValidator<>(0, 20)); field.setRequired(true); - StatelessForm<?> statelessForm = new StatelessForm("statelessform") + StatelessForm<?> statelessForm = new StatelessForm<Void>("statelessform") { - /** - * @see org.apache.wicket.markup.html.form.Form#onSubmit() - */ @Override protected void onSubmit() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuote.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuote.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuote.java index c9ed9bc..580fc0a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuote.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuote.java @@ -161,8 +161,7 @@ public class StockQuote * @throws IOException * @throws ProtocolException */ - private HttpURLConnection setUpHttpConnection(URL url, int length) throws IOException, - ProtocolException + private HttpURLConnection setUpHttpConnection(URL url, int length) throws IOException { URLConnection connection = url.openConnection(); HttpURLConnection httpConn = (HttpURLConnection)connection; @@ -190,7 +189,7 @@ public class StockQuote InputStreamReader isr = new InputStreamReader(inputStream); BufferedReader in = new BufferedReader(isr); - StringBuilder sb = new StringBuilder(); + StringBuilder sb = new StringBuilder(); String inputLine; while ((inputLine = in.readLine()) != null) { @@ -210,7 +209,7 @@ public class StockQuote */ private String createMessage(String symbol) { - StringBuilder message = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); + StringBuilder message = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); message.append("<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"; xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"; xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>"); message.append(" <soap:Body>"); message.append(" <GetQuote xmlns=\"http://www.webserviceX.NET/\";>"); http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java index 44a7d8e..921ed6b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteApplication.java @@ -26,16 +26,6 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class StockQuoteApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public StockQuoteApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java index dd9d1e0..78961bc 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/stockquote/StockQuoteLabel.java @@ -69,9 +69,6 @@ public class StockQuoteLabel extends WebComponent super(id, model); } - /** - * {@inheritDoc} - */ @Override public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag) { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java index d4f1d9d..b31bcb6 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/TemplateApplication.java @@ -26,16 +26,6 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class TemplateApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public TemplateApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class< ? extends Page> getHomePage() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java index 5694c40..f674dc0 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/border/TemplateBorder.java @@ -42,25 +42,17 @@ public class TemplateBorder extends Border { super(id); addToBorder(currentBanner = new Banner1("ad")); - addToBorder(new Link<Void>("changeAdLink") - { - /** - * @see org.apache.wicket.markup.html.link.Link#onClick() - */ - @Override - public void onClick() + addToBorder(Link.onClick("changeAdLink", (link) -> { + if (currentBanner.getClass() == Banner1.class) { - if (currentBanner.getClass() == Banner1.class) - { - TemplateBorder.this.replaceInBorder(currentBanner = new Banner2("ad")); - } - else - { - TemplateBorder.this.replaceInBorder(currentBanner = new Banner1("ad")); - } + TemplateBorder.this.replaceInBorder(currentBanner = new Banner2("ad")); } - }); + else + { + TemplateBorder.this.replaceInBorder(currentBanner = new Banner1("ad")); + } + })); addToBorder(new BookmarkablePageLink<>("page1Link", Page1.class)); addToBorder(new BookmarkablePageLink<>("page2Link", Page2.class)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java index 38f4a9d..fc11492 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/template/pageinheritance/TemplatePage.java @@ -46,24 +46,16 @@ public abstract class TemplatePage extends WicketExamplePage { add(new Label("title", new PropertyModel<>(this, "pageTitle"))); add(currentBanner = new Banner1("ad")); - add(new Link<Void>("changeAdLink") - { - /** - * @see org.apache.wicket.markup.html.link.Link#onClick() - */ - @Override - public void onClick() + add(Link.onClick("changeAdLink", (link) -> { + if (currentBanner.getClass() == Banner1.class) { - if (currentBanner.getClass() == Banner1.class) - { - TemplatePage.this.replace(currentBanner = new Banner2("ad")); - } - else - { - TemplatePage.this.replace(currentBanner = new Banner1("ad")); - } + TemplatePage.this.replace(currentBanner = new Banner2("ad")); } - }); + else + { + TemplatePage.this.replace(currentBanner = new Banner1("ad")); + } + })); add(new BookmarkablePageLink<>("page1Link", Page1.class)); add(new BookmarkablePageLink<>("page2Link", Page2.class)); } @@ -88,4 +80,4 @@ public abstract class TemplatePage extends WicketExamplePage { pageTitle = title; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.java index c166e75..ace2f2f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/AdvancedTreePage.java @@ -97,8 +97,8 @@ public abstract class AdvancedTreePage extends AbstractTreePage form.add(tree); form.add(new DropDownChoice<Content>("content", - new PropertyModel<Content>(this, "content"), initContents(), - new ChoiceRenderer<Content>("class.simpleName")) + new PropertyModel<>(this, "content"), initContents(), + new ChoiceRenderer<>("class.simpleName")) { private static final long serialVersionUID = 1L; @@ -109,8 +109,8 @@ public abstract class AdvancedTreePage extends AbstractTreePage } }); - form.add(new DropDownChoice<Behavior>("theme", new PropertyModel<Behavior>(this, "theme"), - initThemes(), new ChoiceRenderer<Behavior>("class.simpleName")) + form.add(new DropDownChoice<Behavior>("theme", new PropertyModel<>(this, "theme"), + initThemes(), new ChoiceRenderer<>("class.simpleName")) { private static final long serialVersionUID = 1L; @@ -121,37 +121,11 @@ public abstract class AdvancedTreePage extends AbstractTreePage } }); - form.add(new Link<Void>("expandAll") - { - private static final long serialVersionUID = 1L; + form.add(Link.onClick("expandAll", (link) -> FooExpansion.get().expandAll())); - @Override - public void onClick() - { - FooExpansion.get().expandAll(); - } - }); + form.add(Link.onClick("collapseAll", (link) -> FooExpansion.get().collapseAll())); - form.add(new Link<Void>("collapseAll") - { - private static final long serialVersionUID = 1L; - - @Override - public void onClick() - { - FooExpansion.get().collapseAll(); - } - }); - - form.add(new Button("submit") - { - private static final long serialVersionUID = 1L; - - @Override - public void onSubmit() - { - } - }); + form.add(Button.onSubmit("submit", (btn) -> {})); } protected abstract AbstractTree<Foo> createTree(FooProvider provider, IModel<Set<Foo>> state); http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/tree/Foo.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/Foo.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/Foo.java index 7cd8b54..fa85944 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/Foo.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/Foo.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.examples.tree; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -23,7 +24,7 @@ import java.util.List; /** * @author Sven Meier */ -public class Foo +public class Foo implements Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java index b50d109..7f4ac9a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TableTreePage.java @@ -75,9 +75,9 @@ public class TableTreePage extends AdvancedTreePage { List<IColumn<Foo, String>> columns = new ArrayList<>(); - columns.add(new PropertyColumn<Foo, String>(Model.of("ID"), "id")); + columns.add(new PropertyColumn<>(Model.of("ID"), "id")); - columns.add(new TreeColumn<Foo, String>(Model.of("Tree"))); + columns.add(new TreeColumn<>(Model.of("Tree"))); columns.add(new AbstractColumn<Foo, String>(Model.of("Depth")) { @@ -99,8 +99,8 @@ public class TableTreePage extends AdvancedTreePage } }); - columns.add(new PropertyColumn<Foo, String>(Model.of("Bar"), "bar")); - columns.add(new PropertyColumn<Foo, String>(Model.of("Baz"), "baz")); + columns.add(new PropertyColumn<>(Model.of("Bar"), "bar")); + columns.add(new PropertyColumn<>(Model.of("Baz"), "baz")); return columns; } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java index 6d99ce0..9a564cb 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/TreeApplication.java @@ -80,9 +80,6 @@ public class TreeApplication extends WebApplication foos.add(fooC); } - /** - * @see org.apache.wicket.protocol.http.WebApplication#init() - */ @Override protected void init() { @@ -91,9 +88,6 @@ public class TreeApplication extends WebApplication getRequestCycleSettings().addResponseFilter(new ServerAndClientTimeFilter()); } - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/BookmarkableFolderContent.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/BookmarkableFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/BookmarkableFolderContent.java index b0e016c..5353eab 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/BookmarkableFolderContent.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/BookmarkableFolderContent.java @@ -31,7 +31,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; */ public class BookmarkableFolderContent extends Content { - private static final long serialVersionUID = 1L; public BookmarkableFolderContent(final AbstractTree<Foo> tree) http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java index 17efb3d..a6e85c7 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedFolderContent.java @@ -29,7 +29,6 @@ import org.apache.wicket.model.IModel; */ public class CheckedFolderContent extends Content { - private static final long serialVersionUID = 1L; private ProviderSubset<Foo> checked; http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java index 8310fe8..6dd1532 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/CheckedSelectableFolderContent.java @@ -32,7 +32,6 @@ import org.apache.wicket.model.PropertyModel; */ public class CheckedSelectableFolderContent extends SelectableFolderContent { - private static final long serialVersionUID = 1L; public CheckedSelectableFolderContent(ITreeProvider<Foo> provider) http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/SelectableFolderContent.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/SelectableFolderContent.java b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/SelectableFolderContent.java index caafcae..945a582 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/SelectableFolderContent.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/tree/content/SelectableFolderContent.java @@ -20,7 +20,6 @@ import java.util.Optional; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.examples.tree.Foo; import org.apache.wicket.extensions.markup.html.repeater.tree.AbstractTree; import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider; http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java index 7f5c7f1..8e2231d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverter.java @@ -53,15 +53,12 @@ public class UnicodeConverter extends WicketExamplePage * strategy would be to have a model with it's own, translated, string representation of the * source, which should be updated on every form post (e.g. by overriding {@link Form#onSubmit} * and in that method explicitly setting the new value). But as you can see, this method is - * slighly easier, and if we wanted to use the translated value in e.g. a database, we could + * slightly easier, and if we wanted to use the translated value in e.g. a database, we could * just query this model directly or indirectly by calling {@link Component#getDefaultModelObject()} on * the component that holds it, and we would have a recent value. */ private final class ConverterModel extends Model<String> { - /** - * @see org.apache.wicket.model.IModel#getObject() - */ @Override public String getObject() { @@ -77,9 +74,6 @@ public class UnicodeConverter extends WicketExamplePage return result; } - /** - * @see org.apache.wicket.model.IModel#setObject(java.lang.Object) - */ @Override public void setObject(String object) { @@ -137,4 +131,4 @@ public class UnicodeConverter extends WicketExamplePage { this.translationType = translationType; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java index 5cbb30c..fe8abda 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/unicodeconverter/UnicodeConverterApplication.java @@ -26,16 +26,6 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class UnicodeConverterApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public UnicodeConverterApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java index 9ea3ade..b9b2420 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/MultiUploadPage.java @@ -66,9 +66,6 @@ public class MultiUploadPage extends WicketExamplePage super(name, files); } - /** - * @see ListView#populateItem(ListItem) - */ @Override protected void populateItem(ListItem<File> listItem) { @@ -120,7 +117,7 @@ public class MultiUploadPage extends WicketExamplePage setMultiPart(true); // Add one multi-file upload field - add(new MultiFileUploadField("fileInput", new PropertyModel<Collection<FileUpload>>( + add(new MultiFileUploadField("fileInput", new PropertyModel<>( this, "uploads"), 5, true)); // Set maximum size to 100K for demo purposes http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java index 72c7924..0826393 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadApplication.java @@ -30,17 +30,6 @@ public class UploadApplication extends WicketExampleApplication { private Folder uploadFolder = null; - /** - * Constructor. - */ - public UploadApplication() - { - } - - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { @@ -55,9 +44,6 @@ public class UploadApplication extends WicketExampleApplication return uploadFolder; } - /** - * @see org.apache.wicket.examples.WicketExampleApplication#init() - */ @Override protected void init() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java index 4ee91eb..d600517 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/upload/UploadPage.java @@ -37,8 +37,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.file.Files; import org.apache.wicket.util.file.Folder; import org.apache.wicket.util.lang.Bytes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Upload example. @@ -74,15 +72,10 @@ public class UploadPage extends WicketExamplePage { final File file = listItem.getModelObject(); listItem.add(new Label("file", file.getName())); - listItem.add(new Link<Void>("delete") - { - @Override - public void onClick() - { - Files.remove(file); - info("Deleted " + file); - } - }); + listItem.add(Link.onClick("delete", (link) -> { + Files.remove(file); + info("Deleted " + file); + })); } } @@ -116,9 +109,6 @@ public class UploadPage extends WicketExamplePage setFileMaxSize(Bytes.kilobytes(90)); } - /** - * @see org.apache.wicket.markup.html.form.Form#onSubmit() - */ @Override protected void onSubmit() { @@ -149,9 +139,6 @@ public class UploadPage extends WicketExamplePage } } - /** Log. */ - private static final Logger log = LoggerFactory.getLogger(UploadPage.class); - /** Reference to listview for easy access. */ private final FileListView fileListView; http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java index a915d11..046f438 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/DynamicPage.java @@ -51,7 +51,7 @@ public class DynamicPage extends WicketExamplePage map.put("fields", fields); VelocityPanel panel; - add(panel = new VelocityPanel("templatePanel", new MapModel<String, List<Field>>(map)) + add(panel = new VelocityPanel("templatePanel", new MapModel<>(map)) { @Override protected IResourceStream getTemplateResource() @@ -70,4 +70,4 @@ public class DynamicPage extends WicketExamplePage panel.add(new TextField<>(field.getFieldName())); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java index 02b553f..51202b4 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/velocity/TemplatePage.java @@ -45,7 +45,7 @@ public class TemplatePage extends WicketExamplePage /** * Form for changing the template contents. */ - private final class TemplateForm extends Form + private final class TemplateForm extends Form<Void> { private TextArea<IStringResourceStream> templateTextArea; @@ -59,17 +59,9 @@ public class TemplatePage extends WicketExamplePage { super(name); add(templateTextArea = new TextArea<>("templateInput", - new PropertyModel<IStringResourceStream>( + new PropertyModel<>( new Model<>(TemplatePage.this), "template"))); } - - /** - * @see org.apache.wicket.markup.html.form.Form#onSubmit() - */ - @Override - protected void onSubmit() - { - } } /** the current template contents. */ @@ -122,4 +114,4 @@ public class TemplatePage extends WicketExamplePage { this.template = new StringResourceStream(template); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java index 534fc73..a2e44fc 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/Index.java @@ -30,7 +30,7 @@ public class Index extends WicketExamplePage { /** * Link to the wizard. It's an internal link instead of a bookmarkable page to help us with - * backbutton surpression. Wizards by default do not partipcate in versioning, which has the + * back button suppression. Wizards by default do not participate in versioning, which has the * effect that whenever a button is clicked in the wizard, it will never result in a change of * the redirection url. However, though that'll work just fine when you are already in the * wizard, there is still the first access to the wizard. But if you link to the page that @@ -56,9 +56,6 @@ public class Index extends WicketExamplePage this.wizardClass = wizardClass; } - /** - * @see org.apache.wicket.markup.html.link.Link#onClick() - */ @Override public void onClick() { @@ -75,4 +72,4 @@ public class Index extends WicketExamplePage add(new WizardLink("staticWizardWithPanelsLink", StaticWizardWithPanels.class)); add(new WizardLink("newUserWizardLink", NewUserWizard.class)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java index 139392e..17d234b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/NewUserWizard.java @@ -161,9 +161,6 @@ public class NewUserWizard extends Wizard }); } - /** - * @see org.apache.wicket.extensions.wizard.WizardModel.ICondition#evaluate() - */ @Override public boolean evaluate() { @@ -273,4 +270,4 @@ public class NewUserWizard extends Wizard { this.user = user; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java index 7838b18..af9a86a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizard.java @@ -57,21 +57,15 @@ public class StaticWizard extends Wizard init(model); } - /** - * @see org.apache.wicket.extensions.wizard.Wizard#onCancel() - */ @Override public void onCancel() { setResponsePage(Index.class); } - /** - * @see org.apache.wicket.extensions.wizard.Wizard#onFinish() - */ @Override public void onFinish() { setResponsePage(Index.class); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java index a3e8796..fa87ccb 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/StaticWizardWithPanels.java @@ -100,18 +100,12 @@ public class StaticWizardWithPanels extends Wizard init(model); } - /** - * @see org.apache.wicket.extensions.wizard.Wizard#onCancel() - */ @Override public void onCancel() { setResponsePage(Index.class); } - /** - * @see org.apache.wicket.extensions.wizard.Wizard#onFinish() - */ @Override public void onFinish() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java index 46bca9d..cd5f3dc 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/User.java @@ -42,9 +42,9 @@ public final class User implements IClusterable private String userName; /** - * Gets departement. + * Gets department. * - * @return departement + * @return department */ public String getDepartment() { @@ -112,18 +112,18 @@ public final class User implements IClusterable } /** - * Sets departement. + * Sets department. * - * @param departement - * departement + * @param department + * department */ - public void setDepartment(String departement) + public void setDepartment(String department) { - if (departement == null) + if (department == null) { - departement = ""; + department = ""; } - department = departement; + this.department = department; } /**
