Repository: wicket Updated Branches: refs/heads/master b28027421 -> 35d7b6286
Non-functional cleanup: Java 7 diamonds Remove not-needed signatures of interface methods in an abstract class Remove not-needed @inheritDoc and @see Interface javadocs Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/35d7b628 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/35d7b628 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/35d7b628 Branch: refs/heads/master Commit: 35d7b62863b6ab35a8e1ac4a9835aabea096a4e2 Parents: b280274 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Aug 28 14:08:23 2014 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Aug 28 14:08:23 2014 +0300 ---------------------------------------------------------------------- .../apache/wicket/page/AbstractPageManager.java | 6 ----- .../wicket/page/PageManagerDecorator.java | 8 ------- .../apache/wicket/page/PageStoreManager.java | 25 ++------------------ 3 files changed, 2 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/35d7b628/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 ca1cfe3..fc1132b 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 @@ -46,12 +46,6 @@ public abstract class AbstractPageManager implements IPageManager */ protected abstract RequestAdapter newRequestAdapter(IPageManagerContext context); - @Override - public abstract boolean supportsVersioning(); - - @Override - public abstract void sessionExpired(String sessionId); - /** * @return The page manager context */ http://git-wip-us.apache.org/repos/asf/wicket/blob/35d7b628/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 63bd379..af6d3fb 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 @@ -38,56 +38,48 @@ public class PageManagerDecorator implements IPageManager this.delegate = delegate; } - /** {@inheritDoc} */ @Override public IPageManagerContext getContext() { return delegate.getContext(); } - /** {@inheritDoc} */ @Override public IManageablePage getPage(int id) { return delegate.getPage(id); } - /** {@inheritDoc} */ @Override public void touchPage(IManageablePage page) { delegate.touchPage(page); } - /** {@inheritDoc} */ @Override public boolean supportsVersioning() { return delegate.supportsVersioning(); } - /** {@inheritDoc} */ @Override public void commitRequest() { delegate.commitRequest(); } - /** {@inheritDoc} */ @Override public void newSessionCreated() { delegate.newSessionCreated(); } - /** {@inheritDoc} */ @Override public void sessionExpired(String sessionId) { delegate.sessionExpired(sessionId); } - /** {@inheritDoc} */ @Override public void destroy() { http://git-wip-us.apache.org/repos/asf/wicket/blob/35d7b628/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java b/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java index 2149773..0e8425f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java +++ b/wicket-core/src/main/java/org/apache/wicket/page/PageStoreManager.java @@ -162,7 +162,7 @@ public class PageStoreManager extends AbstractPageManager { if (sessionCache == null) { - sessionCache = new ArrayList<IManageablePage>(); + sessionCache = new ArrayList<>(); } for (Object o : afterReadObject) @@ -208,7 +208,7 @@ public class PageStoreManager extends AbstractPageManager */ public synchronized void setSessionCache(final List<IManageablePage> pages) { - sessionCache = new ArrayList<IManageablePage>(pages); + sessionCache = new ArrayList<>(pages); afterReadObject = null; } @@ -340,9 +340,6 @@ public class PageStoreManager extends AbstractPageManager super(context); } - /** - * @see org.apache.wicket.page.RequestAdapter#getPage(int) - */ @Override protected IManageablePage getPage(int id) { @@ -383,9 +380,6 @@ public class PageStoreManager extends AbstractPageManager return entry; } - /** - * @see org.apache.wicket.page.RequestAdapter#newSessionCreated() - */ @Override protected void newSessionCreated() { @@ -396,9 +390,6 @@ public class PageStoreManager extends AbstractPageManager } } - /** - * @see org.apache.wicket.page.RequestAdapter#storeTouchedPages(java.util.List) - */ @Override protected void storeTouchedPages(final List<IManageablePage> touchedPages) { @@ -415,36 +406,24 @@ public class PageStoreManager extends AbstractPageManager } } - /** - * @see org.apache.wicket.page.AbstractPageManager#newRequestAdapter(org.apache.wicket.page.IPageManagerContext) - */ @Override protected RequestAdapter newRequestAdapter(IPageManagerContext context) { return new PersistentRequestAdapter(context); } - /** - * @see org.apache.wicket.page.AbstractPageManager#supportsVersioning() - */ @Override public boolean supportsVersioning() { return true; } - /** - * @see org.apache.wicket.page.AbstractPageManager#sessionExpired(java.lang.String) - */ @Override public void sessionExpired(String sessionId) { // nothing to do, the SessionEntry will listen for it to become unbound by itself } - /** - * @see org.apache.wicket.page.IPageManager#destroy() - */ @Override public void destroy() {
