Updated Branches: refs/heads/sandbox/bookmarkable-callback-url 7e5b2e317 -> 46a3a6a1f
WICKET-4932: code cleanup Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/46a3a6a1 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/46a3a6a1 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/46a3a6a1 Branch: refs/heads/sandbox/bookmarkable-callback-url Commit: 46a3a6a1fd81ad619965df754f9866fdf394f95a Parents: 7e5b2e3 Author: Pedro Santos <[email protected]> Authored: Wed Jan 9 18:59:11 2013 -0200 Committer: Pedro Santos <[email protected]> Committed: Wed Jan 9 18:59:11 2013 -0200 ---------------------------------------------------------------------- .../request/mapper/AbstractBookmarkableMapper.java | 8 ++++---- .../mapper/AbstractBookmarkableMapperTest.java | 15 ++------------- 2 files changed, 6 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/46a3a6a1/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java b/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java index 7ae520d..47ac13a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapper.java @@ -16,9 +16,9 @@ */ package org.apache.wicket.request.mapper; +import org.apache.wicket.Application; import org.apache.wicket.RequestListenerInterface; import org.apache.wicket.protocol.http.PageExpiredException; -import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.IRequestHandlerDelegate; import org.apache.wicket.request.IRequestMapper; @@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory; public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper { private static Logger logger = LoggerFactory.getLogger(AbstractBookmarkableMapper.class); - private IPageSettings settings; + private final IPageSettings settings; /** * Represents information stored in URL. @@ -142,7 +142,7 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper */ public AbstractBookmarkableMapper() { - this(WebApplication.get().getPageSettings()); + this(Application.get().getPageSettings()); } /** @@ -224,7 +224,7 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper provider.setPageSource(getContext()); if (provider.isNewPageInstance() && !settings.getRecreateMountedPagesAfterExpiry()) { - throw new PageExpiredException(String.format("Bookmarkable page id '%d' has expired.", + throw new PageExpiredException(String.format("Page with id '%s' has expired", pageInfo.getPageId())); } else http://git-wip-us.apache.org/repos/asf/wicket/blob/46a3a6a1/wicket-core/src/test/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapperTest.java index c2de418..693adec 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/AbstractBookmarkableMapperTest.java @@ -20,12 +20,9 @@ package org.apache.wicket.request.mapper; import org.apache.wicket.MockPage; import org.apache.wicket.WicketTestCase; import org.apache.wicket.protocol.http.PageExpiredException; -import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.Request; import org.apache.wicket.request.Url; -import org.apache.wicket.request.component.IRequestablePage; import org.apache.wicket.request.mapper.info.PageInfo; -import org.apache.wicket.request.mapper.parameter.PageParameters; import org.junit.Assert; import org.junit.Test; @@ -51,8 +48,8 @@ public class AbstractBookmarkableMapperTest extends WicketTestCase Assert.fail("it shouldn't process expired pages if the app was flagged to not recreated mounted pages after expiry"); } - /** */ - public class AbstractBookmarkableMapperStub extends AbstractBookmarkableMapper + /** only a stub since we are testing an abstract class */ + private static class AbstractBookmarkableMapperStub extends AbstractBookmarkableMapper { @Override @@ -79,14 +76,6 @@ public class AbstractBookmarkableMapperTest extends WicketTestCase return 0; } - @Override - protected IRequestHandler processHybrid(PageInfo pageInfo, - Class<? extends IRequestablePage> pageClass, PageParameters pageParameters, - Integer renderCount) - { - return super.processHybrid(pageInfo, pageClass, pageParameters, renderCount); - } - } }
