WICKET-6137 renamed ..ListenerInterface.. methods to ..Listener..
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5b37aedc Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5b37aedc Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5b37aedc Branch: refs/heads/master Commit: 5b37aedcb89b3c0a1976f4003ac4779e2f78963a Parents: 9ec235f Author: Sven Meier <svenme...@apache.org> Authored: Mon Jan 30 17:52:11 2017 +0100 Committer: Sven Meier <svenme...@apache.org> Committed: Mon Jan 30 17:52:26 2017 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Component.java | 10 ++++---- .../apache/wicket/RequestListenerInterface.java | 4 ++-- .../org/apache/wicket/behavior/Behavior.java | 8 +++---- .../request/handler/ListenerRequestHandler.java | 6 ++--- .../request/handler/logger/ListenerLogData.java | 1 - .../mapper/AbstractBookmarkableMapper.java | 2 +- .../core/request/mapper/BookmarkableMapper.java | 2 +- .../core/request/mapper/MountedMapper.java | 2 +- .../core/request/mapper/PackageMapper.java | 2 +- .../core/request/mapper/PageInstanceMapper.java | 2 +- .../apache/wicket/markup/html/image/Image.java | 4 ++-- .../component/IRequestableComponent.java | 2 +- .../apache/wicket/settings/PageSettings.java | 18 +++++++-------- .../wicket/settings/RequestCycleSettings.java | 2 +- .../java/org/apache/wicket/ComponentTest.java | 4 ++-- .../java/org/apache/wicket/MockComponent.java | 7 +----- .../request/mapper/BookmarkableMapperTest.java | 10 ++++---- .../core/request/mapper/MountedMapperTest.java | 24 +++++++++----------- .../core/request/mapper/PackageMapperTest.java | 10 ++++---- .../PageExpirationRecoveryTest.java | 8 +++---- ...LazyIsPageStatelessRedirectToBufferTest.java | 2 +- 21 files changed, 59 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/Component.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java index f732463..5f8b209 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -2085,7 +2085,7 @@ public abstract class Component */ public final boolean isStateless() { - if ((isVisibleInHierarchy() && isEnabledInHierarchy()) == false && canCallListenerInterface() == false) + if ((isVisibleInHierarchy() && isEnabledInHierarchy()) == false && canCallListener() == false) { // the component is either invisible or disabled and it can't call listeners // then pretend the component is stateless @@ -2233,7 +2233,7 @@ public abstract class Component { // only process feedback panel when we are about to be rendered. // setRenderingFlag is false in case prepareForRender is called only to build component - // hierarchy (i.e. in BookmarkableListenerInterfaceRequestHandler). + // hierarchy (i.e. in BookmarkableListenerRequestHandler). // prepareForRender(true) is always called before the actual rendering is done so // that's where feedback panels gather the messages @@ -4494,7 +4494,7 @@ public abstract class Component * * @return {@literal true} iff the listener method can be invoked on this component */ - public boolean canCallListenerInterface() + public boolean canCallListener() { return isEnabledInHierarchy() && isVisibleInHierarchy(); } @@ -4582,10 +4582,10 @@ public abstract class Component } @Override - public boolean canCallListenerInterfaceAfterExpiry() + public boolean canCallListenerAfterExpiry() { return getApplication().getPageSettings() - .getCallListenerInterfaceAfterExpiry() || isStateless(); + .getCallListenerAfterExpiry() || isStateless(); } /** * This method is called whenever a component is re-added to the page's component tree, if it http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java index fa1e69e..37f04f8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java +++ b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java @@ -168,7 +168,7 @@ public class RequestListenerInterface // we are in Wicket core land final Component component = (Component)rcomponent; - if (!component.canCallListenerInterface()) + if (!component.canCallListener()) { // just return so that we have a silent fail and just re-render the // page @@ -194,7 +194,7 @@ public class RequestListenerInterface // we are in Wicket core land final Component component = (Component)rcomponent; - if (!behavior.canCallListenerInterface(component)) + if (!behavior.canCallListener(component)) { log.warn("behavior not enabled; ignore call. Behavior {} at component {}", behavior, component); http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java index af36981..8c02f93 100644 --- a/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java +++ b/wicket-core/src/main/java/org/apache/wicket/behavior/Behavior.java @@ -203,19 +203,19 @@ public abstract class Behavior /** * Checks whether or not an {@link IRequestListener} can be invoked on this behavior. For further - * information please read the javadoc on {@link Component#canCallListenerInterface()}, + * information please read the javadoc on {@link Component#canCallListener()}, * this method has the same semantics. * - * WARNING: Read the javadoc of {@link Component#canCallListenerInterface()} for important + * WARNING: Read the javadoc of {@link Component#canCallListener()} for important * security-related information. * * @param component * component this behavior is attached to * @return {@literal true} iff the listener method can be invoked */ - public boolean canCallListenerInterface(Component component) + public boolean canCallListener(Component component) { - return isEnabled(component) && component.canCallListenerInterface(); + return isEnabled(component) && component.canCallListener(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java index 3f131e3..400feb2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/ListenerRequestHandler.java @@ -172,7 +172,7 @@ public class ListenerRequestHandler ? RedirectPolicy.NEVER_REDIRECT : RedirectPolicy.AUTO_REDIRECT; - boolean blockIfExpired = component != null && !component.canCallListenerInterfaceAfterExpiry(); + boolean blockIfExpired = component != null && !component.canCallListenerAfterExpiry(); boolean lateComponent = component == null && freshPage; @@ -238,7 +238,7 @@ public class ListenerRequestHandler // we are in Wicket core land final Component component = (Component)rcomponent; - if (!component.canCallListenerInterface()) + if (!component.canCallListener()) { // just return so that we have a silent fail and just re-render the // page @@ -264,7 +264,7 @@ public class ListenerRequestHandler // we are in Wicket core land final Component component = (Component)rcomponent; - if (!behavior.canCallListenerInterface(component)) + if (!behavior.canCallListener(component)) { LOG.warn("behavior not enabled; ignore call. Behavior {} at component {}", behavior, component); http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerLogData.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerLogData.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerLogData.java index d06fe69..ad83c3a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerLogData.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/logger/ListenerLogData.java @@ -43,7 +43,6 @@ public class ListenerLogData extends PageLogData * Construct. * * @param pageAndComponentProvider - * @param listenerInterface * @param behaviorIndex */ public ListenerLogData(IPageAndComponentProvider pageAndComponentProvider, Integer behaviorIndex) http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java index 8e3b9a9..afafcee 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapper.java @@ -47,7 +47,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Abstract encoder for Bookmarkable, Hybrid and BookmarkableListenerInterface URLs. + * Abstract encoder for Bookmarkable, Hybrid and BookmarkableListener URLs. * * @author Matej Knopp */ http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java index 71e8b05..9b301f1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/BookmarkableMapper.java @@ -42,7 +42,7 @@ import org.apache.wicket.util.string.Strings; * Page Instance - Render Hybrid (RenderPageRequestHandler for pages that were created using bookmarkable URLs) * /wicket/bookmarkable/org.apache.wicket.MyPage?2 * - * Page Instance - Bookmarkable Listener (BookmarkableListenerInterfaceRequestHandler) + * Page Instance - Bookmarkable Listener (BookmarkableListenerRequestHandler) * /wicket/bookmarkable/org.apache.wicket.MyPage?2-click-foo-bar-baz * /wicket/bookmarkable/org.apache.wicket.MyPage?2-click.1-foo-bar-baz (1 is behavior index) * (these will redirect to hybrid if page is not stateless) http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java index f9edf11..d308ac1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/MountedMapper.java @@ -53,7 +53,7 @@ import org.apache.wicket.util.string.Strings; * IPage Instance - Render Hybrid (RenderPageRequestHandler for mounted pages) * /mount/point?2 * - * IPage Instance - Bookmarkable Listener (BookmarkableListenerInterfaceRequestHandler for mounted pages) + * IPage Instance - Bookmarkable Listener (BookmarkableListenerRequestHandler for mounted pages) * /mount/point?2-click-foo-bar-baz * /mount/point?2-5.click.1-foo-bar-baz (1 is behavior index, 5 is render count) * (these will redirect to hybrid if page is not stateless) http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java index 6883ece..6205e78 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PackageMapper.java @@ -55,7 +55,7 @@ import org.apache.wicket.util.string.Strings; * Page Instance - Render Hybrid (RenderPageRequestHandler for pages that were created using bookmarkable URLs) * /MyPage?2 * - * Page Instance - Bookmarkable Listener (BookmarkableListenerInterfaceRequestHandler) + * Page Instance - Bookmarkable Listener (BookmarkableListenerRequestHandler) * /MyPage?2-click-foo-bar-baz * /MyPage?2-click.1-foo-bar-baz (1 is behavior index) * (these will redirect to hybrid if page is not stateless) http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java index f90ea87..b91d685 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/mapper/PageInstanceMapper.java @@ -36,7 +36,7 @@ import org.apache.wicket.request.mapper.info.PageInfo; * /wicket/page?2 * * - * Page Instance - Listener (ListenerInterfaceRequestHandler) + * Page Instance - Listener (ListenerRequestHandler) * /wicket/page?2-click-foo-bar-baz * /wicket/page?2-click.1-foo-bar-baz (1 is behavior index) * </pre> http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java index 5bcfdef..60677d1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java @@ -585,7 +585,7 @@ public class Image extends WebComponent implements IRequestListener } @Override - public boolean canCallListenerInterface() + public boolean canCallListener() { if (isVisibleInHierarchy()) { @@ -596,7 +596,7 @@ public class Image extends WebComponent implements IRequestListener } else { - return super.canCallListenerInterface(); + return super.canCallListener(); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java b/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java index d241874..f7bd8ec 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/component/IRequestableComponent.java @@ -113,5 +113,5 @@ public interface IRequestableComponent * @return {@code true} if it is save to call an {@link org.apache.wicket.IRequestListener} on this component * when the owner page is freshly created after expiration */ - boolean canCallListenerInterfaceAfterExpiry(); + boolean canCallListenerAfterExpiry(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java index b45710e..2bbe6d1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java +++ b/wicket-core/src/main/java/org/apache/wicket/settings/PageSettings.java @@ -49,7 +49,7 @@ public class PageSettings * determines whether an {@link IRequestListener} can be executed * when its owning page is freshly created after expiration */ - private boolean callListenerInterfaceAfterExpiry = false; + private boolean callListenerAfterExpiry = false; /** * Adds a component resolver to the list. @@ -133,26 +133,26 @@ public class PageSettings * @return {@code true} if Wicket should execute an {@link IRequestListener} on a component * which owning page is freshly created after expiration of the old one * @see #getRecreateBookmarkablePagesAfterExpiry() - * @see org.apache.wicket.request.component.IRequestableComponent#canCallListenerInterfaceAfterExpiry() + * @see org.apache.wicket.request.component.IRequestableComponent#canCallListenerAfterExpiry() */ - public boolean getCallListenerInterfaceAfterExpiry() + public boolean getCallListenerAfterExpiry() { - return recreateBookmarkablePagesAfterExpiry && callListenerInterfaceAfterExpiry; + return recreateBookmarkablePagesAfterExpiry && callListenerAfterExpiry; } /** * Sets a setting that determines whether Wicket should execute the {@link IRequestListener} on a component * which owner page is freshly created after expiration of the old one * - * @param callListenerInterfaceAfterExpiry - * {@code true} if Wicket should execute the listener interface + * @param callAfterExpiry + * {@code true} if Wicket should execute the listener * @see #setRecreateBookmarkablePagesAfterExpiry(boolean) - * @see org.apache.wicket.request.component.IRequestableComponent#canCallListenerInterfaceAfterExpiry() + * @see org.apache.wicket.request.component.IRequestableComponent#canCallListenerAfterExpiry() * @return {@code this} object for chaining */ - public PageSettings setCallListenerInterfaceAfterExpiry(boolean callListenerInterfaceAfterExpiry) + public PageSettings setCallListenerAfterExpiry(boolean callAfterExpiry) { - this.callListenerInterfaceAfterExpiry = callListenerInterfaceAfterExpiry; + this.callListenerAfterExpiry = callAfterExpiry; return this; } } http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/main/java/org/apache/wicket/settings/RequestCycleSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/RequestCycleSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/RequestCycleSettings.java index 47dd8a9..784ac38 100644 --- a/wicket-core/src/main/java/org/apache/wicket/settings/RequestCycleSettings.java +++ b/wicket-core/src/main/java/org/apache/wicket/settings/RequestCycleSettings.java @@ -131,7 +131,7 @@ public class RequestCycleSettings * </p> * <p> * Also, even with this strategy set, it is ignored for instances of - * {@link org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler}, + * {@link org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler}, * because otherwise they wouldn't be bookmarkable. * </p> */ http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java b/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java index ca59d80..d3c0dc2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ComponentTest.java @@ -142,7 +142,7 @@ public class ComponentTest extends WicketTestCase // methods no matter whether it is visible or enabled component = new WebComponent("someId") { @Override - public boolean canCallListenerInterface() + public boolean canCallListener() { return true; } @@ -180,7 +180,7 @@ public class ComponentTest extends WicketTestCase link = new Link<Void>("someId") { @Override - public boolean canCallListenerInterface() { + public boolean canCallListener() { return true; } http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/test/java/org/apache/wicket/MockComponent.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/MockComponent.java b/wicket-core/src/test/java/org/apache/wicket/MockComponent.java index 61106e3..d6c292f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/MockComponent.java +++ b/wicket-core/src/test/java/org/apache/wicket/MockComponent.java @@ -138,16 +138,11 @@ public class MockComponent implements IRequestableComponent, IRequestListener } @Override - public boolean canCallListenerInterfaceAfterExpiry() + public boolean canCallListenerAfterExpiry() { return false; } - public boolean canCallListenerInterface() - { - return true; - } - /** * @return false */ http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java index 4284f4d..b08ca4c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java @@ -599,9 +599,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest page.getPageParameters().set("a", "b", INamedParameters.Type.QUERY_STRING); page.getPageParameters().set("b", "c", INamedParameters.Type.QUERY_STRING); - // shouldn't make any difference for - // BookmarkableListenerInterfaceRequestHandler, - // as this explicitely says the url must be bookmarkable + // shouldn't make any difference for BookmarkableListenerRequestHandler, + // as this explicitly says the url must be bookmarkable page.setCreatedBookmarkable(false); IRequestableComponent c = page.get("foo:bar"); @@ -627,9 +626,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest page.getPageParameters().set("a", "b", INamedParameters.Type.QUERY_STRING); page.getPageParameters().set("b", "c", INamedParameters.Type.QUERY_STRING); - // shouldn't make any difference for - // BookmarkableListenerInterfaceRequestHandler, - // as this explicitely says the url must be bookmarkable + // shouldn't make any difference for BookmarkableListenerRequestHandler, + // as this explicitly says the url must be bookmarkable page.setCreatedBookmarkable(false); IRequestableComponent c = page.get("foo:bar"); http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java index c71c74b..9f85215 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java @@ -454,9 +454,8 @@ public class MountedMapperTest extends AbstractMapperTest page.getPageParameters().set("b", "c", INamedParameters.Type.QUERY_STRING); page.setRenderCount(4); - // shouldn't make any difference for - // BookmarkableListenerInterfaceRequestHandler, - // as this explicitely says the url must be bookmarkable + // shouldn't make any difference for BookmarkableListenerRequestHandler, + // as this explicitly says the url must be bookmarkable page.setCreatedBookmarkable(false); IRequestableComponent c = page.get("foo:bar"); @@ -472,8 +471,8 @@ public class MountedMapperTest extends AbstractMapperTest /** * https://issues.apache.org/jira/browse/WICKET-4014 * - * The difference with testEncode7 is that here ListenerInterfaceRequestHandler is used instead - * of BookmarkableListenerInterfaceRequestHandler + * The difference with testEncode7 is that here ListenerRequestHandler is used instead + * of BookmarkableListenerRequestHandler */ @Test public void encode6_1() @@ -490,7 +489,7 @@ public class MountedMapperTest extends AbstractMapperTest page.setRenderCount(4); - // shouldn't make any difference for ListenerInterfaceRequestHandler, + // shouldn't make any difference for ListenerRequestHandler, // as this explicitly says the url must be bookmarkable page.setCreatedBookmarkable(false); @@ -517,9 +516,8 @@ public class MountedMapperTest extends AbstractMapperTest page.getPageParameters().set("b", "c", INamedParameters.Type.QUERY_STRING); page.setRenderCount(5); - // shouldn't make any difference for - // BookmarkableListenerInterfaceRequestHandler, - // as this explicitely says the url must be bookmarkable + // shouldn't make any difference for BookmarkableListenerRequestHandler, + // as this explicitly says the url must be bookmarkable page.setCreatedBookmarkable(false); IRequestableComponent c = page.get("foo:bar"); @@ -535,8 +533,8 @@ public class MountedMapperTest extends AbstractMapperTest /** * https://issues.apache.org/jira/browse/WICKET-4014 * - * The difference with testEncode7 is that here ListenerInterfaceRequestHandler is used instead - * of BookmarkableListenerInterfaceRequestHandler + * The difference with testEncode7 is that here ListenerRequestHandler is used instead + * of BookmarkableListenerRequestHandler */ @Test public void encode7_1() @@ -548,8 +546,8 @@ public class MountedMapperTest extends AbstractMapperTest page.getPageParameters().set("b", "c", INamedParameters.Type.QUERY_STRING); page.setRenderCount(5); - // shouldn't make any difference for ListenerInterfaceRequestHandler, - // as this explicitely says the url must be bookmarkable + // shouldn't make any difference for ListenerRequestHandler, + // as this explicitly says the url must be bookmarkable page.setCreatedBookmarkable(false); IRequestableComponent c = page.get("foo:bar"); http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java index fe3e99e..b75f70b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java @@ -497,9 +497,8 @@ public class PackageMapperTest extends AbstractMapperTest page.getPageParameters().set("a", "b", INamedParameters.Type.QUERY_STRING); page.getPageParameters().set("b", "c", INamedParameters.Type.QUERY_STRING); - // shouldn't make any difference for - // BookmarkableListenerInterfaceRequestHandler, - // as this explicitely says the url must be bookmarkable + // shouldn't make any difference for BookmarkableListenerRequestHandler, + // as this explicitly says the url must be bookmarkable page.setCreatedBookmarkable(false); IRequestableComponent c = page.get("foo:bar"); @@ -524,9 +523,8 @@ public class PackageMapperTest extends AbstractMapperTest page.getPageParameters().set("a", "b", INamedParameters.Type.QUERY_STRING); page.getPageParameters().set("b", "c", INamedParameters.Type.QUERY_STRING); - // shouldn't make any difference for - // BookmarkableListenerInterfaceRequestHandler, - // as this explicitely says the url must be bookmarkable + // shouldn't make any difference for BookmarkableListenerRequestHandler, + // as this explicitly says the url must be bookmarkable page.setCreatedBookmarkable(false); IRequestableComponent c = page.get("foo:bar"); http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java b/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java index fb8c164..88e94d1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/page/expirationrecovery/PageExpirationRecoveryTest.java @@ -68,11 +68,11 @@ public class PageExpirationRecoveryTest extends WicketTestCase } @Test - public void cannotExecuteListenerInterface() + public void cannotExecuteListener() { PageSettings pageSettings = tester.getApplication().getPageSettings(); pageSettings.setRecreateBookmarkablePagesAfterExpiry(true); // CAN recreate - pageSettings.setCallListenerInterfaceAfterExpiry(false); // CANNOT execute listener interfaces + pageSettings.setCallListenerAfterExpiry(false); // CANNOT execute listener interfaces ExpirationRecoveryPage page = tester.startPage(ExpirationRecoveryPage.class, parameters); assertEquals(parameters, page.getPageParameters()); @@ -125,10 +125,10 @@ public class PageExpirationRecoveryTest extends WicketTestCase } @Test - public void canExecuteListenerInterface() + public void canExecuteListener() { PageSettings pageSettings = tester.getApplication().getPageSettings(); - pageSettings.setCallListenerInterfaceAfterExpiry(true); + pageSettings.setCallListenerAfterExpiry(true); pageSettings.setRecreateBookmarkablePagesAfterExpiry(true); ExpirationRecoveryPage page = tester.startPage(ExpirationRecoveryPage.class, parameters); http://git-wip-us.apache.org/repos/asf/wicket/blob/5b37aedc/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java index cd73c5b..6a41fe6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterLazyIsPageStatelessRedirectToBufferTest.java @@ -54,7 +54,7 @@ public class WicketTesterLazyIsPageStatelessRedirectToBufferTest extends WicketT * @throws Exception */ @Test - public void statelessListenerInterfaceInvoked() throws Exception + public void statelessListenerInvoked() throws Exception { tester.startPage(StatelessListenerPage.class); tester.assertRenderedPage(StatelessListenerPage.class);
