Use Java 8 features in wicket-examples. Remove useless javadocs. Java 7 diamonds and multicatch
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/092a4535 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/092a4535 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/092a4535 Branch: refs/heads/master Commit: 092a45358d8622dc9581e8129a050f2ccbbb3ba9 Parents: 547a7e1 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Jun 20 23:13:34 2016 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Jun 20 23:13:34 2016 +0200 ---------------------------------------------------------------------- .../wicket/examples/HelloWorldServlet.java | 4 - .../examples/ServerHostNameAndTimeFilter.java | 21 ++--- .../examples/WicketExampleApplication.java | 11 --- .../wicket/examples/WicketExamplePage.java | 3 - .../constraint/ValidPasswordValidator.java | 9 +-- .../wicket/examples/breadcrumb/ResultPanel.java | 2 +- .../wicket/examples/breadcrumb/SecondPanel.java | 1 - .../org/apache/wicket/examples/cdi/Counter.java | 2 +- .../CustomResourceLoadingApplication.java | 22 +---- .../PageWithCustomLoading.java | 4 +- .../wicket/examples/dates/DatesApplication.java | 10 --- .../apache/wicket/examples/dates/DatesPage.java | 15 +--- .../wicket/examples/echo/EchoApplication.java | 11 --- .../encodings/EncodingsApplication.java | 11 --- .../events/DecoupledAjaxUpdatePage.java | 23 +----- .../examples/events/EventsApplication.java | 4 - .../wicket/examples/forminput/FormInput.java | 53 +++--------- .../forminput/FormInputApplication.java | 17 ---- .../examples/forminput/FormInputModel.java | 13 ++- .../wicket/examples/forminput/Multiply.java | 4 +- .../examples/forminput/UsPhoneNumber.java | 5 +- .../wicket/examples/frames/BodyFrame.java | 5 +- .../wicket/examples/frames/FrameTarget.java | 9 +-- .../examples/frames/FramesApplication.java | 10 --- .../wicket/examples/frames/LeftFrame.java | 10 +-- .../wicket/examples/guestbook/Comment.java | 3 - .../guestbook/GuestBookApplication.java | 13 +-- .../wicket/examples/guice/GuiceApplication.java | 6 -- .../apache/wicket/examples/guice/HomePage.java | 15 +--- .../examples/guice/service/IMyService.java | 2 +- .../examples/guice/service/MyService.java | 5 -- .../apache/wicket/examples/hangman/Guess.java | 12 +-- .../examples/hangman/HangmanApplication.java | 13 --- .../wicket/examples/hangman/HangmanPage.java | 3 - .../apache/wicket/examples/hangman/Letter.java | 15 ---- .../apache/wicket/examples/hangman/Lose.java | 14 +--- .../org/apache/wicket/examples/hangman/Win.java | 13 +-- .../apache/wicket/examples/hangman/Word.java | 6 -- .../wicket/examples/hangman/WordGenerator.java | 6 +- .../helloworld/HelloWorldApplication.java | 10 --- .../wicket/examples/homepage/HomePage.java | 34 +++----- .../examples/homepage/HomePageApplication.java | 3 - .../org/apache/wicket/examples/images/Home.java | 3 +- .../examples/images/ImagesApplication.java | 14 ---- .../wicket/examples/kittenCaptcha/HomePage.java | 36 ++++----- .../kittenCaptcha/WicketApplication.java | 14 ---- .../examples/library/AuthenticatedWebPage.java | 11 --- .../wicket/examples/library/BookDetails.java | 10 ++- .../wicket/examples/library/EditBook.java | 7 +- .../apache/wicket/examples/library/Home.java | 2 +- .../examples/library/LibraryApplication.java | 22 ----- .../wicket/examples/library/LibrarySession.java | 6 -- .../apache/wicket/examples/linkomatic/Home.java | 67 ++------------- .../linkomatic/LinkomaticApplication.java | 7 -- .../org/apache/wicket/examples/media/Home.java | 1 - .../examples/media/VideosApplication.java | 14 ---- .../navomatic/NavomaticApplication.java | 12 --- .../apache/wicket/examples/niceurl/Home.java | 3 - .../examples/niceurl/NiceUrlApplication.java | 14 ---- .../wicket/examples/niceurl/mounted/Page5.java | 7 +- .../org/apache/wicket/examples/pub/Home.java | 85 ++++++-------------- .../wicket/examples/pub/PubApplication.java | 12 +-- .../org/apache/wicket/examples/pub2/Home.java | 85 ++++++-------------- .../wicket/examples/pub2/PubApplication.java | 12 +-- .../wicket/examples/repeater/BasePage.java | 3 - .../examples/repeater/ContactsDatabase.java | 32 +------- .../repeater/DetachableContactModel.java | 3 - .../wicket/examples/repeater/OIRPage.java | 26 ++---- .../examples/repeater/RefreshingPage.java | 22 +---- .../wicket/examples/repeater/RepeatingPage.java | 11 +-- .../wicket/examples/repeater/SimplePage.java | 11 +-- .../repeater/SortableContactDataProvider.java | 8 -- .../wicket/examples/repeater/SortingPage.java | 11 +-- .../requestmapper/LocaleFirstMapper.java | 11 --- .../examples/requestmapper/LocaleHelper.java | 2 - .../examples/requestmapper/LocalizedPage.java | 1 - .../requestmapper/RequestMapperApplication.java | 8 -- .../requestmapper/RequestMapperHomePage.java | 5 -- .../examples/resourcedecoration/HomePage.java | 2 +- .../ResourceDecorationApplication.java | 15 +--- .../wicket/examples/source/SourcesPage.java | 34 +++----- .../examples/spring/annot/web/AnnotPage.java | 10 --- .../wicket/examples/spring/common/Contact.java | 6 -- .../examples/spring/common/ContactDaoImpl.java | 43 ++-------- .../spring/common/ContactGenerator.java | 2 +- .../common/web/ContactDetachableModel.java | 1 - .../spring/common/web/ContactsDisplayPage.java | 8 +- .../spring/common/web/ExampleApplication.java | 3 +- .../stateless/AjaxStatelessExample.java | 34 +++----- .../apache/wicket/examples/stateless/Index.java | 46 ++--------- .../wicket/examples/stateless/StatefulPage.java | 19 +---- .../stateless/StatelessApplication.java | 13 --- .../examples/stateless/StatelessPage.java | 9 +-- .../examples/stateless/StatelessPage1.java | 14 +--- .../examples/stateless/StatelessPage2.java | 10 +-- .../examples/stateless/StatelessPage3.java | 11 +-- .../wicket/examples/stockquote/StockQuote.java | 7 +- .../stockquote/StockQuoteApplication.java | 10 --- .../examples/stockquote/StockQuoteLabel.java | 3 - .../examples/template/TemplateApplication.java | 10 --- .../template/border/TemplateBorder.java | 26 +++--- .../template/pageinheritance/TemplatePage.java | 26 +++--- .../wicket/examples/tree/AdvancedTreePage.java | 40 ++------- .../org/apache/wicket/examples/tree/Foo.java | 3 +- .../wicket/examples/tree/TableTreePage.java | 8 +- .../wicket/examples/tree/TreeApplication.java | 6 -- .../tree/content/BookmarkableFolderContent.java | 1 - .../tree/content/CheckedFolderContent.java | 1 - .../content/CheckedSelectableFolderContent.java | 1 - .../tree/content/SelectableFolderContent.java | 1 - .../unicodeconverter/UnicodeConverter.java | 10 +-- .../UnicodeConverterApplication.java | 10 --- .../wicket/examples/upload/MultiUploadPage.java | 5 +- .../examples/upload/UploadApplication.java | 14 ---- .../wicket/examples/upload/UploadPage.java | 21 +---- .../wicket/examples/velocity/DynamicPage.java | 4 +- .../wicket/examples/velocity/TemplatePage.java | 14 +--- .../apache/wicket/examples/wizard/Index.java | 7 +- .../wicket/examples/wizard/NewUserWizard.java | 5 +- .../wicket/examples/wizard/StaticWizard.java | 8 +- .../examples/wizard/StaticWizardWithPanels.java | 6 -- .../org/apache/wicket/examples/wizard/User.java | 18 ++--- .../examples/wizard/WizardApplication.java | 6 -- .../wicket/examples/wizard/WizardPage.java | 6 +- 124 files changed, 294 insertions(+), 1313 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/HelloWorldServlet.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/HelloWorldServlet.java b/wicket-examples/src/main/java/org/apache/wicket/examples/HelloWorldServlet.java index 2d895ab..1ab596c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/HelloWorldServlet.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/HelloWorldServlet.java @@ -32,10 +32,6 @@ import org.apache.wicket.protocol.http.servlet.WicketSessionFilter; */ public class HelloWorldServlet extends HttpServlet { - /** - * @see javax.servlet.http.HttpServlet#doGet(javax.servlet.http.HttpServletRequest, - * javax.servlet.http.HttpServletResponse) - */ @Override public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java index e4cc8ce..ce4d7a1 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ServerHostNameAndTimeFilter.java @@ -21,6 +21,7 @@ import java.net.UnknownHostException; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.response.filter.IResponseFilter; +import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.AppendingStringBuffer; import org.apache.wicket.core.util.string.JavaScriptUtils; import org.apache.wicket.util.string.Strings; @@ -28,7 +29,7 @@ import org.apache.wicket.util.time.Duration; /** - * Displays server host name (combination of name, ipaddress and unique id, which is either based) + * Displays server host name (combination of name, IP address and unique id, which is either based) * and time it took to handle the request in the browser's status bar like this: * <code>window.defaultStatus = 'Host: myhost/192.168.1.66/someid, handled in: 0.01s'</code> * @@ -40,7 +41,7 @@ public class ServerHostNameAndTimeFilter implements IResponseFilter /** * Construct, trying system property 'examples.hostname' for the server id or else current time - * milis. + * in millis. */ public ServerHostNameAndTimeFilter() { @@ -64,21 +65,15 @@ public class ServerHostNameAndTimeFilter implements IResponseFilter * Construct with an id. * * @param hostId - * a unique id indentifying this server instance + * a unique id identifying this server instance */ public ServerHostNameAndTimeFilter(String hostId) { - if (hostId == null) - { - throw new IllegalArgumentException("hostId may not be null"); - } + Args.notNull(hostId, "hostId"); setHostName(hostId); } - /** - * @see IResponseFilter#filter(AppendingStringBuffer) - */ @Override public AppendingStringBuffer filter(AppendingStringBuffer responseBuffer) { @@ -88,7 +83,7 @@ public class ServerHostNameAndTimeFilter implements IResponseFilter if (index != -1) { AppendingStringBuffer script = new AppendingStringBuffer(75); - script.append("\n"); + script.append('\n'); script.append(JavaScriptUtils.SCRIPT_OPEN_TAG); script.append("\n\twindow.defaultStatus='"); script.append("Host: "); @@ -97,7 +92,7 @@ public class ServerHostNameAndTimeFilter implements IResponseFilter script.append(Duration.milliseconds(timeTaken)); script.append("';\n"); script.append(JavaScriptUtils.SCRIPT_CLOSE_TAG); - script.append("\n"); + script.append('\n'); responseBuffer.insert(index + 6, script); } return responseBuffer; @@ -127,4 +122,4 @@ public class ServerHostNameAndTimeFilter implements IResponseFilter host = "<unknown>"; } } -} \ 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/WicketExampleApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java index 2a63041..caec70f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExampleApplication.java @@ -39,17 +39,6 @@ public abstract class WicketExampleApplication extends WebApplication System.setProperty("java.awt.headless", "true"); } - - /** - * Constructor. - */ - public WicketExampleApplication() - { - } - - /** - * @see org.apache.wicket.protocol.http.WebApplication#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/WicketExamplePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java index 3f36f54..b7a423f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/WicketExamplePage.java @@ -28,9 +28,6 @@ import org.apache.wicket.util.string.Strings; */ public class WicketExamplePage extends WebPage { - /** - * - */ 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/bean/validation/constraint/ValidPasswordValidator.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/constraint/ValidPasswordValidator.java b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/constraint/ValidPasswordValidator.java index 11802e6..1b68dd3 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/constraint/ValidPasswordValidator.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/bean/validation/constraint/ValidPasswordValidator.java @@ -24,9 +24,8 @@ import javax.validation.ConstraintValidatorContext; public class ValidPasswordValidator implements ConstraintValidator<ValidPassword, String> { - - private final Pattern content = Pattern.compile("[0-9a-zA-Z]*"); - private final Pattern digits = Pattern.compile("(.*\\d.*){2}"); + private static final Pattern CONTENT = Pattern.compile("[0-9a-zA-Z]*"); + private static final Pattern DIGITS = Pattern.compile("(.*\\d.*){2}"); @Override public void initialize(ValidPassword constraintAnnotation) @@ -39,11 +38,11 @@ public class ValidPasswordValidator implements ConstraintValidator<ValidPassword { boolean validationResult = true; - if (!content.matcher(value).matches()) + if (!CONTENT.matcher(value).matches()) { validationResult = false; } - else if (!digits.matcher(value).matches()) + else if (!DIGITS.matcher(value).matches()) { context.disableDefaultConstraintViolation(); context.buildConstraintViolationWithTemplate("{password.needDigits}") http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.java index 7332faa..d7eff97 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/ResultPanel.java @@ -45,7 +45,7 @@ public class ResultPanel extends BreadCrumbPanel if (Strings.isEmpty(result)) { - result = "(hey, you didn't even provide some input!)"; + result = "(hey, you didn't even provide any input!)"; } add(new Label("result", result)); http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.java index dc296a2..6bfef7b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/breadcrumb/SecondPanel.java @@ -19,7 +19,6 @@ package org.apache.wicket.examples.breadcrumb; import org.apache.wicket.extensions.breadcrumb.IBreadCrumbModel; import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanel; import org.apache.wicket.extensions.breadcrumb.panel.BreadCrumbPanelLink; -import org.apache.wicket.extensions.breadcrumb.panel.IBreadCrumbPanelFactory; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/Counter.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/Counter.java b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/Counter.java index 5ad78b9..32e6fa6 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/Counter.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/cdi/Counter.java @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger; public abstract class Counter implements Serializable { - private AtomicInteger counter = new AtomicInteger(); + private final AtomicInteger counter = new AtomicInteger(); public int getCount() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java index b253e53..26aa1c1 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/CustomResourceLoadingApplication.java @@ -21,12 +21,11 @@ import java.net.URL; import org.apache.wicket.Page; import org.apache.wicket.WicketRuntimeException; -import org.apache.wicket.examples.WicketExampleApplication; -import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.core.util.resource.UrlResourceStream; import org.apache.wicket.core.util.resource.locator.IResourceStreamLocator; import org.apache.wicket.core.util.resource.locator.ResourceStreamLocator; +import org.apache.wicket.examples.WicketExampleApplication; +import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.string.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,19 +45,10 @@ public class CustomResourceLoadingApplication extends WicketExampleApplication */ private final class CustomResourceStreamLocator extends ResourceStreamLocator { - /** - * @see org.apache.wicket.core.util.resource.locator.ResourceStreamLocator#locate(java.lang.Class, - * java.lang.String) - */ @Override public IResourceStream locate(Class<?> clazz, String path) { - // Log attempt - if (log.isDebugEnabled()) - { - log.debug("Attempting to locate resource '" + path + - "' using classloader the servlet context"); - } + log.debug("Attempting to locate resource '{}' using classloader the servlet context", path); String location; if (clazz == AlternativePageFromWebContext.class) @@ -103,18 +93,12 @@ public class CustomResourceLoadingApplication extends WicketExampleApplication { } - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Index.class; } - /** - * @see WebApplication#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/customresourceloading/PageWithCustomLoading.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java index e80485d..4e09b48 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/customresourceloading/PageWithCustomLoading.java @@ -77,7 +77,7 @@ public class PageWithCustomLoading extends WicketExamplePage /** * Prevent the markup from ever be cached. This is optionally - components that don't implement * {@link IMarkupCacheKeyProvider} will just have their markup cached - but is useful when - * markup varies. If you don't need such dynamic loading, it is advisible to not implement + * markup varies. If you don't need such dynamic loading, it is advisable to not implement * {@link IMarkupCacheKeyProvider}. * * @see org.apache.wicket.markup.IMarkupCacheKeyProvider#getCacheKey(org.apache.wicket.MarkupContainer, @@ -88,4 +88,4 @@ public class PageWithCustomLoading extends WicketExamplePage { return null; } -} \ 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/dates/DatesApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesApplication.java index 799c04c..2db0032 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesApplication.java @@ -24,16 +24,6 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class DatesApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public DatesApplication() - { - } - - /** - * @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/dates/DatesPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java index 4bfa7f8..73d9b44 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/dates/DatesPage.java @@ -56,9 +56,6 @@ public class DatesPage extends WicketExamplePage { } - /** - * @see org.apache.wicket.markup.html.form.IChoiceRenderer#getDisplayValue(Object) - */ @Override public Object getDisplayValue(Locale locale) { @@ -105,17 +102,11 @@ public class DatesPage extends WicketExamplePage setDefaultModel(new PropertyModel<>(DatesPage.this, "selectedLocale")); } - /** - * @see org.apache.wicket.markup.html.form.DropDownChoice#onSelectionChanged(java.lang.Object) - */ @Override public void onSelectionChanged(Locale newSelection) { } - /** - * @see org.apache.wicket.markup.html.form.DropDownChoice#wantOnSelectionChangedNotifications() - */ @Override protected boolean wantOnSelectionChangedNotifications() { @@ -159,7 +150,7 @@ public class DatesPage extends WicketExamplePage } }); add(localeForm); - DateTextField dateTextField = new DateTextField("dateTextField", new PropertyModel<Date>( + DateTextField dateTextField = new DateTextField("dateTextField", new PropertyModel<>( this, "date"), new StyleDateConverter("S-", true)) { @Override @@ -201,7 +192,7 @@ public class DatesPage extends WicketExamplePage } }; add(form2); - form2.add(new DateTimeField("dateTimeField", new PropertyModel<Date>(this, "date2"))); + form2.add(new DateTimeField("dateTimeField", new PropertyModel<>(this, "date2"))); Form<?> form3 = new Form<Void>("form3") @@ -213,7 +204,7 @@ public class DatesPage extends WicketExamplePage } }; add(form3); - form3.add(new TimeField("timeField", new PropertyModel<Date>(this, "time"))); + form3.add(new TimeField("timeField", new PropertyModel<>(this, "time"))); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/echo/EchoApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/echo/EchoApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/EchoApplication.java index 11fb6ff..2e48e45 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/echo/EchoApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/echo/EchoApplication.java @@ -26,17 +26,6 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class EchoApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public EchoApplication() - { - - } - - /** - * @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/encodings/EncodingsApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java index 52a1e82..c0a7e64 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/encodings/EncodingsApplication.java @@ -26,17 +26,6 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class EncodingsApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public EncodingsApplication() - { - - } - - /** - * @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/events/DecoupledAjaxUpdatePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java index fe9a965..e3485fa 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/DecoupledAjaxUpdatePage.java @@ -52,25 +52,13 @@ public class DecoupledAjaxUpdatePage extends BasePage add(form); // add the textfield that will update the counter value - form.add(new TextField<Integer>("counter", new PropertyModel<Integer>(this, "counter"), + form.add(new TextField<>("counter", new PropertyModel<>(this, "counter"), Integer.class).setRequired(true)); // add button that will broadcast counter update event - form.add(new AjaxButton("submit") - { - - @Override - protected void onSubmit(AjaxRequestTarget target) - { - send(getPage(), Broadcast.BREADTH, new CounterUpdate(target)); - } - - @Override - protected void onError(AjaxRequestTarget target) - { - } - - }); + form.add(AjaxButton.onSubmit("submit", (btn, target) -> + send(getPage(), Broadcast.BREADTH, new CounterUpdate(target)) + )); } /** @@ -117,9 +105,6 @@ public class DecoupledAjaxUpdatePage extends BasePage setOutputMarkupId(true); } - /** - * @see org.apache.wicket.Component#onEvent(org.apache.wicket.event.IEvent) - */ @Override public void onEvent(IEvent<?> event) { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/events/EventsApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/events/EventsApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/events/EventsApplication.java index b1944e2..1e48282 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/events/EventsApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/events/EventsApplication.java @@ -27,13 +27,9 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class EventsApplication extends WicketExampleApplication { - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return IndexPage.class; } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java index 9cbc294..344f192 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInput.java @@ -79,15 +79,10 @@ public class FormInput extends WicketExamplePage add(new LocaleDropDownChoice("localeSelect")); // Link to return to default locale - add(new Link<Void>("defaultLocaleLink") - { - @Override - public void onClick() - { - WebRequest request = (WebRequest)getRequest(); - setLocale(request.getLocale()); - } - }); + add(Link.onClick("defaultLocaleLink", (link) -> { + WebRequest request = (WebRequest)getRequest(); + setLocale(request.getLocale()); + })); add(new TextField<String>("stringProperty").setRequired(true).setLabel( new Model<>("String"))); @@ -166,7 +161,6 @@ public class FormInput extends WicketExamplePage // TextField using a mask converter add(new TextField<UsPhoneNumber>("phoneNumberUS", UsPhoneNumber.class) { - @Override public <C> IConverter<C> getConverter(final Class<C> type) { @@ -187,20 +181,12 @@ public class FormInput extends WicketExamplePage add(new Button("saveButton")); - add(new Button("resetButton") - { - @Override - public void onSubmit() - { - // just set a new instance of the page - setResponsePage(FormInput.class); - } - }.setDefaultFormProcessing(false)); + add(Button.onSubmit("resetButton", (btn) -> { + // just set a new instance of the page + setResponsePage(FormInput.class); + }).setDefaultFormProcessing(false)); } - /** - * @see org.apache.wicket.markup.html.form.Form#onSubmit() - */ @Override public void onSubmit() { @@ -212,7 +198,6 @@ public class FormInput extends WicketExamplePage /** list view to be nested in the form. */ private static final class LinesListView extends ListView<String> { - /** * Construct. * @@ -229,8 +214,7 @@ public class FormInput extends WicketExamplePage protected void populateItem(ListItem<String> item) { // add a text field that works on each list item model (returns - // objects of - // type FormInputModel.Line) using property text. + // objects of type FormInputModel.Line) using property text. item.add(new TextField<>("lineEdit", new PropertyModel<String>( item.getDefaultModel(), "text"))); } @@ -241,16 +225,6 @@ public class FormInput extends WicketExamplePage */ private final class LocaleChoiceRenderer extends ChoiceRenderer<Locale> { - /** - * Constructor. - */ - public LocaleChoiceRenderer() - { - } - - /** - * @see org.apache.wicket.markup.html.form.IChoiceRenderer#getDisplayValue(Object) - */ @Override public Object getDisplayValue(Locale locale) { @@ -275,17 +249,14 @@ public class FormInput extends WicketExamplePage // set the model that gets the current locale, and that is used for // updating the current locale to property 'locale' of FormInput - setModel(new PropertyModel<Locale>(FormInput.this, "locale")); + setModel(new PropertyModel<>(FormInput.this, "locale")); } - /** - * @see org.apache.wicket.markup.html.form.DropDownChoice#onSelectionChanged(java.lang.Object) - */ @Override public void onSelectionChanged(Locale newSelection) { // note that we don't have to do anything here, as our property - // model allready calls FormInput.setLocale when the model is + // model already calls FormInput.setLocale when the model is // updated // force re-render by setting the page to render to the bookmarkable @@ -300,7 +271,7 @@ public class FormInput extends WicketExamplePage @Override protected boolean wantOnSelectionChangedNotifications() { - // we want roundtrips when a the user selects another item + // we want round-trips when a the user selects another item return true; } } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java index d0bf197..8833c45 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputApplication.java @@ -44,26 +44,12 @@ public class FormInputApplication extends WicketExampleApplication new Locale("pt", "BR"), new Locale("fa", "IR"), new Locale("da", "DK"), new Locale("th", "TH"), new Locale("ru"), new Locale("ko", "KR")); - /** - * Constructor. - */ - public FormInputApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return FormInput.class; } - /** - * @see org.apache.wicket.protocol.http.WebApplication#newSession(org.apache.wicket.request.Request, - * org.apache.wicket.request.Response) - */ @Override public Session newSession(Request request, Response response) { @@ -76,9 +62,6 @@ public class FormInputApplication extends WicketExampleApplication return session; } - /** - * @see org.apache.wicket.protocol.http.WebApplication#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/forminput/FormInputModel.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java index 621ff12..e114b8f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/FormInputModel.java @@ -364,9 +364,6 @@ public final class FormInputModel implements IClusterable this.urlProperty = urlProperty; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { @@ -397,10 +394,10 @@ public final class FormInputModel implements IClusterable b.append(i.next()); if (i.hasNext()) { - b.append(","); + b.append(','); } } - b.append("]"); + b.append(']'); b.append(", lines ["); for (Iterator<Line> i = lines.iterator(); i.hasNext();) { @@ -410,8 +407,8 @@ public final class FormInputModel implements IClusterable b.append(", "); } } - b.append("]"); - b.append("]"); + b.append(']'); + b.append(']'); return b.toString(); } -} \ 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/forminput/Multiply.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java index b9b4092..337cec1 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/Multiply.java @@ -104,8 +104,8 @@ public class Multiply extends FormComponentPanel<Integer> private void init() { - add(left = new TextField<>("left", new PropertyModel<Integer>(this, "lhs"))); - add(right = new TextField<>("right", new PropertyModel<Integer>(this, "rhs"))); + add(left = new TextField<>("left", new PropertyModel<>(this, "lhs"))); + add(right = new TextField<>("right", new PropertyModel<>(this, "rhs"))); left.setRequired(true); right.setRequired(true); } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java index f0d8005..68dafec 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/forminput/UsPhoneNumber.java @@ -60,12 +60,9 @@ public class UsPhoneNumber implements IClusterable this.number = number; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { return number; } -} \ 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/frames/BodyFrame.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java index 8c78898..3896404 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/BodyFrame.java @@ -73,12 +73,9 @@ public class BodyFrame extends WebPage return frameTarget; } - /** - * @see org.apache.wicket.Component#isVersioned() - */ @Override public boolean isVersioned() { return false; } -} \ 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/frames/FrameTarget.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java index 9086cab..f052aed 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FrameTarget.java @@ -36,13 +36,6 @@ public final class FrameTarget implements IClusterable /** * Construct. - */ - public FrameTarget() - { - } - - /** - * Construct. * * @param <C> * @@ -84,4 +77,4 @@ public final class FrameTarget implements IClusterable return RequestCycle.get().urlFor( new BookmarkablePageRequestHandler(new PageProvider(frameClass))); } -} \ 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/frames/FramesApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java index 47ca7c9..3a9f105 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/FramesApplication.java @@ -26,16 +26,6 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class FramesApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public FramesApplication() - { - } - - /** - * @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/frames/LeftFrame.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java index 400d2a6..b1aeab6 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/frames/LeftFrame.java @@ -33,6 +33,8 @@ import org.apache.wicket.markup.html.link.Link; */ public class LeftFrame extends WebPage { + private static final long serialVersionUID = 1L; + /** * Link that, when clicked, changes the frame target's frame class (and as that is a shared * model which is also being used by the 'master page' {@link BodyFrame}, changes are @@ -52,9 +54,9 @@ public class LeftFrame extends WebPage /** * Construct. - * + * * @param <C> - * + * * @param id * @param bodyFrame * @param pageClass @@ -81,8 +83,6 @@ public class LeftFrame extends WebPage } } - private static final long serialVersionUID = 1L; - /** * Constructor * @@ -107,4 +107,4 @@ public class LeftFrame extends WebPage { return false; } -} \ 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/guestbook/Comment.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/Comment.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/Comment.java index 9c97bf7..03ff2ad 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/Comment.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/Comment.java @@ -84,9 +84,6 @@ public class Comment implements IClusterable this.date = date; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java index c43d7e1..0df4c11 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBookApplication.java @@ -26,20 +26,9 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class GuestBookApplication extends WicketExampleApplication { - /** - * Constructor - */ - public GuestBookApplication() - { - - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class< ? extends Page> getHomePage() { return GuestBook.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/guice/GuiceApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java index b3687c7..7f01062 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/GuiceApplication.java @@ -27,9 +27,6 @@ import org.apache.wicket.guice.GuiceComponentInjector; */ public class GuiceApplication extends WicketExampleApplication { - /** - * @see org.apache.wicket.examples.WicketExampleApplication#init() - */ @Override protected void init() { @@ -38,9 +35,6 @@ public class GuiceApplication extends WicketExampleApplication getComponentInstantiationListeners().add(new GuiceComponentInjector(this)); } - /** - * @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/guice/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java index 7c987a7..4dbe998 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/HomePage.java @@ -20,7 +20,6 @@ import org.apache.wicket.examples.WicketExamplePage; import org.apache.wicket.examples.guice.service.IMyService; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; -import org.apache.wicket.model.IModel; import com.google.inject.Inject; @@ -41,17 +40,7 @@ public class HomePage extends WicketExamplePage */ public HomePage() { - add(new Link<Void>("link") - { - /** - * @see org.apache.wicket.markup.html.link.Link#onClick() - */ - @Override - public void onClick() - { - labelValue = service.getHelloWorldText(); - } - }); - add(new Label("message", (IModel<String>) () -> labelValue)); + add(Link.onClick("link", (link) -> labelValue = service.getHelloWorldText())); + add(new Label("message", () -> labelValue)); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/IMyService.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/IMyService.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/IMyService.java index bb92ccf..f35026c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/IMyService.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/IMyService.java @@ -31,5 +31,5 @@ public interface IMyService * * @return "Hello World" */ - public String getHelloWorldText(); + String getHelloWorldText(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/MyService.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/MyService.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/MyService.java index 38fa766..9fae337 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/MyService.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guice/service/MyService.java @@ -26,14 +26,9 @@ import com.google.inject.Singleton; @Singleton public class MyService implements IMyService { - - /** - * @see org.apache.wicket.examples.guice.service.IMyService#getHelloWorldText() - */ @Override public String getHelloWorldText() { return "Hello World"; } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java index 47cdfc3..b34b239 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Guess.java @@ -22,7 +22,6 @@ import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; -import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -43,14 +42,7 @@ public class Guess extends HangmanPage add(new Label("guessesRemaining", new PropertyModel<>(getGame(), "guessesRemaining"))); // Components for displaying the current word - add(new Label("word", new Model<String>() - { - @Override - public String getObject() - { - return getGame().getWord().asString(true); - } - })); + add(new Label("word", () -> getGame().getWord().asString(true))); // Show the game's letters add(new ListView<Letter>("letters", getGame().getLetters()) @@ -105,8 +97,6 @@ public class Guess extends HangmanPage // append id attribute to link for unit tests link.add(AttributeModifier.replace("id", "letter_" + letter.asString())); - - } }); } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java index 5c368f2..53cb777 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanApplication.java @@ -31,25 +31,12 @@ import org.apache.wicket.request.Response; */ public class HangmanApplication extends WicketExampleApplication { - /** - * Create the hangman application. - */ - public HangmanApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Home.class; } - /** - * @see org.apache.wicket.protocol.http.WebApplication#newSession(Request, Response) - */ @Override public Session newSession(Request request, Response response) { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java index 6917d34..42318aa 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/HangmanPage.java @@ -33,9 +33,6 @@ public class HangmanPage extends WicketExamplePage return ((HangmanSession)getSession()).getGame(); } - /** - * @see org.apache.wicket.Component#isVersioned() - */ @Override public boolean isVersioned() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java index 22869f6..315ed2f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Letter.java @@ -57,9 +57,6 @@ public class Letter implements IClusterable return Character.toString(letter); } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ @Override public boolean equals(final Object object) { @@ -77,9 +74,6 @@ public class Letter implements IClusterable static ResourceReference LETTER_RESOURCE_REFERENCE = new ResourceReference(Letter.class, "letter") { - /** - * @see org.apache.wicket.request.resource.ResourceReference#getResource() - */ @Override public IResource getResource() { @@ -95,9 +89,6 @@ public class Letter implements IClusterable */ private static class ButtonResource implements IResource { - /** - * @see org.apache.wicket.request.resource.IResource#respond(org.apache.wicket.request.resource.IResource.Attributes) - */ public void respond(Attributes attributes) { // request parameter for the resource @@ -128,9 +119,6 @@ public class Letter implements IClusterable guessed = true; } - /** - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -153,9 +141,6 @@ public class Letter implements IClusterable guessed = false; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.java index 0c0190e..9df01c1 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Lose.java @@ -33,15 +33,9 @@ public class Lose extends HangmanPage public Lose() { add(new Label("currentWord", getGame().getWord().asString())); - add(new Link<Void>("playAgain") - { - @Override - public void onClick() - { - getGame().newGame(); - setResponsePage(Guess.class); - } - }); + add(Link.onClick("playAgain", (link) -> { + getGame().newGame(); + setResponsePage(Guess.class); + })); } - } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.java index b0349ff..4e9750b 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Win.java @@ -34,14 +34,9 @@ public class Win extends HangmanPage { add(new Label("guessesRemaining", Integer.toString(getGame().getGuessesRemaining()))); add(new Label("currentWord", getGame().getWord().asString())); - add(new Link<Void>("playAgain") - { - @Override - public void onClick() - { - getGame().newGame(); - setResponsePage(Guess.class); - } - }); + add(Link.onClick("playAgain", (link) -> { + getGame().newGame(); + setResponsePage(Guess.class); + })); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java index a46ae78..fbe2a93 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/Word.java @@ -110,9 +110,6 @@ public class Word implements IClusterable return correct; } - /** - * @see java.lang.Object#hashCode() - */ @Override public int hashCode() { @@ -134,9 +131,6 @@ public class Word implements IClusterable return true; } - /** - * @see java.lang.Object#toString() - */ @Override public String toString() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java index 36a6c7c..ff208b5 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/hangman/WordGenerator.java @@ -59,11 +59,7 @@ public class WordGenerator implements IClusterable words = Arrays.asList(wordlist.split("\\s+")); shuffle(); } - catch (IOException e) - { - throw new RuntimeException("Couldn't read word list"); - } - catch (ResourceStreamNotFoundException e) + catch (IOException | ResourceStreamNotFoundException e) { throw new RuntimeException("Couldn't read word list"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java index f098952..721bea5 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/helloworld/HelloWorldApplication.java @@ -26,16 +26,6 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class HelloWorldApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public HelloWorldApplication() - { - } - - /** - * @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/homepage/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePage.java index f771356..c516fb6 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePage.java @@ -19,7 +19,6 @@ package org.apache.wicket.examples.homepage; import org.apache.wicket.Application; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.model.IModel; /** * @author mocleiri @@ -36,28 +35,21 @@ public class HomePage extends WebPage { super(); - add(new Label("version", new IModel<String>() - { - private static final long serialVersionUID = 1L; + add(new Label("version", () -> { + /* + * Read the specification version from the wicket-core MANIFEST.MF file. + */ + Package p = Application.class.getPackage(); - @Override - public String getObject() - { - /* - * Read the specification version from the wicket-core MANIFEST.MF file. - */ - Package p = Application.class.getPackage(); - - String version = p.getSpecificationVersion(); + String version = p.getSpecificationVersion(); - if (version == null || version.length() == 0) - { - return "Missing Version"; - } - else - { - return version; - } + if (version == null || version.length() == 0) + { + return "Missing Version"; + } + else + { + return version; } })); } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageApplication.java index f7275ef..462eda9 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/homepage/HomePageApplication.java @@ -27,9 +27,6 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class HomePageApplication extends WicketExampleApplication { - /** - * @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/images/Home.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java index 3af8b86..3557a47 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/images/Home.java @@ -94,8 +94,7 @@ public final class Home extends WicketExamplePage add(new Image("imageModelResourceReference", new Model<>(RESOURCE_REF))); // image loaded as resource via model. - add(new Image("imageModelResource", new Model<CircleDynamicImageResource>( - new CircleDynamicImageResource(100, 100)))); + add(new Image("imageModelResource", new Model<>(new CircleDynamicImageResource(100, 100)))); // responsive images (only for img tag) // the first package resource reference is used for the src attribute all following for the http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java index 418ee4f..9078eb7 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/images/ImagesApplication.java @@ -28,26 +28,12 @@ import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource; */ public class ImagesApplication extends WicketExampleApplication { - /** - * Constructor - */ - public ImagesApplication() - { - - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Home.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/kittenCaptcha/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java index e57f9c9..55d182a 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/HomePage.java @@ -45,38 +45,30 @@ public class HomePage extends WicketExamplePage add(captcha = new KittenCaptchaPanel("captcha", new Dimension(400, 200))); // In a real application, you'd check the kittens in a form - add(new AjaxLink<Void>("checkKittens") - { - private static final long serialVersionUID = 642245961797905032L; - - @Override - public void onClick(final AjaxRequestTarget target) + add(AjaxLink.onClick("checkKittens", (target) -> { + if (!isSpamBot() && captcha.allKittensSelected()) + { + target.appendJavaScript("alert('you win! happy kittens!');"); + } + else { - if (!isSpamBot() && captcha.allKittensSelected()) + errors++; + if (isSpamBot()) { - target.appendJavaScript("alert('you win! happy kittens!');"); + target.appendJavaScript("alert('spammer alert');"); } else { - errors++; - if (isSpamBot()) - { - target.appendJavaScript("alert('spammer alert');"); - } - else - { - target.appendJavaScript("alert('please try again');"); - } - target.add(captcha); + target.appendJavaScript("alert('please try again');"); } - captcha.reset(); + target.add(captcha); } - }); + captcha.reset(); + })); } /** - * - * @return + * @return {@code true} is there are at least 3 errors */ boolean isSpamBot() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/WicketApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/WicketApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/WicketApplication.java index 7053a76..f1616c8 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/WicketApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/kittenCaptcha/WicketApplication.java @@ -26,26 +26,12 @@ import org.apache.wicket.protocol.http.WebApplication; */ public class WicketApplication extends WebApplication { - /** - * Constructor - */ - public WicketApplication() - { - } - - /** - * - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return HomePage.class; } - /** - * @see org.apache.wicket.protocol.http.WebApplication#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/library/AuthenticatedWebPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java index 12601ed..b667655 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/AuthenticatedWebPage.java @@ -32,17 +32,6 @@ import org.apache.wicket.examples.WicketExamplePage; */ public class AuthenticatedWebPage extends WicketExamplePage { - - - /** - * Contruct - */ - public AuthenticatedWebPage() - { - - } - - /** * Get downcast session object * http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java index e3ccb58..fcc2caa 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/BookDetails.java @@ -19,6 +19,7 @@ package org.apache.wicket.examples.library; import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; +import org.apache.wicket.Localizer; import org.apache.wicket.examples.library.Book.WritingStyle; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; @@ -58,10 +59,11 @@ public final class BookDetails extends AuthenticatedWebPage add(new Label("title", book.getTitle())); add(new Label("author", book.getAuthor())); add(new Label("fiction", Boolean.toString(book.getFiction()))); + Localizer localizer = getLocalizer(); add(BookDetails.link("companion", book.getCompanionBook(), - getLocalizer().getString("noBookTitle", this))); + localizer.getString("noBookTitle", this))); add(BookDetails.link("related", book.getRelatedBook(), - getLocalizer().getString("noBookTitle", this))); + localizer.getString("noBookTitle", this))); String writingStyles; final boolean hasStyles = (book.getWritingStyles() != null) && @@ -73,14 +75,14 @@ public final class BookDetails extends AuthenticatedWebPage for (WritingStyle style : book.getWritingStyles()) { - styles.add(getLocalizer().getString(style.toString(), this)); + styles.add(localizer.getString(style.toString(), this)); } writingStyles = styles.toString(); } else { - writingStyles = getLocalizer().getString("noWritingStyles", this); + writingStyles = localizer.getString("noWritingStyles", this); } Label writingStylesLabel = new Label("writingStyles", writingStyles); http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java index f237b50..87a252f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/EditBook.java @@ -72,9 +72,6 @@ public final class EditBook extends AuthenticatedWebPage { return new Link<Void>(name) { - /** - * @see org.apache.wicket.markup.html.link.Link#onClick() - */ @Override public void onClick() { @@ -135,7 +132,7 @@ public final class EditBook extends AuthenticatedWebPage add(relatedBook); // Multi-select among writing styles - add(new ListMultipleChoice<EnumeratedType>("writingStyles", + add(new ListMultipleChoice<>("writingStyles", EnumeratedType.getValues(Book.WritingStyle.class))); } @@ -149,8 +146,6 @@ public final class EditBook extends AuthenticatedWebPage BookDetails details = new BookDetails(book); setResponsePage(details); - - // setRedirect(true); } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java index 3d7577f..dd02a5e 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/Home.java @@ -44,7 +44,7 @@ public final class Home extends AuthenticatedWebPage { // Add table of books final PageableListView<Book> listView; - add(listView = new PageableListView<Book>("books", new PropertyModel<List<Book>>(this, + add(listView = new PageableListView<Book>("books", new PropertyModel<>(this, "books"), 4) { @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java index 3fbf445..14f6206 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibraryApplication.java @@ -33,34 +33,18 @@ import org.apache.wicket.settings.RequestCycleSettings; */ public final class LibraryApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public LibraryApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Home.class; } - /** - * @see org.apache.wicket.protocol.http.WebApplication#newSession(Request, Response) - */ @Override public Session newSession(Request request, Response response) { return new LibrarySession(request); } - /** - * @see org.apache.wicket.examples.WicketExampleApplication#init() - */ @Override protected void init() { @@ -82,11 +66,5 @@ public final class LibraryApplication extends WicketExampleApplication } }; getSecuritySettings().setAuthorizationStrategy(authorizationStrategy); - - // install crypto mapper to encrypt all application urls - // getSecuritySettings().setCryptFactory(new KeyInSessionSunJceCryptFactory()); - // ThreadsafeCompoundRequestMapper root = new ThreadsafeCompoundRequestMapper(); - // root.register(new CryptoMapper(getRootRequestMapper(), this)); - // setRootRequestMapper(root); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java b/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java index 0340698..96b06c2 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/library/LibrarySession.java @@ -104,9 +104,6 @@ public final class LibrarySession extends AuthenticatedWebSession this.user = user; } - /** - * @see AuthenticatedWebSession#signOut() - */ @Override public void signOut() { @@ -114,9 +111,6 @@ public final class LibrarySession extends AuthenticatedWebSession user = null; } - /** - * @see AuthenticatedWebSession#getRoles() - */ @Override public Roles getRoles() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java index a966b1f..06dbbba 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java @@ -66,27 +66,13 @@ public class Home extends WicketExamplePage public Home() { // Action link counts link clicks - final Link<Void> actionLink = new Link<Void>("actionLink") - { - @Override - public void onClick() - { - linkClickCount++; - } - }; + final Link<Void> actionLink = Link.onClick("actionLink", (link) -> linkClickCount++); actionLink.add(new Label("linkClickCount", new PropertyModel<Integer>(this, "linkClickCount"))); add(actionLink); // Action link counts link clicks on works with onclick handler - final Link<Void> actionOnClickLink = new Link<Void>("actionOnClickLink") - { - @Override - public void onClick() - { - onClickLinkClickCount++; - } - }; + final Link<Void> actionOnClickLink = Link.onClick("actionOnClickLink", (link) -> onClickLinkClickCount++); add(actionOnClickLink); add(new Label("onClickLinkClickCount", new PropertyModel<Integer>(this, @@ -103,24 +89,10 @@ public class Home extends WicketExamplePage add(page3Link); // Link to BookDetails page - add(new Link<Void>("bookDetailsLink") - { - @Override - public void onClick() - { - setResponsePage(new BookDetails(new Book("The Hobbit"))); - } - }); + add(Link.onClick("bookDetailsLink", (link) -> setResponsePage(new BookDetails(new Book("The Hobbit"))))); // Delayed link to BookDetails page - add(new Link<Void>("bookDetailsLink2") - { - @Override - public void onClick() - { - setResponsePage(new BookDetails(new Book("Inside The Matrix"))); - } - }); + add(Link.onClick("bookDetailsLink2", (link) -> setResponsePage(new BookDetails(new Book("Inside The Matrix"))))); // Image map link example Image imageForMap = new Image("imageForMap", new PackageResourceReference(Home.class, @@ -183,35 +155,16 @@ public class Home extends WicketExamplePage add(feedbackPanel); add(new RedirectForm("redirectForm")); - Link<Void> linkToAnchor = new Link<Void>("linkToAnchor") - { - @Override - public void onClick() - { - } - }; + Link<Void> linkToAnchor = Link.onClick("linkToAnchor", (link) -> {}); add(linkToAnchor); - Link<Void> anotherlinkToAnchor = new Link<Void>("anotherlinkToAnchor") - { - @Override - public void onClick() - { - } - }; + Link<Void> anotherlinkToAnchor = Link.onClick("anotherlinkToAnchor", (link) -> {}); add(anotherlinkToAnchor); Component anchorLabel = new Label("anchorLabel", "this label is here to function as an anchor for a link").setOutputMarkupId(true); add(anchorLabel); linkToAnchor.setAnchor(anchorLabel); - Link<Void> linkWithLabel = new Link<Void>("linkWithLabel") - { - - @Override - public void onClick() - { - } - }; + Link<Void> linkWithLabel = Link.onClick("linkWithLabel", (link) -> {}); linkWithLabel.setBody(Model.of("A link that provides its body with Link.setBody(someModel)")); add(linkWithLabel); } @@ -237,9 +190,6 @@ public class Home extends WicketExamplePage add(new TextField<>("redirectUrl")); } - /** - * @see org.apache.wicket.markup.html.form.Form#onSubmit() - */ @Override protected void onSubmit() { @@ -306,9 +256,6 @@ public class Home extends WicketExamplePage this.onClickLinkClickCount = onClickLinkClickCount; } - /** - * @see org.apache.wicket.Component#isVersioned() - */ @Override public boolean isVersioned() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java index 9e9c3a6..c18133f 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/LinkomaticApplication.java @@ -28,19 +28,12 @@ import org.apache.wicket.markup.html.image.resource.DefaultButtonImageResource; */ public class LinkomaticApplication extends WicketExampleApplication { - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Home.class; } - /** - * @see org.apache.wicket.protocol.http.WebApplication#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/media/Home.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.java index 2526e19..a568b26 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/media/Home.java @@ -39,7 +39,6 @@ import org.apache.wicket.request.resource.PackageResourceReference; */ public final class Home extends WicketExamplePage { - 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/media/VideosApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/media/VideosApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/media/VideosApplication.java index 2e59703..daca4e2 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/media/VideosApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/media/VideosApplication.java @@ -29,26 +29,12 @@ import org.apache.wicket.markup.html.SecurePackageResourceGuard; */ public class VideosApplication extends WicketExampleApplication { - /** - * Constructor - */ - public VideosApplication() - { - - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Home.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/navomatic/NavomaticApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java index 5e21939..406fec4 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java @@ -26,21 +26,9 @@ import org.apache.wicket.examples.WicketExampleApplication; */ public class NavomaticApplication extends WicketExampleApplication { - /** - * Constructor. - */ - public NavomaticApplication() - { - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Page1.class; } - - } http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java index 83a5602..f5d72f0 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/Home.java @@ -47,9 +47,6 @@ public class Home extends WicketExamplePage add(new BookmarkablePageLink<>("page5Link", Page5.class)); } - /** - * @see org.apache.wicket.Component#isVersioned() - */ @Override public boolean isVersioned() { http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java index 6c1b4f8..f79c39d 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/NiceUrlApplication.java @@ -30,26 +30,12 @@ import org.apache.wicket.request.mapper.parameter.UrlPathPageParametersEncoder; */ public class NiceUrlApplication extends WicketExampleApplication { - /** - * Construct. - */ - public NiceUrlApplication() - { - super(); - } - - /** - * @see org.apache.wicket.Application#getHomePage() - */ @Override public Class<? extends Page> getHomePage() { return Home.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/niceurl/mounted/Page5.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java index d87a12a..d40480c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java @@ -24,6 +24,7 @@ import org.apache.wicket.examples.niceurl.Home; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.util.string.StringValue; /** @@ -72,10 +73,10 @@ public class Page5 extends WicketExamplePage * @param values * @return */ - private String join(List<org.apache.wicket.util.string.StringValue> values) + private String join(List<StringValue> values) { - StringBuilder sb = new StringBuilder(); - for (org.apache.wicket.util.string.StringValue sv : values) + StringBuilder sb = new StringBuilder(); + for (StringValue sv : values) { if (sb.length() > 0) {
