WICKET-5829 rename PageSettings#recreateMountedPagesAfterExpiry to #recreateBookmarkablePagesAfterExpiry
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/91e15470 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/91e15470 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/91e15470 Branch: refs/heads/pr-86-media_tags Commit: 91e154702ab1ff3481ef6cbb04c6044814b7e130 Parents: e93fdd5 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sat Feb 21 00:20:51 2015 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sat Feb 21 00:20:51 2015 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Component.java | 2 +- .../mapper/AbstractBookmarkableMapper.java | 2 +- .../apache/wicket/settings/PageSettings.java | 22 ++++++++++---------- .../mapper/AbstractBookmarkableMapperTest.java | 2 +- .../markup/html/link/MountedPageLinkTest.java | 6 +++--- .../PageExpirationRecoveryTest.java | 6 +++--- 6 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/91e15470/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 e39f1f1..e59fabb 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -3359,7 +3359,7 @@ public abstract class Component PageAndComponentProvider provider = new PageAndComponentProvider(page, this, parameters); if (page.isPageStateless() - || (getApplication().getPageSettings().getRecreateMountedPagesAfterExpiry() + || (getApplication().getPageSettings().getRecreateBookmarkablePagesAfterExpiry() && page.isBookmarkable() && page.wasCreatedBookmarkable())) { return new BookmarkableListenerInterfaceRequestHandler(provider, listener, id); http://git-wip-us.apache.org/repos/asf/wicket/blob/91e15470/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 0a047ac..420b808 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 @@ -283,7 +283,7 @@ public abstract class AbstractBookmarkableMapper extends AbstractComponentMapper boolean getRecreateMountedPagesAfterExpiry() { - return WebApplication.get().getPageSettings().getRecreateMountedPagesAfterExpiry(); + return WebApplication.get().getPageSettings().getRecreateBookmarkablePagesAfterExpiry(); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/91e15470/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 e003074..ec9cbc5 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 @@ -41,8 +41,8 @@ public class PageSettings /** Determines if pages should be managed by a version manager by default */ private boolean versionPagesByDefault = true; - /** determines if mounted pages should be recreated after expiry */ - private boolean recreateMountedPagesAfterExpiry = true; + /** determines if bookmarkable pages should be recreated after expiry */ + private boolean recreateBookmarkablePagesAfterExpiry = true; /** * determines whether component's listener interface can be executed @@ -111,32 +111,32 @@ public class PageSettings * @see <a href="https://issues.apache.org/jira/browse/WICKET-4014";>WICKET-4014</a> * @see <a href="https://issues.apache.org/jira/browse/WICKET-4290";>WICKET-4290</a> */ - public boolean getRecreateMountedPagesAfterExpiry() + public boolean getRecreateBookmarkablePagesAfterExpiry() { - return recreateMountedPagesAfterExpiry; + return recreateBookmarkablePagesAfterExpiry; } /** - * Sets the recreateMountedPagesAfterExpiry setting + * Sets the recreateBookmarkablePagesAfterExpiry setting * - * @param recreateMountedPagesAfterExpiry + * @param recreateBookmarkablePagesAfterExpiry * @return {@code this} object for chaining */ - public PageSettings setRecreateMountedPagesAfterExpiry(boolean recreateMountedPagesAfterExpiry) + public PageSettings setRecreateBookmarkablePagesAfterExpiry(boolean recreateBookmarkablePagesAfterExpiry) { - this.recreateMountedPagesAfterExpiry = recreateMountedPagesAfterExpiry; + this.recreateBookmarkablePagesAfterExpiry = recreateBookmarkablePagesAfterExpiry; return this; } /** * @return {@code true} if Wicket should execute the listener interface of a component * which owner page is freshly created after expiration of the old one - * @see #getRecreateMountedPagesAfterExpiry() + * @see #getRecreateBookmarkablePagesAfterExpiry() * @see org.apache.wicket.request.component.IRequestableComponent#canCallListenerInterfaceAfterExpiry() */ public boolean getCallListenerInterfaceAfterExpiry() { - return recreateMountedPagesAfterExpiry && callListenerInterfaceAfterExpiry; + return recreateBookmarkablePagesAfterExpiry && callListenerInterfaceAfterExpiry; } /** @@ -145,7 +145,7 @@ public class PageSettings * * @param callListenerInterfaceAfterExpiry * {@code true} if Wicket should execute the listener interface - * @see #setRecreateMountedPagesAfterExpiry(boolean) + * @see #setRecreateBookmarkablePagesAfterExpiry(boolean) * @see org.apache.wicket.request.component.IRequestableComponent#canCallListenerInterfaceAfterExpiry() * @return {@code this} object for chaining */ http://git-wip-us.apache.org/repos/asf/wicket/blob/91e15470/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java index 544c815..dbd8739 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/AbstractBookmarkableMapperTest.java @@ -74,7 +74,7 @@ public class AbstractBookmarkableMapperTest extends WicketTestCase @Test(expected = PageExpiredException.class) public void itFailsToProcessAnExpiredPageIfShouldNotRecreateMountedPagesAfterExpiry() { - tester.getApplication().getPageSettings().setRecreateMountedPagesAfterExpiry(false); + tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false); AbstractBookmarkableMapperStub mapper = new AbstractBookmarkableMapperStub(); mapper.processHybrid(new PageInfo(EXPIRED_ID), MockPage.class, null, NOT_RENDERED_COUNT); Assert.fail("it shouldn't process expired pages if the app was flagged to not recreated mounted pages after expiry"); http://git-wip-us.apache.org/repos/asf/wicket/blob/91e15470/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java index 69089e1..aef05be 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java @@ -102,13 +102,13 @@ public class MountedPageLinkTest extends WicketTestCase /** * Tests if the {@link PageInstanceMapper} is used if - * {@link org.apache.wicket.settings.PageSettings#getRecreateMountedPagesAfterExpiry()} + * {@link org.apache.wicket.settings.PageSettings#getRecreateBookmarkablePagesAfterExpiry()} * is disabled */ @Test public void testLinkOnPageWithRecreationDisabled() { - tester.getApplication().getPageSettings().setRecreateMountedPagesAfterExpiry(false); + tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false); PageWithLink page = tester.startPage(PageWithLink.class, new PageParameters().add("param", "value", INamedParameters.Type.MANUAL)); Link<?> link = (Link<?>)page.get("link"); @@ -123,7 +123,7 @@ public class MountedPageLinkTest extends WicketTestCase @Test(expected = PageExpiredException.class) public void testExpiredPageWithRecreationDisabled() { - tester.getApplication().getPageSettings().setRecreateMountedPagesAfterExpiry(false); + tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false); PageWithLink page = tester.startPage(PageWithLink.class, new PageParameters().add("param", "value", INamedParameters.Type.MANUAL)); Link<?> link = (Link<?>)page.get("link"); http://git-wip-us.apache.org/repos/asf/wicket/blob/91e15470/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 a75cd97..da14ebd 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 @@ -56,7 +56,7 @@ public class PageExpirationRecoveryTest extends WicketTestCase public void cannotRecreatePageShouldThrowPEE() { PageSettings pageSettings = tester.getApplication().getPageSettings(); - pageSettings.setRecreateMountedPagesAfterExpiry(false); // CANNOT recreate + pageSettings.setRecreateBookmarkablePagesAfterExpiry(false); // CANNOT recreate ExpirationRecoveryPage page = tester.startPage(ExpirationRecoveryPage.class, parameters); assertEquals(parameters, page.getPageParameters()); @@ -71,7 +71,7 @@ public class PageExpirationRecoveryTest extends WicketTestCase public void cannotExecuteListenerInterface() { PageSettings pageSettings = tester.getApplication().getPageSettings(); - pageSettings.setRecreateMountedPagesAfterExpiry(true); // CAN recreate + pageSettings.setRecreateBookmarkablePagesAfterExpiry(true); // CAN recreate pageSettings.setCallListenerInterfaceAfterExpiry(false); // CANNOT execute listener interfaces ExpirationRecoveryPage page = tester.startPage(ExpirationRecoveryPage.class, parameters); @@ -129,7 +129,7 @@ public class PageExpirationRecoveryTest extends WicketTestCase { PageSettings pageSettings = tester.getApplication().getPageSettings(); pageSettings.setCallListenerInterfaceAfterExpiry(true); - pageSettings.setRecreateMountedPagesAfterExpiry(true); + pageSettings.setRecreateBookmarkablePagesAfterExpiry(true); ExpirationRecoveryPage page = tester.startPage(ExpirationRecoveryPage.class, parameters); assertThat(parameters, is(equalTo(page.getPageParameters())));
