Updated Branches: refs/heads/master 484415796 -> c673ebbe1
WICKET-5410 Remove setting interfaces Remove IApplicationSettings interface Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c673ebbe Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c673ebbe Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c673ebbe Branch: refs/heads/master Commit: c673ebbe1bacfda8904a1c315babfe5e3050ffcf Parents: 4844157 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Nov 12 11:06:54 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Nov 12 11:06:54 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/Application.java | 7 +- .../wicket/core/util/lang/WicketObjects.java | 7 +- .../apache/wicket/markup/html/form/Form.java | 7 +- .../wicket/markup/html/panel/FeedbackPanel.java | 3 +- .../servlet/MultipartServletWebRequestImpl.java | 5 +- .../wicket/serialize/java/JavaSerializer.java | 4 +- .../wicket/settings/IApplicationSettings.java | 153 ------------------- .../settings/def/ApplicationSettings.java | 105 +++++++++---- .../wicket/jmx/ApplicationSettingsMBean.java | 7 +- 9 files changed, 90 insertions(+), 208 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c673ebbe/wicket-core/src/main/java/org/apache/wicket/Application.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Application.java b/wicket-core/src/main/java/org/apache/wicket/Application.java index 5cbbdde..cca97d1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.java +++ b/wicket-core/src/main/java/org/apache/wicket/Application.java @@ -84,7 +84,6 @@ import org.apache.wicket.response.filter.EmptySrcAttributeCheckFilter; import org.apache.wicket.session.DefaultPageFactory; import org.apache.wicket.session.ISessionStore; import org.apache.wicket.session.ISessionStore.UnboundListener; -import org.apache.wicket.settings.IApplicationSettings; import org.apache.wicket.settings.IDebugSettings; import org.apache.wicket.settings.IExceptionSettings; import org.apache.wicket.settings.IFrameworkSettings; @@ -1022,7 +1021,7 @@ public abstract class Application implements UnboundListener, IEventSink // ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** Application settings */ - private IApplicationSettings applicationSettings; + private ApplicationSettings applicationSettings; /** JavaScriptLibrary settings */ private IJavaScriptLibrarySettings javaScriptLibrarySettings; @@ -1064,7 +1063,7 @@ public abstract class Application implements UnboundListener, IEventSink * @return Application's application-wide settings * @since 1.2 */ - public final IApplicationSettings getApplicationSettings() + public final ApplicationSettings getApplicationSettings() { checkSettingsAvailable(); if (applicationSettings == null) @@ -1078,7 +1077,7 @@ public abstract class Application implements UnboundListener, IEventSink * * @param applicationSettings */ - public final void setApplicationSettings(final IApplicationSettings applicationSettings) + public final void setApplicationSettings(final ApplicationSettings applicationSettings) { this.applicationSettings = applicationSettings; } http://git-wip-us.apache.org/repos/asf/wicket/blob/c673ebbe/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java index 464a212..1d99452 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/lang/WicketObjects.java @@ -34,7 +34,7 @@ import org.apache.wicket.application.IClassResolver; import org.apache.wicket.model.IDetachable; import org.apache.wicket.serialize.ISerializer; import org.apache.wicket.serialize.java.JavaSerializer; -import org.apache.wicket.settings.IApplicationSettings; +import org.apache.wicket.settings.def.ApplicationSettings; import org.apache.wicket.util.io.ByteCountingOutputStream; import org.apache.wicket.util.lang.Generics; import org.apache.wicket.util.string.Strings; @@ -59,7 +59,6 @@ public class WicketObjects * @param className * Class to resolve * @return Resolved class - * @throws ClassNotFoundException */ @SuppressWarnings("unchecked") public static <T> Class<T> resolveClass(final String className) @@ -176,7 +175,7 @@ public class WicketObjects } Application application = Application.get(); - IApplicationSettings applicationSettings = application.getApplicationSettings(); + ApplicationSettings applicationSettings = application.getApplicationSettings(); IClassResolver classResolver = applicationSettings.getClassResolver(); Class<?> candidate = null; @@ -328,7 +327,7 @@ public class WicketObjects Application application = Application.get(); - IApplicationSettings applicationSettings = application.getApplicationSettings(); + ApplicationSettings applicationSettings = application.getApplicationSettings(); IClassResolver classResolver = applicationSettings.getClassResolver(); Class<?> candidate = null; http://git-wip-us.apache.org/repos/asf/wicket/blob/c673ebbe/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java index 93364e7..3ab6d10 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java @@ -52,7 +52,6 @@ import org.apache.wicket.request.Url; import org.apache.wicket.request.UrlRenderer; import org.apache.wicket.request.http.WebRequest; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.apache.wicket.settings.IApplicationSettings; import org.apache.wicket.util.encoding.UrlDecoder; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Bytes; @@ -271,7 +270,7 @@ public class Form<T> extends WebMarkupContainer implements IFormSubmitListener, /** * Maximum size of an upload in bytes. If null, the setting - * {@link IApplicationSettings#getDefaultMaximumUploadSize()} is used. + * {@link org.apache.wicket.settings.def.ApplicationSettings#getDefaultMaximumUploadSize()} is used. */ private Bytes maxSize = null; @@ -551,7 +550,7 @@ public class Form<T> extends WebMarkupContainer implements IFormSubmitListener, /** * Gets the maximum size for uploads. If null, the setting - * {@link IApplicationSettings#getDefaultMaximumUploadSize()} is used. + * {@link org.apache.wicket.settings.def.ApplicationSettings#getDefaultMaximumUploadSize()} is used. * * * @return the maximum size @@ -1024,7 +1023,7 @@ public class Form<T> extends WebMarkupContainer implements IFormSubmitListener, /** * Sets the maximum size for uploads. If null, the setting - * {@link IApplicationSettings#getDefaultMaximumUploadSize()} is used. + * {@link org.apache.wicket.settings.def.ApplicationSettings#getDefaultMaximumUploadSize()} is used. * * @param maxSize * The maximum size http://git-wip-us.apache.org/repos/asf/wicket/blob/c673ebbe/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java index 1dee722..cd44463 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java @@ -33,7 +33,6 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; -import org.apache.wicket.settings.IApplicationSettings; /** @@ -74,7 +73,7 @@ public class FeedbackPanel extends Panel implements IFeedback /** * WICKET-4258 Feedback messages might be cleared already. * - * @see IApplicationSettings#setFeedbackMessageCleanupFilter(org.apache.wicket.feedback.IFeedbackMessageFilter) + * @see org.apache.wicket.settings.def.ApplicationSettings#setFeedbackMessageCleanupFilter(org.apache.wicket.feedback.IFeedbackMessageFilter) */ @Override public FeedbackMessage getObject() http://git-wip-us.apache.org/repos/asf/wicket/blob/c673ebbe/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java index 88f5622..8e412a1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/MultipartServletWebRequestImpl.java @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletRequest; import org.apache.wicket.Application; import org.apache.wicket.WicketRuntimeException; -import org.apache.wicket.settings.IApplicationSettings; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Bytes; import org.apache.wicket.util.string.StringValue; @@ -296,7 +295,7 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest /** * Subclasses that want to receive upload notifications should return true. By default it takes - * the value from {@link IApplicationSettings#isUploadProgressUpdatesEnabled()}. + * the value from {@link org.apache.wicket.settings.def.ApplicationSettings#isUploadProgressUpdatesEnabled()}. * * @return true if upload status update event should be invoked */ @@ -488,4 +487,4 @@ public class MultipartServletWebRequestImpl extends MultipartServletWebRequest Args.notNull(upload, "upload"); req.getSession().removeAttribute(getSessionKey(upload)); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/c673ebbe/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java b/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java index 12425ba..241412f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java +++ b/wicket-core/src/main/java/org/apache/wicket/serialize/java/JavaSerializer.java @@ -33,7 +33,7 @@ import org.apache.wicket.application.IClassResolver; import org.apache.wicket.core.util.objects.checker.CheckingObjectOutputStream; import org.apache.wicket.core.util.objects.checker.ObjectSerializationChecker; import org.apache.wicket.serialize.ISerializer; -import org.apache.wicket.settings.IApplicationSettings; +import org.apache.wicket.settings.def.ApplicationSettings; import org.apache.wicket.util.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -212,7 +212,7 @@ public class JavaSerializer implements ISerializer // Should be if serialization happened in thread with application set // (WICKET-2195) Application application = Application.get(); - IApplicationSettings applicationSettings = application.getApplicationSettings(); + ApplicationSettings applicationSettings = application.getApplicationSettings(); IClassResolver classResolver = applicationSettings.getClassResolver(); candidate = classResolver.resolveClass(className); http://git-wip-us.apache.org/repos/asf/wicket/blob/c673ebbe/wicket-core/src/main/java/org/apache/wicket/settings/IApplicationSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/IApplicationSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/IApplicationSettings.java deleted file mode 100644 index eabcb77..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/settings/IApplicationSettings.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.wicket.settings; - -import org.apache.wicket.Page; -import org.apache.wicket.application.IClassResolver; -import org.apache.wicket.feedback.IFeedbackMessageFilter; -import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.util.lang.Bytes; - -/** - * Settings interface for application settings. - * <p> - * <i>internalErrorPage </i>- You can override this with your own page class to display internal - * errors in a different way. - * <p> - * <i>pageExpiredErrorPage </i>- You can override this with your own bookmarkable page class to - * display expired page errors in a different way. You can set property homePageRenderStrategy to - * choose from different ways the home page url shows up in your browser. - * <p> - * <b>A Converter Factory </b>- By overriding getConverterFactory(), you can provide your own - * factory which creates locale sensitive Converter instances. - * - * @author Jonathan Locke - */ -public interface IApplicationSettings -{ - /** - * Gets the access denied page class. - * - * @return Returns the accessDeniedPage. - * @see IApplicationSettings#setAccessDeniedPage(Class) - */ - Class<? extends Page> getAccessDeniedPage(); - - /** - * Gets the default resolver to use when finding classes and resources. - * - * @return Default class resolver - */ - IClassResolver getClassResolver(); - - /** - * Gets the default maximum size for uploads. This is used by {@link Form#getMaxSize()} if no - * value is explicitly set through {@link Form#setMaxSize(Bytes)}. - * - * @return the default maximum size for uploads - */ - Bytes getDefaultMaximumUploadSize(); - - /** - * Gets internal error page class. - * - * @return Returns the internalErrorPage. - * @see IApplicationSettings#setInternalErrorPage(Class) - */ - Class<? extends Page> getInternalErrorPage(); - - /** - * Gets the page expired page class. - * - * @return Returns the pageExpiredErrorPage. - * @see IApplicationSettings#setPageExpiredErrorPage(Class) - */ - Class<? extends Page> getPageExpiredErrorPage(); - - /** - * Gets whether wicket is providing updates about the upload progress or not. - * - * @return if true upload progress monitoring is enabled - */ - boolean isUploadProgressUpdatesEnabled(); - - /** - * Sets the access denied page class. The class must be bookmarkable and must extend Page. - * - * @param accessDeniedPage - * The accessDeniedPage to set. - */ - void setAccessDeniedPage(final Class<? extends Page> accessDeniedPage); - - /** - * Sets the default class resolver to use when finding classes and resources. - * - * @param defaultClassResolver - * The default class resolver - */ - void setClassResolver(final IClassResolver defaultClassResolver); - - /** - * Sets the default maximum size for uploads. This is used by {@link Form#getMaxSize()} if no - * value is explicitly set through {@link Form#setMaxSize(Bytes)}. - * - * @param defaultUploadSize - * the default maximum size for uploads - */ - void setDefaultMaximumUploadSize(Bytes defaultUploadSize); - - /** - * Sets internal error page class. The class must be bookmarkable and must extend Page. - * - * @param internalErrorPage - * The internalErrorPage to set. - */ - void setInternalErrorPage(final Class<? extends Page> internalErrorPage); - - /** - * Sets the page expired page class. The class must be bookmarkable and must extend Page. - * - * @param pageExpiredErrorPage - * The pageExpiredErrorPage to set. - */ - void setPageExpiredErrorPage(final Class<? extends Page> pageExpiredErrorPage); - - /** - * Sets whether wicket should provide updates about the upload progress or not. - * - * @param uploadProgressUpdatesEnabled - * if true upload progress monitoring is enabled - */ - void setUploadProgressUpdatesEnabled(boolean uploadProgressUpdatesEnabled); - - /** - * Sets the cleanup feedback message filter. see {@link #getFeedbackMessageCleanupFilter()} for - * more details. - * - * @param filter - */ - void setFeedbackMessageCleanupFilter(IFeedbackMessageFilter filter); - - /** - * Returns the cleanup feedack message filter. At the end of request all messages are ran - * through this filter, and the ones accepted are removed. The default implementation accepts - * (and therefore remkoves) all rendered messages. - * - * @return feedback message filter - */ - IFeedbackMessageFilter getFeedbackMessageCleanupFilter(); -} http://git-wip-us.apache.org/repos/asf/wicket/blob/c673ebbe/wicket-core/src/main/java/org/apache/wicket/settings/def/ApplicationSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/def/ApplicationSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/def/ApplicationSettings.java index 4720df9..8c0b1a9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/settings/def/ApplicationSettings.java +++ b/wicket-core/src/main/java/org/apache/wicket/settings/def/ApplicationSettings.java @@ -23,12 +23,22 @@ import org.apache.wicket.application.DefaultClassResolver; import org.apache.wicket.application.IClassResolver; import org.apache.wicket.feedback.DefaultCleanupFeedbackMessageFilter; import org.apache.wicket.feedback.IFeedbackMessageFilter; -import org.apache.wicket.settings.IApplicationSettings; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.lang.Bytes; /** - * + * * Settings interface for application settings. + * <p> + * <i>internalErrorPage </i>- You can override this with your own page class to display internal + * errors in a different way. + * <p> + * <i>pageExpiredErrorPage </i>- You can override this with your own bookmarkable page class to + * display expired page errors in a different way. You can set property homePageRenderStrategy to + * choose from different ways the home page url shows up in your browser. + * <p> + * <b>A Converter Factory </b>- By overriding getConverterFactory(), you can provide your own + * factory which creates locale sensitive Converter instances. + * * @author Jonathan Locke * @author Chris Turner * @author Eelco Hillenius @@ -38,7 +48,7 @@ import org.apache.wicket.util.lang.Bytes; * @author Martijn Dashorst * @author James Carman */ -public class ApplicationSettings implements IApplicationSettings +public class ApplicationSettings { private WeakReference<Class<? extends Page>> accessDeniedPage; @@ -55,60 +65,72 @@ public class ApplicationSettings implements IApplicationSettings private IFeedbackMessageFilter feedbackMessageCleanupFilter = new DefaultCleanupFeedbackMessageFilter(); /** - * @see org.apache.wicket.settings.IApplicationSettings#getAccessDeniedPage() + * Gets the access denied page class. + * + * @return Returns the accessDeniedPage. */ - @Override public Class<? extends Page> getAccessDeniedPage() { return accessDeniedPage.get(); } /** - * @see org.apache.wicket.settings.IApplicationSettings#getClassResolver() + * Gets the default resolver to use when finding classes and resources. + * + * @return Default class resolver */ - @Override public IClassResolver getClassResolver() { return classResolver; } - @Override + /** + * Gets the default maximum size for uploads. This is used by {@link org.apache.wicket.markup.html.form.Form#getMaxSize()} if no + * value is explicitly set through {@link org.apache.wicket.markup.html.form.Form#setMaxSize(Bytes)}. + * + * @return the default maximum size for uploads + */ public Bytes getDefaultMaximumUploadSize() { return defaultMaximumUploadSize; } /** - * @see org.apache.wicket.settings.IApplicationSettings#getInternalErrorPage() + * Gets internal error page class. + * + * @return Returns the internalErrorPage. */ - @Override public Class<? extends Page> getInternalErrorPage() { return internalErrorPage.get(); } /** - * @see org.apache.wicket.settings.IApplicationSettings#getPageExpiredErrorPage() + * Gets the page expired page class. + * + * @return Returns the pageExpiredErrorPage. */ - @Override public Class<? extends Page> getPageExpiredErrorPage() { return pageExpiredErrorPage.get(); } /** - * @see org.apache.wicket.settings.IApplicationSettings#isUploadProgressUpdatesEnabled() + * Gets whether wicket is providing updates about the upload progress or not. + * + * @return if true upload progress monitoring is enabled */ - @Override public boolean isUploadProgressUpdatesEnabled() { return uploadProgressUpdatesEnabled; } /** - * @see org.apache.wicket.settings.IApplicationSettings#setAccessDeniedPage(java.lang.Class) + * Sets the access denied page class. The class must be bookmarkable and must extend Page. + * + * @param accessDeniedPage + * The accessDeniedPage to set. */ - @Override public void setAccessDeniedPage(Class<? extends Page> accessDeniedPage) { if (accessDeniedPage == null) @@ -121,42 +143,48 @@ public class ApplicationSettings implements IApplicationSettings } /** - * @see org.apache.wicket.settings.IApplicationSettings#setClassResolver(org.apache.wicket.application.IClassResolver) + * Sets the default class resolver to use when finding classes and resources. + * + * @param defaultClassResolver + * The default class resolver */ - @Override public void setClassResolver(final IClassResolver defaultClassResolver) { classResolver = defaultClassResolver; } /** - * @see org.apache.wicket.settings.IApplicationSettings#setDefaultMaximumUploadSize(org.apache.wicket.util.lang.Bytes) + * Sets the default maximum size for uploads. This is used by {@link org.apache.wicket.markup.html.form.Form#getMaxSize()} if no + * value is explicitly set through {@link org.apache.wicket.markup.html.form.Form#setMaxSize(Bytes)}. + * + * @param defaultMaximumUploadSize + * the default maximum size for uploads */ - @Override public void setDefaultMaximumUploadSize(Bytes defaultMaximumUploadSize) { this.defaultMaximumUploadSize = defaultMaximumUploadSize; } /** - * @see org.apache.wicket.settings.IApplicationSettings#setInternalErrorPage(java.lang.Class) + * Sets internal error page class. The class must be bookmarkable and must extend Page. + * + * @param internalErrorPage + * The internalErrorPage to set. */ - @Override public void setInternalErrorPage(final Class<? extends Page> internalErrorPage) { - if (internalErrorPage == null) - { - throw new IllegalArgumentException("Argument internalErrorPage may not be null"); - } + Args.notNull(internalErrorPage, "internalErrorPage"); checkPageClass(internalErrorPage); this.internalErrorPage = new WeakReference<Class<? extends Page>>(internalErrorPage); } /** - * @see org.apache.wicket.settings.IApplicationSettings#setPageExpiredErrorPage(java.lang.Class) + * Sets the page expired page class. The class must be bookmarkable and must extend Page. + * + * @param pageExpiredErrorPage + * The pageExpiredErrorPage to set. */ - @Override public void setPageExpiredErrorPage(final Class<? extends Page> pageExpiredErrorPage) { if (pageExpiredErrorPage == null) @@ -169,9 +197,11 @@ public class ApplicationSettings implements IApplicationSettings } /** - * @see org.apache.wicket.settings.IApplicationSettings#setUploadProgressUpdatesEnabled(boolean) + * Sets whether wicket should provide updates about the upload progress or not. + * + * @param uploadProgressUpdatesEnabled + * if true upload progress monitoring is enabled */ - @Override public void setUploadProgressUpdatesEnabled(boolean uploadProgressUpdatesEnabled) { this.uploadProgressUpdatesEnabled = uploadProgressUpdatesEnabled; @@ -198,14 +228,25 @@ public class ApplicationSettings implements IApplicationSettings } } - @Override + /** + * Sets the cleanup feedback message filter. see {@link #getFeedbackMessageCleanupFilter()} for + * more details. + * + * @param filter + */ public void setFeedbackMessageCleanupFilter(IFeedbackMessageFilter filter) { Args.notNull(filter, "filter"); feedbackMessageCleanupFilter = filter; } - @Override + /** + * Returns the cleanup feedack message filter. At the end of request all messages are ran + * through this filter, and the ones accepted are removed. The default implementation accepts + * (and therefore remkoves) all rendered messages. + * + * @return feedback message filter + */ public IFeedbackMessageFilter getFeedbackMessageCleanupFilter() { return feedbackMessageCleanupFilter; http://git-wip-us.apache.org/repos/asf/wicket/blob/c673ebbe/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationSettingsMBean.java ---------------------------------------------------------------------- diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationSettingsMBean.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationSettingsMBean.java index 2cbd5aa..8d84f4d 100644 --- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationSettingsMBean.java +++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/ApplicationSettingsMBean.java @@ -17,7 +17,6 @@ package org.apache.wicket.jmx; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.settings.IApplicationSettings; import org.apache.wicket.util.lang.Bytes; /** @@ -31,7 +30,7 @@ public interface ApplicationSettingsMBean * Gets the access denied page class. * * @return Returns the accessDeniedPage. - * @see IApplicationSettings#setAccessDeniedPage(Class) + * @see org.apache.wicket.settings.def.ApplicationSettings#getAccessDeniedPage() */ String getAccessDeniedPage(); @@ -54,7 +53,7 @@ public interface ApplicationSettingsMBean * Gets internal error page class. * * @return Returns the internalErrorPage. - * @see IApplicationSettings#setInternalErrorPage(Class) + * @see org.apache.wicket.settings.def.ApplicationSettings#getInternalErrorPage() */ String getInternalErrorPage(); @@ -62,7 +61,7 @@ public interface ApplicationSettingsMBean * Gets the page expired page class. * * @return Returns the pageExpiredErrorPage. - * @see IApplicationSettings#setPageExpiredErrorPage(Class) + * @see org.apache.wicket.settings.def.ApplicationSettings#getPageExpiredErrorPage() */ String getPageExpiredErrorPage();
