WICKET-5459 Use method chaining where it makes sense
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/eba961e5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/eba961e5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/eba961e5 Branch: refs/heads/master Commit: eba961e585fd0fef9002a04588a96b68dc9035b5 Parents: c5438d2 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Feb 7 09:56:54 2014 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Feb 7 09:56:54 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/wicket/Application.java | 57 +++++++++++++------- .../main/java/org/apache/wicket/Component.java | 20 ++++--- .../src/main/java/org/apache/wicket/Page.java | 5 +- .../main/java/org/apache/wicket/Session.java | 12 +++-- .../wicket/protocol/http/WebApplication.java | 6 ++- .../wicket/request/cycle/RequestCycle.java | 3 +- 6 files changed, 68 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/eba961e5/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 7d8e52b..de75abd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Application.java +++ b/wicket-core/src/main/java/org/apache/wicket/Application.java @@ -559,9 +559,10 @@ public abstract class Application implements UnboundListener, IEventSink * @throws IllegalArgumentException * @see MetaDataKey */ - public final synchronized <T> void setMetaData(final MetaDataKey<T> key, final Object object) + public final synchronized <T> Application setMetaData(final MetaDataKey<T> key, final Object object) { metaData = key.set(metaData, object); + return this; } /** @@ -734,9 +735,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param sessionStoreProvider */ - public final void setSessionStoreProvider(final IProvider<ISessionStore> sessionStoreProvider) + public final Application setSessionStoreProvider(final IProvider<ISessionStore> sessionStoreProvider) { this.sessionStoreProvider = sessionStoreProvider; + return this; } /** @@ -790,9 +792,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param rootRequestMapper */ - public final void setRootRequestMapper(final IRequestMapper rootRequestMapper) + public final Application setRootRequestMapper(final IRequestMapper rootRequestMapper) { this.rootRequestMapper = rootRequestMapper; + return this; } /** @@ -1078,9 +1081,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param applicationSettings */ - public final void setApplicationSettings(final ApplicationSettings applicationSettings) + public final Application setApplicationSettings(final ApplicationSettings applicationSettings) { this.applicationSettings = applicationSettings; + return this; } /** @@ -1101,10 +1105,11 @@ public abstract class Application implements UnboundListener, IEventSink * * @param javaScriptLibrarySettings */ - public final void setJavaScriptLibrarySettings( + public final Application setJavaScriptLibrarySettings( final JavaScriptLibrarySettings javaScriptLibrarySettings) { this.javaScriptLibrarySettings = javaScriptLibrarySettings; + return this; } /** @@ -1124,9 +1129,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param debugSettings */ - public final void setDebugSettings(final DebugSettings debugSettings) + public final Application setDebugSettings(final DebugSettings debugSettings) { this.debugSettings = debugSettings; + return this; } /** @@ -1146,9 +1152,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param exceptionSettings */ - public final void setExceptionSettings(final ExceptionSettings exceptionSettings) + public final Application setExceptionSettings(final ExceptionSettings exceptionSettings) { this.exceptionSettings = exceptionSettings; + return this; } /** @@ -1168,9 +1175,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param frameworkSettings */ - public final void setFrameworkSettings(final FrameworkSettings frameworkSettings) + public final Application setFrameworkSettings(final FrameworkSettings frameworkSettings) { this.frameworkSettings = frameworkSettings; + return this; } /** @@ -1190,9 +1198,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param pageSettings */ - public final void setPageSettings(final PageSettings pageSettings) + public final Application setPageSettings(final PageSettings pageSettings) { this.pageSettings = pageSettings; + return this; } /** @@ -1212,9 +1221,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param requestCycleSettings */ - public final void setRequestCycleSettings(final RequestCycleSettings requestCycleSettings) + public final Application setRequestCycleSettings(final RequestCycleSettings requestCycleSettings) { this.requestCycleSettings = requestCycleSettings; + return this; } /** @@ -1234,9 +1244,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param markupSettings */ - public final void setMarkupSettings(final MarkupSettings markupSettings) + public final Application setMarkupSettings(final MarkupSettings markupSettings) { this.markupSettings = markupSettings; + return this; } /** @@ -1256,9 +1267,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param requestLoggerSettings */ - public final void setRequestLoggerSettings(final RequestLoggerSettings requestLoggerSettings) + public final Application setRequestLoggerSettings(final RequestLoggerSettings requestLoggerSettings) { this.requestLoggerSettings = requestLoggerSettings; + return this; } /** @@ -1278,9 +1290,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param resourceSettings */ - public final void setResourceSettings(final ResourceSettings resourceSettings) + public final Application setResourceSettings(final ResourceSettings resourceSettings) { this.resourceSettings = resourceSettings; + return this; } /** @@ -1300,9 +1313,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param securitySettings */ - public final void setSecuritySettings(final SecuritySettings securitySettings) + public final Application setSecuritySettings(final SecuritySettings securitySettings) { this.securitySettings = securitySettings; + return this; } /** @@ -1322,9 +1336,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param storeSettings */ - public final void setStoreSettings(final StoreSettings storeSettings) + public final Application setStoreSettings(final StoreSettings storeSettings) { this.storeSettings = storeSettings; + return this; } /** @@ -1363,9 +1378,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param provider */ - public synchronized final void setPageManagerProvider(final IPageManagerProvider provider) + public synchronized final Application setPageManagerProvider(final IPageManagerProvider provider) { pageManagerProvider = provider; + return this; } /** @@ -1423,10 +1439,11 @@ public abstract class Application implements UnboundListener, IEventSink * * @param pageRendererProvider */ - public final void setPageRendererProvider(final IPageRendererProvider pageRendererProvider) + public final Application setPageRendererProvider(final IPageRendererProvider pageRendererProvider) { Args.notNull(pageRendererProvider, "pageRendererProvider"); this.pageRendererProvider = pageRendererProvider; + return this; } @@ -1581,9 +1598,10 @@ public abstract class Application implements UnboundListener, IEventSink * * @param requestCycleProvider */ - public final void setRequestCycleProvider(final IRequestCycleProvider requestCycleProvider) + public final Application setRequestCycleProvider(final IRequestCycleProvider requestCycleProvider) { this.requestCycleProvider = requestCycleProvider; + return this; } private static class DefaultExceptionMapperProvider implements IProvider<IExceptionMapper> @@ -1654,10 +1672,11 @@ public abstract class Application implements UnboundListener, IEventSink * @param headerResponseDecorator * your custom decorator */ - public final void setHeaderResponseDecorator( + public final Application setHeaderResponseDecorator( final IHeaderResponseDecorator headerResponseDecorator) { this.headerResponseDecorator = headerResponseDecorator; + return this; } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/eba961e5/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 e05ee06..cc31e88 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -767,9 +767,10 @@ public abstract class Component * * @param markup */ - public final void setMarkup(final IMarkupFragment markup) + public final Component setMarkup(final IMarkupFragment markup) { this.markup = markup; + return this; } /** @@ -2954,7 +2955,7 @@ public abstract class Component * @throws IllegalArgumentException * @see MetaDataKey */ - public final <M extends Serializable> void setMetaData(final MetaDataKey<M> key, final M object) + public final <M extends Serializable> Component setMetaData(final MetaDataKey<M> key, final M object) { MetaDataEntry<?>[] old = getMetaData(); @@ -2979,6 +2980,7 @@ public abstract class Component { data_remove(index); } + return this; } /** @@ -4103,9 +4105,10 @@ public abstract class Component * @param auto * True to put component into auto-add mode */ - protected final void setAuto(final boolean auto) + protected final Component setAuto(final boolean auto) { setFlag(FLAG_AUTO, auto); + return this; } /** @@ -4116,7 +4119,7 @@ public abstract class Component * @param set * True to turn the flag on, false to turn it off */ - protected final void setFlag(final int flag, final boolean set) + protected final Component setFlag(final int flag, final boolean set) { if (set) { @@ -4126,6 +4129,7 @@ public abstract class Component { flags &= ~flag; } + return this; } /** @@ -4136,7 +4140,7 @@ public abstract class Component * @param set * True to turn the flag on, false to turn it off */ - protected final void setRequestFlag(final short flag, final boolean set) + protected final Component setRequestFlag(final short flag, final boolean set) { if (set) { @@ -4146,6 +4150,7 @@ public abstract class Component { requestFlags &= ~flag; } + return this; } /** @@ -4300,14 +4305,12 @@ public abstract class Component } /** - * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT USE IT! - * * Sets the id of this component. * * @param id * The non-null id of this component */ - final void setId(final String id) + final Component setId(final String id) { if (!(this instanceof Page)) { @@ -4323,6 +4326,7 @@ public abstract class Component } this.id = id; + return this; } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/eba961e5/wicket-core/src/main/java/org/apache/wicket/Page.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java index 6d1dd44..70fd7b6 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Page.java +++ b/wicket-core/src/main/java/org/apache/wicket/Page.java @@ -528,7 +528,7 @@ public abstract class Page extends MarkupContainer implements IRedirectListener, * @param value * whether the page should try to be stateless */ - public final void setStatelessHint(boolean value) + public final Page setStatelessHint(boolean value) { if (value && !isBookmarkable()) { @@ -537,6 +537,7 @@ public abstract class Page extends MarkupContainer implements IRedirectListener, this); } setFlag(FLAG_STATELESS_HINT, value); + return this; } /** @@ -987,6 +988,8 @@ public abstract class Page extends MarkupContainer implements IRedirectListener, } /** + * THIS METHOD IS NOT PART OF WICKET API. DO NOT USE! + * * Sets the flag that determines whether or not this page was created using one of its * bookmarkable constructors * http://git-wip-us.apache.org/repos/asf/wicket/blob/eba961e5/wicket-core/src/main/java/org/apache/wicket/Session.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Session.java b/wicket-core/src/main/java/org/apache/wicket/Session.java index 2936d20..057498a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Session.java +++ b/wicket-core/src/main/java/org/apache/wicket/Session.java @@ -550,10 +550,11 @@ public abstract class Session implements IClusterable, IEventSink * @param clientInfo * the client info object */ - public final void setClientInfo(ClientInfo clientInfo) + public final Session setClientInfo(ClientInfo clientInfo) { this.clientInfo = clientInfo; dirty(); + return this; } /** @@ -562,7 +563,7 @@ public abstract class Session implements IClusterable, IEventSink * @param locale * New locale */ - public void setLocale(final Locale locale) + public Session setLocale(final Locale locale) { if (locale == null) { @@ -573,6 +574,7 @@ public abstract class Session implements IClusterable, IEventSink dirty(); } this.locale = locale; + return this; } /** @@ -587,10 +589,11 @@ public abstract class Session implements IClusterable, IEventSink * @throws IllegalArgumentException * @see MetaDataKey */ - public final synchronized <M extends Serializable> void setMetaData(final MetaDataKey<M> key, final M object) + public final synchronized <M extends Serializable> Session setMetaData(final MetaDataKey<M> key, final M object) { metaData = key.set(metaData, object); dirty(); + return this; } /** @@ -785,7 +788,7 @@ public abstract class Session implements IClusterable, IEventSink * @param value * The value of the attribute */ - public final void setAttribute(String name, Serializable value) + public final Session setAttribute(String name, Serializable value) { if (!isTemporary()) { @@ -828,6 +831,7 @@ public abstract class Session implements IClusterable, IEventSink } temporarySessionAttributes.put(name, value); } + return this; } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/eba961e5/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java index 77d508e..6c30bd1 100644 --- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java +++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/WebApplication.java @@ -669,7 +669,7 @@ public abstract class WebApplication extends Application * * @param configurationType */ - public void setConfigurationType(RuntimeConfigurationType configurationType) + public Application setConfigurationType(RuntimeConfigurationType configurationType) { if (this.configurationType != null) { @@ -678,6 +678,7 @@ public abstract class WebApplication extends Application "Current value='" + configurationType + "'"); } this.configurationType = Args.notNull(configurationType, "configurationType"); + return this; } /** @@ -940,10 +941,11 @@ public abstract class WebApplication extends Application * @param ajaxRequestTargetProvider * the new provider */ - public void setAjaxRequestTargetProvider( + public Application setAjaxRequestTargetProvider( IContextProvider<AjaxRequestTarget, Page> ajaxRequestTargetProvider) { this.ajaxRequestTargetProvider = ajaxRequestTargetProvider; + return this; } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/eba961e5/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java index 87bdafe..97e0ebf 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/cycle/RequestCycle.java @@ -394,9 +394,10 @@ public class RequestCycle implements IRequestCycle, IEventSink * @throws IllegalArgumentException * @see MetaDataKey */ - public final <T> void setMetaData(final MetaDataKey<T> key, final T object) + public final <T> RequestCycle setMetaData(final MetaDataKey<T> key, final T object) { metaData = key.set(metaData, object); + return this; } /**
