You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/06/21 07:09:33 UTC
[01/10] wicket git commit: Remove implicit modifiers
Repository: wicket
Updated Branches:
refs/heads/master 032802165 -> 092a45358
Remove implicit modifiers
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f28df27e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f28df27e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f28df27e
Branch: refs/heads/master
Commit: f28df27e55ab6c25af479c32b44a8c49136eb373
Parents: 0328021
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 20 23:07:26 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 20 23:07:26 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/util/visit/IVisitFilter.java | 2 +-
.../src/main/java/org/apache/wicket/util/visit/IVisitor.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f28df27e/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java
index 0808230..1eb33df 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitFilter.java
@@ -42,7 +42,7 @@ public interface IVisitFilter
/**
* A visitor filter that allows all objects and their children to be visited
*/
- public static IVisitFilter ANY = new IVisitFilter()
+ IVisitFilter ANY = new IVisitFilter()
{
/** {@inheritDoc} */
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/f28df27e/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitor.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitor.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitor.java
index 20c8f2c..87551f8 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitor.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/IVisitor.java
@@ -34,5 +34,5 @@ public interface IVisitor<T, R>
* @param visit
* Object used to control the visit/traversal
*/
- public void component(T object, IVisit<R> visit);
-}
\ No newline at end of file
+ void component(T object, IVisit<R> visit);
+}
[02/10] wicket git commit: Mark IExceptionMapper as a
FunctionalInterface
Posted by mg...@apache.org.
Mark IExceptionMapper as a FunctionalInterface
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ec936edd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ec936edd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ec936edd
Branch: refs/heads/master
Commit: ec936eddd2b2e20197d93a0383ca770a7fe94ea1
Parents: f28df27
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 20 23:08:17 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 20 23:08:17 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/request/IExceptionMapper.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec936edd/wicket-request/src/main/java/org/apache/wicket/request/IExceptionMapper.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/IExceptionMapper.java b/wicket-request/src/main/java/org/apache/wicket/request/IExceptionMapper.java
index 8dfdac4..709699b 100644
--- a/wicket-request/src/main/java/org/apache/wicket/request/IExceptionMapper.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/IExceptionMapper.java
@@ -20,6 +20,7 @@ package org.apache.wicket.request;
/**
* Maps exception to {@link IRequestHandler}.
*/
+@FunctionalInterface
public interface IExceptionMapper
{
/**
[07/10] wicket git commit: Remove useless javadocs
Posted by mg...@apache.org.
Remove useless javadocs
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/547a7e14
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/547a7e14
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/547a7e14
Branch: refs/heads/master
Commit: 547a7e1477dbe49975065af2d306983137d65f89
Parents: 1769d45
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 20 23:13:07 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 20 23:13:07 2016 +0200
----------------------------------------------------------------------
.../feedback/ComponentFeedbackMessageFilter.java | 3 ---
.../feedback/ContainerFeedbackMessageFilter.java | 10 ++--------
.../feedback/ErrorLevelFeedbackMessageFilter.java | 3 ---
.../org/apache/wicket/feedback/FeedbackCollector.java | 3 +--
.../org/apache/wicket/feedback/FeedbackMessage.java | 6 ------
.../org/apache/wicket/feedback/FeedbackMessages.java | 3 +--
.../apache/wicket/feedback/FeedbackMessagesModel.java | 13 +------------
.../apache/wicket/markup/html/link/ResourceLink.java | 10 ----------
8 files changed, 5 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/547a7e14/wicket-core/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java b/wicket-core/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java
index b8cd508..b2cc155 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/ComponentFeedbackMessageFilter.java
@@ -42,9 +42,6 @@ public class ComponentFeedbackMessageFilter implements IFeedbackMessageFilter
this.component = component;
}
- /**
- * @see org.apache.wicket.feedback.IFeedbackMessageFilter#accept(org.apache.wicket.feedback.FeedbackMessage)
- */
@Override
public boolean accept(FeedbackMessage message)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/547a7e14/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java b/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java
index 2b2eba1..065e402 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/ContainerFeedbackMessageFilter.java
@@ -18,6 +18,7 @@ package org.apache.wicket.feedback;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.lang.Objects;
/**
@@ -40,16 +41,9 @@ public class ContainerFeedbackMessageFilter implements IFeedbackMessageFilter
*/
public ContainerFeedbackMessageFilter(MarkupContainer container)
{
- if (container == null)
- {
- throw new IllegalArgumentException("container must be not null");
- }
- this.container = container;
+ this.container = Args.notNull(container, "container");
}
- /**
- * @see org.apache.wicket.feedback.IFeedbackMessageFilter#accept(org.apache.wicket.feedback.FeedbackMessage)
- */
@Override
public boolean accept(FeedbackMessage message)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/547a7e14/wicket-core/src/main/java/org/apache/wicket/feedback/ErrorLevelFeedbackMessageFilter.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/ErrorLevelFeedbackMessageFilter.java b/wicket-core/src/main/java/org/apache/wicket/feedback/ErrorLevelFeedbackMessageFilter.java
index 34efa67..b155212 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/ErrorLevelFeedbackMessageFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/ErrorLevelFeedbackMessageFilter.java
@@ -46,9 +46,6 @@ public class ErrorLevelFeedbackMessageFilter implements IFeedbackMessageFilter
this.minimumErrorLevel = minimumErrorLevel;
}
- /**
- * @see org.apache.wicket.feedback.IFeedbackMessageFilter#accept(org.apache.wicket.feedback.FeedbackMessage)
- */
@Override
public boolean accept(FeedbackMessage message)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/547a7e14/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackCollector.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackCollector.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackCollector.java
index e537df3..3a3fb2e 100755
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackCollector.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackCollector.java
@@ -102,7 +102,7 @@ public class FeedbackCollector
*/
public final List<FeedbackMessage> collect(final IFeedbackMessageFilter filter)
{
- final List<FeedbackMessage> messages = new ArrayList<FeedbackMessage>();
+ final List<FeedbackMessage> messages = new ArrayList<>();
if (includeSession && Session.exists())
{
@@ -118,7 +118,6 @@ public class FeedbackCollector
{
((MarkupContainer)component).visitChildren(new IVisitor<Component, Void>()
{
-
@Override
public void component(Component object, IVisit<Void> visit)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/547a7e14/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
index 69adb70..0f61401 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
@@ -137,7 +137,6 @@ public class FeedbackMessage implements IDetachable
return rendered;
}
-
/**
* Marks this message as rendered.
*/
@@ -146,7 +145,6 @@ public class FeedbackMessage implements IDetachable
rendered = true;
}
-
/**
* Gets the message level; can be used by rendering components. Note that what actually happens
* with the level indication is totally up to the components that render feedback messages.
@@ -270,9 +268,6 @@ public class FeedbackMessage implements IDetachable
return (getLevel() == UNDEFINED);
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
@@ -281,7 +276,6 @@ public class FeedbackMessage implements IDetachable
getLevelAsString() + ']';
}
- /** {@inheritDoc} */
@Override
public void detach()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/547a7e14/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
index fe2a96b..2177873 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
@@ -55,7 +55,7 @@ public final class FeedbackMessages implements IClusterable, Iterable<FeedbackMe
*/
public FeedbackMessages()
{
- messages = new CopyOnWriteArrayList<FeedbackMessage>();
+ messages = new CopyOnWriteArrayList<>();
}
/**
@@ -190,7 +190,6 @@ public final class FeedbackMessages implements IClusterable, Iterable<FeedbackMe
List<FeedbackMessage> toDelete = messages(filter);
-
for (FeedbackMessage message : toDelete)
{
message.detach();
http://git-wip-us.apache.org/repos/asf/wicket/blob/547a7e14/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
index 6c17478..d6d915a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessagesModel.java
@@ -92,9 +92,6 @@ public class FeedbackMessagesModel implements IModel<List<FeedbackMessage>>
return sortingComparator;
}
- /**
- * @see org.apache.wicket.model.IModel#getObject()
- */
@Override
public final List<FeedbackMessage> getObject()
{
@@ -173,22 +170,14 @@ public class FeedbackMessagesModel implements IModel<List<FeedbackMessage>>
return messages;
}
- /**
- *
- * @see org.apache.wicket.model.IModel#setObject(java.lang.Object)
- */
@Override
public void setObject(List<FeedbackMessage> object)
{
}
- /**
- *
- * @see org.apache.wicket.model.IDetachable#detach()
- */
@Override
public void detach()
{
messages = null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/547a7e14/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
index 2e1f0c4..dcfe7a5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ResourceLink.java
@@ -95,9 +95,6 @@ public class ResourceLink<T> extends Link<T> implements IRequestListener
resourceParameters = null;
}
- /**
- * @see org.apache.wicket.markup.html.link.Link#onClick()
- */
@Override
public void onClick()
{
@@ -109,13 +106,9 @@ public class ResourceLink<T> extends Link<T> implements IRequestListener
return false;
}
- /**
- * @see org.apache.wicket.IResourceListener#onResourceRequested()
- */
@Override
public final void onRequest()
{
-
Attributes a = new Attributes(RequestCycle.get().getRequest(), RequestCycle.get()
.getResponse(), null);
resource.respond(a);
@@ -123,9 +116,6 @@ public class ResourceLink<T> extends Link<T> implements IRequestListener
super.onRequest();
}
- /**
- * @see org.apache.wicket.markup.html.link.Link#getURL()
- */
@Override
protected final CharSequence getURL()
{
[03/10] wicket git commit: Remove a TODO for functionality which was
not really needed so far
Posted by mg...@apache.org.
Remove a TODO for functionality which was not really needed so far
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e67141ff
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e67141ff
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e67141ff
Branch: refs/heads/master
Commit: e67141ff9018b96237539db5d3fbdec258d6e647
Parents: ec936ed
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 20 23:08:56 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 20 23:08:56 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/request/IRequestCycle.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e67141ff/wicket-request/src/main/java/org/apache/wicket/request/IRequestCycle.java
----------------------------------------------------------------------
diff --git a/wicket-request/src/main/java/org/apache/wicket/request/IRequestCycle.java b/wicket-request/src/main/java/org/apache/wicket/request/IRequestCycle.java
index 6915c74..ad4e3d3 100755
--- a/wicket-request/src/main/java/org/apache/wicket/request/IRequestCycle.java
+++ b/wicket-request/src/main/java/org/apache/wicket/request/IRequestCycle.java
@@ -36,15 +36,6 @@ public interface IRequestCycle
Response setResponse(Response response);
/**
- * TODO Wicket 7
- * Add the following method to the API:
- *
- * Replaces the current {@link Request} with a new one.
- * @return the previous request
- */
-// Request setRequest(Request request);
-
- /**
* @return the request that originated this cycle
*/
Request getRequest();
[08/10] wicket git commit: Use Java 8 features in wicket-examples.
Posted by mg...@apache.org.
http://git-wip-us.apache.org/repos/asf/wicket/blob/092a4535/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java
index 94e85fa..20e9dde 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardApplication.java
@@ -26,18 +26,12 @@ import org.apache.wicket.protocol.http.WebApplication;
*/
public class WizardApplication extends WebApplication
{
- /**
- * @see org.apache.wicket.Application#getHomePage()
- */
@Override
public Class<? extends Page> getHomePage()
{
return Index.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/wizard/WizardPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java
index 97de853..ab568b1 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/wizard/WizardPage.java
@@ -23,6 +23,7 @@ import org.apache.wicket.extensions.wizard.Wizard;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.util.lang.Args;
/**
@@ -42,10 +43,7 @@ public class WizardPage extends WicketExamplePage
*/
public <C extends Wizard> WizardPage(Class<C> wizardClass)
{
- if (wizardClass == null)
- {
- throw new IllegalArgumentException("argument wizardClass must be not null");
- }
+ Args.notNull(wizardClass, "wizardClass");
try
{
Constructor<? extends Wizard> ctor = wizardClass.getConstructor(String.class);
[10/10] wicket git commit: Use Java 8 features in wicket-examples.
Posted by mg...@apache.org.
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 <mg...@apache.org>
Authored: Mon Jun 20 23:13:34 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
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)
{
[06/10] wicket git commit: Make IFeedbackMessageFilter and
IHeaderResponseFilter extending j.u.f.Predicate.
Posted by mg...@apache.org.
Make IFeedbackMessageFilter and IHeaderResponseFilter extending j.u.f.Predicate.
This way one could compose multiple of those if needed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1769d457
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1769d457
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1769d457
Branch: refs/heads/master
Commit: 1769d4570fbc4969bb6ea80407055a3081768549
Parents: c96ffc8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 20 23:11:58 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 20 23:11:58 2016 +0200
----------------------------------------------------------------------
.../apache/wicket/feedback/IFeedbackMessageFilter.java | 13 ++++++++++---
.../markup/head/filter/FilteringHeaderResponse.java | 8 +++++++-
2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1769d457/wicket-core/src/main/java/org/apache/wicket/feedback/IFeedbackMessageFilter.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/IFeedbackMessageFilter.java b/wicket-core/src/main/java/org/apache/wicket/feedback/IFeedbackMessageFilter.java
index fccee3e..54a7f7d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/IFeedbackMessageFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/IFeedbackMessageFilter.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.feedback;
+import java.util.function.Predicate;
+
import org.apache.wicket.util.io.IClusterable;
/**
@@ -24,17 +26,17 @@ import org.apache.wicket.util.io.IClusterable;
* @author Jonathan Locke
*/
@FunctionalInterface
-public interface IFeedbackMessageFilter extends IClusterable
+public interface IFeedbackMessageFilter extends IClusterable, Predicate<FeedbackMessage>
{
/**
* Filter that returns simply all available messages.
*/
- IFeedbackMessageFilter ALL = (IFeedbackMessageFilter) message -> true;
+ IFeedbackMessageFilter ALL = message -> true;
/**
* Filter that does not match any message
*/
- IFeedbackMessageFilter NONE = (IFeedbackMessageFilter) message -> false;
+ IFeedbackMessageFilter NONE = message -> false;
/**
* @param message
@@ -42,4 +44,9 @@ public interface IFeedbackMessageFilter extends IClusterable
* @return True if the message should be included, false to exclude it
*/
boolean accept(FeedbackMessage message);
+
+ @Override
+ default boolean test(FeedbackMessage message) {
+ return accept(message);
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1769d457/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
index 9c79a9a..444bb8c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponse.java
@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.function.Predicate;
import org.apache.wicket.MetaDataKey;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -65,7 +66,7 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse
*
* @author Jeremy Thomerson
*/
- public static interface IHeaderResponseFilter
+ public interface IHeaderResponseFilter extends Predicate<HeaderItem>
{
/**
* @return name of the filter (used by the container that renders these resources)
@@ -81,6 +82,11 @@ public class FilteringHeaderResponse extends DecoratingHeaderResponse
* @return true if it should be bucketed with other things in this filter
*/
boolean accepts(HeaderItem item);
+
+ @Override
+ default boolean test(HeaderItem item) {
+ return accepts(item);
+ }
}
/**
[04/10] wicket git commit: Fix javadoc errors
Posted by mg...@apache.org.
Fix javadoc errors
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b4caae09
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b4caae09
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b4caae09
Branch: refs/heads/master
Commit: b4caae0944cb88113de1de2d1060ba148575c717
Parents: e67141f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 20 23:10:11 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 20 23:10:11 2016 +0200
----------------------------------------------------------------------
.../org/apache/wicket/ajax/markup/html/form/AjaxButton.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b4caae09/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
index 37d84d7..99e279a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
@@ -178,7 +178,7 @@ public abstract class AjaxButton extends Button
/**
* This method is never called.
*
- * @see #onSubmit(AjaxRequestTarget, Form)
+ * @see #onSubmit(AjaxRequestTarget)
*/
@Override
public final void onSubmit()
@@ -195,7 +195,7 @@ public abstract class AjaxButton extends Button
/**
* This method is never called.
*
- * @see #onError(AjaxRequestTarget, Form)
+ * @see #onError(AjaxRequestTarget)
*/
@Override
public final void onError()
@@ -207,7 +207,6 @@ public abstract class AjaxButton extends Button
* Listener method invoked on form submit with no errors, before {@link Form#onSubmit()}.
*
* @param target
- * @param form
*/
protected void onSubmit(AjaxRequestTarget target)
{
@@ -217,7 +216,6 @@ public abstract class AjaxButton extends Button
* Listener method invoked on form submit with no errors, after {@link Form#onSubmit()}.
*
* @param target
- * @param form
*/
protected void onAfterSubmit(AjaxRequestTarget target)
{
@@ -227,7 +225,6 @@ public abstract class AjaxButton extends Button
* Listener method invoked on form submit with errors
*
* @param target
- * @param form
*/
protected void onError(AjaxRequestTarget target)
{
[09/10] wicket git commit: Use Java 8 features in wicket-examples.
Posted by mg...@apache.org.
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;
}
/**
[05/10] wicket git commit: Add a lambda method to StatelessLink
Posted by mg...@apache.org.
Add a lambda method to StatelessLink
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c96ffc8e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c96ffc8e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c96ffc8e
Branch: refs/heads/master
Commit: c96ffc8e1e2255cef57c2d5e57dac1af0e24f51f
Parents: b4caae0
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jun 20 23:11:26 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jun 20 23:11:26 2016 +0200
----------------------------------------------------------------------
.../wicket/markup/html/link/StatelessLink.java | 29 +++++++++++++++++++-
1 file changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c96ffc8e/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
index c0896ba..ac6d157 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/StatelessLink.java
@@ -17,6 +17,9 @@
package org.apache.wicket.markup.html.link;
+import org.apache.wicket.lambda.WicketConsumer;
+import org.apache.wicket.util.lang.Args;
+
/**
* This link is stateless that means that the url to this link could generate a new page before the
* link onClick is called. Because of this you can't depend on model data in the onClick method.
@@ -42,7 +45,6 @@ public abstract class StatelessLink<T> extends Link<T>
super(id);
}
-
@Override
protected boolean getStatelessHint()
{
@@ -54,4 +56,29 @@ public abstract class StatelessLink<T> extends Link<T>
{
return urlForListener(getPage().getPageParameters());
}
+
+ /**
+ * Creates a {@link Link} based on lambda expressions
+ *
+ * @param id
+ * the id of the link
+ * @param onClick
+ * the {@link WicketConsumer} which accepts the {@link Void}
+ * @return the {@link Link}
+ */
+ public static <T> StatelessLink<T> onClick(String id, WicketConsumer<Link<T>> onClick)
+ {
+ Args.notNull(onClick, "onClick");
+
+ return new StatelessLink<T>(id)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick()
+ {
+ onClick.accept(this);
+ }
+ };
+ }
}