Repository: wicket Updated Branches: refs/heads/master adcb7a632 -> 65384568a
Minor cleanup - remove useless javadoc (only @see) - Java 7 diamonds - remove unused logger - remove casting Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/65384568 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/65384568 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/65384568 Branch: refs/heads/master Commit: 65384568a100ad9601f1ca880270ef9553d22324 Parents: adcb7a6 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Sep 25 19:56:16 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Sep 25 19:56:16 2014 +0200 ---------------------------------------------------------------------- .../org/apache/wicket/DefaultMapperContext.java | 43 +------------------- ...markableListenerInterfaceRequestHandler.java | 4 -- .../apache/wicket/pageStore/DiskDataStore.java | 2 +- .../apache/wicket/settings/StoreSettings.java | 4 +- 4 files changed, 5 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/65384568/wicket-core/src/main/java/org/apache/wicket/DefaultMapperContext.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/DefaultMapperContext.java b/wicket-core/src/main/java/org/apache/wicket/DefaultMapperContext.java index ea5fce3..486dbf9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/DefaultMapperContext.java +++ b/wicket-core/src/main/java/org/apache/wicket/DefaultMapperContext.java @@ -50,80 +50,49 @@ public class DefaultMapperContext implements IMapperContext { this.application = application; } - /** - * @see org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier() - */ + @Override public String getBookmarkableIdentifier() { return "bookmarkable"; } - /** - * - * @see org.apache.wicket.core.request.mapper.IMapperContext#getNamespace() - */ @Override public String getNamespace() { return MarkupParser.WICKET; } - /** - * - * @see org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier() - */ @Override public String getPageIdentifier() { return "page"; } - /** - * - * @see org.apache.wicket.core.request.mapper.IMapperContext#getResourceIdentifier() - */ @Override public String getResourceIdentifier() { return "resource"; } - /** - * - * @see org.apache.wicket.core.request.mapper.IMapperContext#getResourceReferenceRegistry() - */ @Override public ResourceReferenceRegistry getResourceReferenceRegistry() { return application.getResourceReferenceRegistry(); } - /** - * - * @see org.apache.wicket.core.request.mapper.IMapperContext#requestListenerInterfaceFromString(java.lang.String) - */ @Override public RequestListenerInterface requestListenerInterfaceFromString(final String interfaceName) { return RequestListenerInterface.forName(interfaceName); } - /** - * - * @see org.apache.wicket.core.request.mapper.IMapperContext#requestListenerInterfaceToString(org.apache.wicket.RequestListenerInterface) - */ @Override public String requestListenerInterfaceToString(final RequestListenerInterface listenerInterface) { return listenerInterface.getName(); } - /** - * - * @see org.apache.wicket.core.request.mapper.IPageSource#newPageInstance(java.lang.Class, - * org.apache.wicket.request.mapper.parameter.PageParameters) - */ @Override public IRequestablePage newPageInstance(final Class<? extends IRequestablePage> pageClass, final PageParameters pageParameters) @@ -138,10 +107,6 @@ public class DefaultMapperContext implements IMapperContext } } - /** - * - * @see org.apache.wicket.core.request.mapper.IPageSource#getPageInstance(int) - */ @Override public IRequestablePage getPageInstance(final int pageId) { @@ -154,13 +119,9 @@ public class DefaultMapperContext implements IMapperContext return requestablePage; } - /** - * - * @see org.apache.wicket.core.request.mapper.IMapperContext#getHomePageClass() - */ @Override public Class<? extends IRequestablePage> getHomePageClass() { return application.getHomePage(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/65384568/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java index cc7e1b9..edc65a8 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/BookmarkableListenerInterfaceRequestHandler.java @@ -22,8 +22,6 @@ import org.apache.wicket.request.component.IRequestableComponent; import org.apache.wicket.request.component.IRequestablePage; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.lang.Args; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Request handler for bookmarkable pages with listener interface. This handler is only used to @@ -36,8 +34,6 @@ public class BookmarkableListenerInterfaceRequestHandler IPageRequestHandler, IComponentRequestHandler { - private static final Logger logger = LoggerFactory.getLogger(BookmarkableListenerInterfaceRequestHandler.class); - private final IPageAndComponentProvider pageComponentProvider; private final RequestListenerInterface listenerInterface; http://git-wip-us.apache.org/repos/asf/wicket/blob/65384568/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java index 0858ad9..887fc09 100644 --- a/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java +++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/DiskDataStore.java @@ -74,7 +74,7 @@ public class DiskDataStore implements IDataStore this.applicationName = applicationName; this.fileStoreFolder = fileStoreFolder; maxSizePerPageSession = Args.notNull(maxSizePerSession, "maxSizePerSession"); - sessionEntryMap = new ConcurrentHashMap<String, SessionEntry>(); + sessionEntryMap = new ConcurrentHashMap<>(); try { http://git-wip-us.apache.org/repos/asf/wicket/blob/65384568/wicket-core/src/main/java/org/apache/wicket/settings/StoreSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/StoreSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/StoreSettings.java index 158a679..db52faf 100644 --- a/wicket-core/src/main/java/org/apache/wicket/settings/StoreSettings.java +++ b/wicket-core/src/main/java/org/apache/wicket/settings/StoreSettings.java @@ -127,9 +127,9 @@ public class StoreSettings { if (fileStoreFolder == null) { - if (Application.exists()) + if (WebApplication.exists()) { - fileStoreFolder = (File)((WebApplication)Application.get()).getServletContext() + fileStoreFolder = (File) WebApplication.get().getServletContext() .getAttribute("javax.servlet.context.tempdir"); }
