Repository: wicket Updated Branches: refs/heads/wicket-6.x 9d3414dec -> 0f9cdd670
WICKET-5933 Avoid serialization of untouched page after ajax request Remove IPageManager#untouchPage(IManageablePage) because we cannot add methods to interfaces in 6.x. The method is available only in AbstractPageManager so the application will need to cast if it needs to use it. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0f9cdd67 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0f9cdd67 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0f9cdd67 Branch: refs/heads/wicket-6.x Commit: 0f9cdd6705137f2e32e11ccc94b665410522865b Parents: 9d3414d Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Jul 7 23:06:25 2015 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Jul 7 23:06:25 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/wicket/mock/MockPageManager.java | 1 - .../java/org/apache/wicket/page/AbstractPageManager.java | 1 - .../main/java/org/apache/wicket/page/IPageManager.java | 11 ----------- .../org/apache/wicket/page/PageManagerDecorator.java | 7 ------- 4 files changed, 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/0f9cdd67/wicket-core/src/main/java/org/apache/wicket/mock/MockPageManager.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/mock/MockPageManager.java b/wicket-core/src/main/java/org/apache/wicket/mock/MockPageManager.java index f2ee59d..9dce067 100644 --- a/wicket-core/src/main/java/org/apache/wicket/mock/MockPageManager.java +++ b/wicket-core/src/main/java/org/apache/wicket/mock/MockPageManager.java @@ -91,7 +91,6 @@ public class MockPageManager implements IPageManager } } - @Override public void untouchPage(IManageablePage page) { pages.remove(page.getPageId()); http://git-wip-us.apache.org/repos/asf/wicket/blob/0f9cdd67/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java b/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java index d39de39..297556e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java +++ b/wicket-core/src/main/java/org/apache/wicket/page/AbstractPageManager.java @@ -130,7 +130,6 @@ public abstract class AbstractPageManager implements IPageManager getRequestAdapter().touch(page); } - @Override public void untouchPage(IManageablePage page) { getRequestAdapter().touch(page); http://git-wip-us.apache.org/repos/asf/wicket/blob/0f9cdd67/wicket-core/src/main/java/org/apache/wicket/page/IPageManager.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/page/IPageManager.java b/wicket-core/src/main/java/org/apache/wicket/page/IPageManager.java index 7272abb..b7817f9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/page/IPageManager.java +++ b/wicket-core/src/main/java/org/apache/wicket/page/IPageManager.java @@ -53,17 +53,6 @@ public interface IPageManager public void touchPage(IManageablePage page) throws CouldNotLockPageException; /** - * Marks page as non-changed. - * Could be used in Ajax requests to avoid storing the page if no changes have happened. - * - * @param page - * the page that should <strong>not</strong> be stored in the page stores at the end of the request. - * @throws CouldNotLockPageException if the page is already locked by another thread - * and the lock cannot be acquired for some timeout - */ - void untouchPage(IManageablePage page); - - /** * Returns whether this manager supports versioning. Managers that support versioning must store * page snapshots. * http://git-wip-us.apache.org/repos/asf/wicket/blob/0f9cdd67/wicket-core/src/main/java/org/apache/wicket/page/PageManagerDecorator.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/page/PageManagerDecorator.java b/wicket-core/src/main/java/org/apache/wicket/page/PageManagerDecorator.java index 49e36aa..963de17 100644 --- a/wicket-core/src/main/java/org/apache/wicket/page/PageManagerDecorator.java +++ b/wicket-core/src/main/java/org/apache/wicket/page/PageManagerDecorator.java @@ -59,13 +59,6 @@ public class PageManagerDecorator implements IPageManager delegate.touchPage(page); } - /** {@inheritDoc} */ - @Override - public void untouchPage(IManageablePage page) - { - delegate.untouchPage(page); - } - @Override public boolean supportsVersioning() {
