Updated Branches: refs/heads/master da481e4da -> 88191edb1
WICKET-5410 Remove setting interfaces Remove IFrameworkSettings interface Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/88191edb Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/88191edb Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/88191edb Branch: refs/heads/master Commit: 88191edb11f324ccbc44d7f18f006db423e43849 Parents: da481e4 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Nov 12 11:39:49 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Nov 12 11:39:49 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/wicket/Application.java | 7 +- .../java/org/apache/wicket/IDetachListener.java | 4 +- .../org/apache/wicket/IEventDispatcher.java | 4 +- .../wicket/settings/IFrameworkSettings.java | 78 -------------------- .../wicket/settings/def/FrameworkSettings.java | 55 +++++++++----- .../apache/wicket/ApplicationSettingsTest.java | 5 +- 6 files changed, 46 insertions(+), 107 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/88191edb/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 28b228f..8ddaaed 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.IFrameworkSettings; import org.apache.wicket.settings.IJavaScriptLibrarySettings; import org.apache.wicket.settings.IMarkupSettings; import org.apache.wicket.settings.IPageSettings; @@ -1031,7 +1030,7 @@ public abstract class Application implements UnboundListener, IEventSink private ExceptionSettings exceptionSettings; /** Framework Settings */ - private IFrameworkSettings frameworkSettings; + private FrameworkSettings frameworkSettings; /** The Markup Settings */ private IMarkupSettings markupSettings; @@ -1151,7 +1150,7 @@ public abstract class Application implements UnboundListener, IEventSink /** * @return Wicket framework settings */ - public final IFrameworkSettings getFrameworkSettings() + public final FrameworkSettings getFrameworkSettings() { checkSettingsAvailable(); if (frameworkSettings == null) @@ -1165,7 +1164,7 @@ public abstract class Application implements UnboundListener, IEventSink * * @param frameworkSettings */ - public final void setFrameworkSettings(final IFrameworkSettings frameworkSettings) + public final void setFrameworkSettings(final FrameworkSettings frameworkSettings) { this.frameworkSettings = frameworkSettings; } http://git-wip-us.apache.org/repos/asf/wicket/blob/88191edb/wicket-core/src/main/java/org/apache/wicket/IDetachListener.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/IDetachListener.java b/wicket-core/src/main/java/org/apache/wicket/IDetachListener.java index 06a36db..ba36f9f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/IDetachListener.java +++ b/wicket-core/src/main/java/org/apache/wicket/IDetachListener.java @@ -16,8 +16,6 @@ */ package org.apache.wicket; -import org.apache.wicket.settings.IFrameworkSettings; - /** * Listens to {@link Component#detach()} calls. * @@ -26,7 +24,7 @@ import org.apache.wicket.settings.IFrameworkSettings; * * @author igor.vaynberg * - * @see IFrameworkSettings#setDetachListener(IDetachListener) + * @see org.apache.wicket.settings.def.FrameworkSettings#setDetachListener(IDetachListener) */ public interface IDetachListener { http://git-wip-us.apache.org/repos/asf/wicket/blob/88191edb/wicket-core/src/main/java/org/apache/wicket/IEventDispatcher.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/IEventDispatcher.java b/wicket-core/src/main/java/org/apache/wicket/IEventDispatcher.java index 9216735..b66dbe9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/IEventDispatcher.java +++ b/wicket-core/src/main/java/org/apache/wicket/IEventDispatcher.java @@ -19,11 +19,11 @@ package org.apache.wicket; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.event.IEvent; import org.apache.wicket.event.IEventSink; -import org.apache.wicket.settings.IFrameworkSettings; /** * Delivers an event to a component. Developers can implement and register their dispatchers in - * {@link IFrameworkSettings} to create custom strategies for how events get delivered to components + * {@link org.apache.wicket.settings.def.FrameworkSettings} to create custom strategies for + * how events get delivered to components * * @see IEventSink * @see IComponentAwareEventSink http://git-wip-us.apache.org/repos/asf/wicket/blob/88191edb/wicket-core/src/main/java/org/apache/wicket/settings/IFrameworkSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/IFrameworkSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/IFrameworkSettings.java deleted file mode 100644 index f6d8a67..0000000 --- a/wicket-core/src/main/java/org/apache/wicket/settings/IFrameworkSettings.java +++ /dev/null @@ -1,78 +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.IDetachListener; -import org.apache.wicket.IEventDispatcher; -import org.apache.wicket.serialize.ISerializer; - -/** - * Framework settings for retrieving and configuring framework settings. - * - * @author Martijn Dashorst - */ -public interface IFrameworkSettings extends IEventDispatcher -{ - /** - * Gets the Wicket version. The Wicket version is in the same format as the version element in - * the pom.xml file (project descriptor). The version is generated by maven in the build/release - * cycle and put in the wicket.properties file located in the root folder of the Wicket jar. - * - * The version usually follows one of the following formats: - * <ul> - * <li>major.minor[.bug] for stable versions. 1.1, 1.2, 1.2.1 are examples</li> - * <li>major.minor-state for development versions. 1.2-beta2, 1.3-SNAPSHOT are examples</li> - * </ul> - * - * @return the Wicket version - */ - public String getVersion(); - - /** - * @return detach listener or <code>null</code> if none - */ - public IDetachListener getDetachListener(); - - /** - * Sets detach listener - * - * @param listener - * listener or <code>null</code> to remove - */ - public void setDetachListener(IDetachListener listener); - - /** - * Registers a new event dispatcher - * - * @param dispatcher - */ - public void add(IEventDispatcher dispatcher); - - - /** - * Sets the {@link ISerializer} that will be used to convert objects to/from byte arrays - * - * @param serializer - * the {@link ISerializer} to use - */ - void setSerializer(ISerializer serializer); - - /** - * @return the {@link ISerializer} that will be used to convert objects to/from byte arrays - */ - ISerializer getSerializer(); -} http://git-wip-us.apache.org/repos/asf/wicket/blob/88191edb/wicket-core/src/main/java/org/apache/wicket/settings/def/FrameworkSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/def/FrameworkSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/def/FrameworkSettings.java index 13d4af9..33c575e 100644 --- a/wicket-core/src/main/java/org/apache/wicket/settings/def/FrameworkSettings.java +++ b/wicket-core/src/main/java/org/apache/wicket/settings/def/FrameworkSettings.java @@ -28,11 +28,12 @@ import org.apache.wicket.event.IEvent; import org.apache.wicket.event.IEventSink; import org.apache.wicket.serialize.ISerializer; import org.apache.wicket.serialize.java.JavaSerializer; -import org.apache.wicket.settings.IFrameworkSettings; import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.Strings; /** + * Framework settings for retrieving and configuring framework settings. + * * @author Jonathan Locke * @author Chris Turner * @author Eelco Hillenius @@ -42,7 +43,7 @@ import org.apache.wicket.util.string.Strings; * @author Martijn Dashorst * @author James Carman */ -public class FrameworkSettings implements IFrameworkSettings +public class FrameworkSettings implements IEventDispatcher { private IDetachListener detachListener; @@ -51,7 +52,7 @@ public class FrameworkSettings implements IFrameworkSettings /** * The {@link ISerializer} that will be used to convert the pages to/from byte arrays */ - private ISerializer pageSerializer; + private ISerializer serializer; /** * Construct. @@ -60,13 +61,22 @@ public class FrameworkSettings implements IFrameworkSettings */ public FrameworkSettings(final Application application) { - pageSerializer = new JavaSerializer(application.getApplicationKey()); + serializer = new JavaSerializer(application.getApplicationKey()); } /** - * @see org.apache.wicket.settings.IFrameworkSettings#getVersion() + * Gets the Wicket version. The Wicket version is in the same format as the version element in + * the pom.xml file (project descriptor). The version is generated by maven in the build/release + * cycle and put in the wicket.properties file located in the root folder of the Wicket jar. + * + * The version usually follows one of the following formats: + * <ul> + * <li>major.minor[.bug] for stable versions. 1.1, 1.2, 1.2.1 are examples</li> + * <li>major.minor-state for development versions. 1.2-beta2, 1.3-SNAPSHOT are examples</li> + * </ul> + * + * @return the Wicket version */ - @Override public String getVersion() { String implVersion = null; @@ -79,24 +89,29 @@ public class FrameworkSettings implements IFrameworkSettings } /** - * @see org.apache.wicket.settings.IFrameworkSettings#getDetachListener() + * @return detach listener or <code>null</code> if none */ - @Override public IDetachListener getDetachListener() { return detachListener; } /** - * @see org.apache.wicket.settings.IFrameworkSettings#setDetachListener(org.apache.wicket.IDetachListener) + * Sets detach listener + * + * @param detachListener + * listener or <code>null</code> to remove */ - @Override public void setDetachListener(IDetachListener detachListener) { this.detachListener = detachListener; } - @Override + /** + * Registers a new event dispatcher + * + * @param dispatcher + */ public void add(IEventDispatcher dispatcher) { Args.notNull(dispatcher, "dispatcher"); @@ -143,16 +158,22 @@ public class FrameworkSettings implements IFrameworkSettings } } - - @Override - public void setSerializer(ISerializer pageSerializer) + /** + * Sets the {@link ISerializer} that will be used to convert objects to/from byte arrays + * + * @param serializer + * the {@link ISerializer} to use + */ + public void setSerializer(ISerializer serializer) { - this.pageSerializer = Args.notNull(pageSerializer, "pageSerializer"); + this.serializer = Args.notNull(serializer, "serializer"); } - @Override + /** + * @return the {@link ISerializer} that will be used to convert objects to/from byte arrays + */ public ISerializer getSerializer() { - return pageSerializer; + return serializer; } } http://git-wip-us.apache.org/repos/asf/wicket/blob/88191edb/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java b/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java index 9a62f12..20d7828 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ApplicationSettingsTest.java @@ -31,7 +31,6 @@ import org.apache.wicket.resource.loader.IStringResourceLoader; import org.apache.wicket.resource.loader.InitializerStringResourceLoader; import org.apache.wicket.resource.loader.PackageStringResourceLoader; import org.apache.wicket.resource.loader.ValidatorStringResourceLoader; -import org.apache.wicket.settings.IFrameworkSettings; import org.apache.wicket.settings.IResourceSettings; import org.apache.wicket.settings.def.FrameworkSettings; import org.apache.wicket.settings.def.ResourceSettings; @@ -61,7 +60,7 @@ public class ApplicationSettingsTest @Test public void testFrameworkVersion() { - IFrameworkSettings settings = new FrameworkSettings(new MockApplication()); + FrameworkSettings settings = new FrameworkSettings(new MockApplication()); assertEquals("n/a", settings.getVersion()); } @@ -165,4 +164,4 @@ public class ApplicationSettingsTest Localizer localizer = dummy.getResourceSettings().getLocalizer(); Assert.assertNotNull("Localizer should be available", localizer); } -} \ No newline at end of file +}
