You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/03/24 22:20:13 UTC
svn commit: r1581069 [1/4] - in
/commons/proper/configuration/branches/immutableNodes: ./
src/main/java/org/apache/commons/configuration/
src/main/java/org/apache/commons/configuration/beanutils/
src/main/java/org/apache/commons/configuration/builder/ ...
Author: oheger
Date: Mon Mar 24 21:20:10 2014
New Revision: 1581069
URL: http://svn.apache.org/r1581069
Log:
Merged changes from trunk into branch.
Removed:
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/QueryResult.java
Modified:
commons/proper/configuration/branches/immutableNodes/ (props changed)
commons/proper/configuration/branches/immutableNodes/pom.xml
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ (props changed)
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationLookup.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationMap.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationXMLReader.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/INIConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ImmutableConfigurationInvocationHandler.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/JNDIConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PrefixedKeysIterator.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/StrictConfigurationComparator.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/SubsetConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLPropertiesConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/CombinedBeanDeclaration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/AutoSaveListener.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BasicBuilderParameters.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BuilderConfigurationWrapperFactory.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/CopyObjectDefaultHandler.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/DatabaseBuilderParametersImpl.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/DefaultReloadingDetectorFactory.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/FileBasedBuilderParametersImpl.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/HierarchicalBuilderParametersImpl.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/JndiBuilderParametersImpl.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/PropertiesBuilderParametersImpl.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/ReloadingFileBasedConfigurationBuilder.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/XMLBuilderParametersImpl.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/BaseConfigurationBuilderProvider.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedBuilderParametersImpl.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/MultiFileBuilderParametersImpl.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/MultiFileConfigurationBuilder.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/MultiFileConfigurationBuilderProvider.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/MultiWrapDynaBean.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/MultiWrapDynaClass.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingCombinedConfigurationBuilder.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/combined/ReloadingMultiFileConfigurationBuilder.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/fluent/Parameters.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/convert/DefaultConversionHandler.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/convert/DefaultListDelimiterHandler.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/convert/DisabledListDelimiterHandler.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/convert/LegacyListDelimiterHandler.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/convert/ListDelimiterHandler.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/event/BaseEventSource.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/event/ConfigurationErrorEvent.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/event/ConfigurationEvent.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/interpol/ConstantLookup.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/interpol/DummyLookup.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/interpol/EnvironmentLookup.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/interpol/ExprLookup.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/interpol/SystemPropertiesLookup.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/io/AbsoluteNameLocationStrategy.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/io/BasePathLocationStrategy.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/io/ClasspathLocationStrategy.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/io/CombinedLocationStrategy.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/io/FileHandler.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/io/FileHandlerListenerAdapter.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/io/FileSystemLocationStrategy.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/io/HomeDirectoryLocationStrategy.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/io/ProvidedURLLocationStrategy.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/plist/PropertyListConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/reloading/CombinedReloadingController.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/reloading/FileHandlerReloadingDetector.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/reloading/ManagedReloadingDetector.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/reloading/PeriodicReloadingTrigger.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/reloading/VFSFileHandlerReloadingDetector.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/resolver/CatalogResolver.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/resolver/DefaultEntityResolver.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/sync/NoOpSynchronizer.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/sync/ReadWriteSynchronizer.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/ConfigurationNodeVisitorAdapter.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationKey.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/DefaultConfigurationNode.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/DefaultExpressionEngine.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/ExpressionEngine.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeAddData.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/NodeHandler.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/tree/xpath/ConfigurationNodePointerFactory.java
commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/web/ServletRequestConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/ (props changed)
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/ConfigurationErrorListenerImpl.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/InterpolationTestHelper.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/Logging.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/MockInitialContextFactory.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/SynchronizerTestImpl.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestAbstractConfigurationBasicFeatures.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestBaseConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCombinedConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCompositeConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationConverter.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationMap.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestConfigurationSet.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestEqualsProperty.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestMapConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestNonStringProperties.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestNullCompositeConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestPropertiesConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestPropertiesConfigurationLayout.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/TestXMLConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/BeanCreationTestBeanWithListChild.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/BeanDeclarationTestImpl.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestBeanHelper.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestConfigurationDynaBean.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestDefaultBeanFactory.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/beanutils/TestXMLBeanDeclaration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/TestBasicConfigurationBuilder.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/TestDefaultParametersManager.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/builder/fluent/TestParameters.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/convert/TestDefaultListDelimiterHandler.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/ConfigurationListenerTestImpl.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/TestEventSource.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/interpol/TestConfigurationInterpolator.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/io/TestFileHandler.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/plist/TestPropertyListConfiguration.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/plist/TestPropertyListParser.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/reloading/AlwaysReloadingDetector.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/reloading/RandomReloadingDetector.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/reloading/TestPeriodicReloadingTrigger.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/reloading/TestReloadingController.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestDefaultConfigurationNode.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestDefaultExpressionEngine.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/tree/TestNodeAddData.java
commons/proper/configuration/branches/immutableNodes/src/test/java/org/apache/commons/configuration/web/TestServletFilterConfiguration.java
Propchange: commons/proper/configuration/branches/immutableNodes/
------------------------------------------------------------------------------
Merged /commons/proper/configuration/trunk:r1565807-1581056
Modified: commons/proper/configuration/branches/immutableNodes/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/pom.xml?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/pom.xml (original)
+++ commons/proper/configuration/branches/immutableNodes/pom.xml Mon Mar 24 21:20:10 2014
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>32</version>
+ <version>33</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>commons-configuration</groupId>
@@ -223,13 +223,13 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.1</version>
+ <version>3.2.1</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
+ <version>1.1.3</version>
<exclusions>
<exclusion>
<groupId>logkit</groupId>
@@ -259,7 +259,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.6</version>
+ <version>1.9</version>
<optional>true</optional>
</dependency>
@@ -327,14 +327,14 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
+ <version>1.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.4</version>
+ <version>1.6</version>
<scope>test</scope>
</dependency>
@@ -407,28 +407,28 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.8</version>
+ <version>1.2.17</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.5.6</version>
+ <version>1.7.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
- <version>1.5.6</version>
+ <version>1.7.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
+ <version>1.7.6</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -439,8 +439,8 @@
<commons.rc.version>RC1</commons.rc.version>
<commons.jira.id>CONFIGURATION</commons.jira.id>
<commons.jira.pid>12310467</commons.jira.pid>
- <maven.compiler.source>1.5</maven.compiler.source>
- <maven.compiler.target>1.5</maven.compiler.target>
+ <maven.compiler.source>1.6</maven.compiler.source>
+ <maven.compiler.target>1.6</maven.compiler.target>
<!-- Explicitly declare optional dependencies for the OSGi manifest. -->
<commons.osgi.import>
Propchange: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/
------------------------------------------------------------------------------
Merged /commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration:r1563461-1581056
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java Mon Mar 24 21:20:10 2014
@@ -279,6 +279,7 @@ public abstract class AbstractConfigurat
* configuration
* @since 1.4
*/
+ @Override
public ConfigurationInterpolator getInterpolator()
{
return interpolator.get();
@@ -291,6 +292,7 @@ public abstract class AbstractConfigurat
*
* @since 2.0
*/
+ @Override
public final void setInterpolator(ConfigurationInterpolator ci)
{
interpolator.set(ci);
@@ -304,6 +306,7 @@ public abstract class AbstractConfigurat
*
* @since 2.0
*/
+ @Override
public final void installInterpolator(
Map<String, ? extends Lookup> prefixLookups,
Collection<? extends Lookup> defLookups)
@@ -535,6 +538,7 @@ public abstract class AbstractConfigurat
{
addErrorListener(new ConfigurationErrorListener()
{
+ @Override
public void configurationError(ConfigurationErrorEvent event)
{
getLogger().warn("Internal error", event.getCause());
@@ -553,6 +557,7 @@ public abstract class AbstractConfigurat
* @return the {@code Synchronizer} used by this instance
* @since 2.0
*/
+ @Override
public final Synchronizer getSynchronizer()
{
Synchronizer sync = synchronizer;
@@ -568,6 +573,7 @@ public abstract class AbstractConfigurat
* then this instance uses a {@link NoOpSynchronizer}
* @since 2.0
*/
+ @Override
public final void setSynchronizer(Synchronizer synchronizer)
{
this.synchronizer = synchronizer;
@@ -582,6 +588,7 @@ public abstract class AbstractConfigurat
* @since 2.0
* @throws NullPointerException if the argument is <b>null</b>
*/
+ @Override
public final void lock(LockMode mode)
{
switch (mode)
@@ -605,6 +612,7 @@ public abstract class AbstractConfigurat
*
* @throws NullPointerException if the argument is <b>null</b>
*/
+ @Override
public final void unlock(LockMode mode)
{
switch (mode)
@@ -692,6 +700,7 @@ public abstract class AbstractConfigurat
getSynchronizer().endWrite();
}
+ @Override
public final void addProperty(String key, Object value)
{
beginWrite(false);
@@ -762,16 +771,19 @@ public abstract class AbstractConfigurat
return (ci != null) ? ci.interpolate(value) : value;
}
+ @Override
public Configuration subset(String prefix)
{
return new SubsetConfiguration(this, prefix, ".");
}
+ @Override
public ImmutableConfiguration immutableSubset(String prefix)
{
return ConfigurationUtils.unmodifiableConfiguration(subset(prefix));
}
+ @Override
public final void setProperty(String key, Object value)
{
beginWrite(false);
@@ -819,6 +831,7 @@ public abstract class AbstractConfigurat
*
* @param key the key to be removed
*/
+ @Override
public final void clearProperty(String key)
{
beginWrite(false);
@@ -843,6 +856,7 @@ public abstract class AbstractConfigurat
*/
protected abstract void clearPropertyDirect(String key);
+ @Override
public final void clear()
{
beginWrite(false);
@@ -913,6 +927,7 @@ public abstract class AbstractConfigurat
* Note that depending on a concrete implementation, an iteration may fail
* if the configuration is updated concurrently.
*/
+ @Override
public final Iterator<String> getKeys()
{
beginRead(false);
@@ -933,6 +948,7 @@ public abstract class AbstractConfigurat
* {@code db.user}, or {@code db.password}, but not the key
* {@code dbdriver}.
*/
+ @Override
public final Iterator<String> getKeys(String prefix)
{
beginRead(false);
@@ -978,6 +994,7 @@ public abstract class AbstractConfigurat
* Subclasses have to define the abstract {@code getPropertyInternal()}
* method which is called from here.
*/
+ @Override
public final Object getProperty(String key)
{
beginRead(false);
@@ -1006,6 +1023,7 @@ public abstract class AbstractConfigurat
* {@inheritDoc} This implementation handles synchronization and delegates
* to {@code isEmptyInternal()}.
*/
+ @Override
public final boolean isEmpty()
{
beginRead(false);
@@ -1033,6 +1051,7 @@ public abstract class AbstractConfigurat
* {@inheritDoc} This implementation handles synchronization and delegates
* to {@code containsKeyInternal()}.
*/
+ @Override
public final boolean containsKey(String key)
{
beginRead(false);
@@ -1058,6 +1077,7 @@ public abstract class AbstractConfigurat
*/
protected abstract boolean containsKeyInternal(String key);
+ @Override
public Properties getProperties(String key)
{
return getProperties(key, null);
@@ -1112,12 +1132,14 @@ public abstract class AbstractConfigurat
return props;
}
+ @Override
public boolean getBoolean(String key)
{
Boolean b = convert(Boolean.class, key, null, true);
return checkNonNullValue(key, b).booleanValue();
}
+ @Override
public boolean getBoolean(String key, boolean defaultValue)
{
return getBoolean(key, Boolean.valueOf(defaultValue)).booleanValue();
@@ -1134,102 +1156,121 @@ public abstract class AbstractConfigurat
* @throws ConversionException if the value cannot be converted to a
* {@code Boolean}
*/
+ @Override
public Boolean getBoolean(String key, Boolean defaultValue)
{
return convert(Boolean.class, key, defaultValue, false);
}
+ @Override
public byte getByte(String key)
{
Byte b = convert(Byte.class, key, null, true);
return checkNonNullValue(key, b).byteValue();
}
+ @Override
public byte getByte(String key, byte defaultValue)
{
return getByte(key, Byte.valueOf(defaultValue)).byteValue();
}
+ @Override
public Byte getByte(String key, Byte defaultValue)
{
return convert(Byte.class, key, defaultValue, false);
}
+ @Override
public double getDouble(String key)
{
Double d = convert(Double.class, key, null, true);
return checkNonNullValue(key, d).doubleValue();
}
+ @Override
public double getDouble(String key, double defaultValue)
{
return getDouble(key, Double.valueOf(defaultValue)).doubleValue();
}
+ @Override
public Double getDouble(String key, Double defaultValue)
{
return convert(Double.class, key, defaultValue, false);
}
+ @Override
public float getFloat(String key)
{
Float f = convert(Float.class, key, null, true);
return checkNonNullValue(key, f).floatValue();
}
+ @Override
public float getFloat(String key, float defaultValue)
{
return getFloat(key, Float.valueOf(defaultValue)).floatValue();
}
+ @Override
public Float getFloat(String key, Float defaultValue)
{
return convert(Float.class, key, defaultValue, false);
}
+ @Override
public int getInt(String key)
{
Integer i = convert(Integer.class, key, null, true);
return checkNonNullValue(key, i).intValue();
}
+ @Override
public int getInt(String key, int defaultValue)
{
return getInteger(key, Integer.valueOf(defaultValue)).intValue();
}
+ @Override
public Integer getInteger(String key, Integer defaultValue)
{
return convert(Integer.class, key, defaultValue, false);
}
+ @Override
public long getLong(String key)
{
Long l = convert(Long.class, key, null, true);
return checkNonNullValue(key, l).longValue();
}
+ @Override
public long getLong(String key, long defaultValue)
{
return getLong(key, Long.valueOf(defaultValue)).longValue();
}
+ @Override
public Long getLong(String key, Long defaultValue)
{
return convert(Long.class, key, defaultValue, false);
}
+ @Override
public short getShort(String key)
{
Short s = convert(Short.class, key, null, true);
return checkNonNullValue(key, s).shortValue();
}
+ @Override
public short getShort(String key, short defaultValue)
{
return getShort(key, Short.valueOf(defaultValue)).shortValue();
}
+ @Override
public Short getShort(String key, Short defaultValue)
{
return convert(Short.class, key, defaultValue, false);
@@ -1239,11 +1280,13 @@ public abstract class AbstractConfigurat
* {@inheritDoc}
* @see #setThrowExceptionOnMissing(boolean)
*/
+ @Override
public BigDecimal getBigDecimal(String key)
{
return convert(BigDecimal.class, key, null, true);
}
+ @Override
public BigDecimal getBigDecimal(String key, BigDecimal defaultValue)
{
return convert(BigDecimal.class, key, defaultValue, false);
@@ -1253,11 +1296,13 @@ public abstract class AbstractConfigurat
* {@inheritDoc}
* @see #setThrowExceptionOnMissing(boolean)
*/
+ @Override
public BigInteger getBigInteger(String key)
{
return convert(BigInteger.class, key, null, true);
}
+ @Override
public BigInteger getBigInteger(String key, BigInteger defaultValue)
{
return convert(BigInteger.class, key, defaultValue, false);
@@ -1267,11 +1312,13 @@ public abstract class AbstractConfigurat
* {@inheritDoc}
* @see #setThrowExceptionOnMissing(boolean)
*/
+ @Override
public String getString(String key)
{
return convert(String.class, key, null, true);
}
+ @Override
public String getString(String key, String defaultValue)
{
String result = convert(String.class, key, null, false);
@@ -1294,6 +1341,7 @@ public abstract class AbstractConfigurat
* object that is not a String/List of Strings.
* @see #setListDelimiterHandler(ListDelimiterHandler)
*/
+ @Override
public String[] getStringArray(String key)
{
String[] result = (String[]) getArray(String.class, key);
@@ -1304,11 +1352,13 @@ public abstract class AbstractConfigurat
* {@inheritDoc}
* @see #getStringArray(String)
*/
+ @Override
public List<Object> getList(String key)
{
return getList(key, new ArrayList<Object>());
}
+ @Override
public List<Object> getList(String key, List<Object> defaultValue)
{
Object value = getProperty(key);
@@ -1350,6 +1400,7 @@ public abstract class AbstractConfigurat
return list;
}
+ @Override
public <T> T get(Class<T> cls, String key)
{
return convert(cls, key, null, true);
@@ -1359,11 +1410,13 @@ public abstract class AbstractConfigurat
* {@inheritDoc} This implementation delegates to the
* {@link ConversionHandler} to perform the actual type conversion.
*/
+ @Override
public <T> T get(Class<T> cls, String key, T defaultValue)
{
return convert(cls, key, defaultValue, false);
}
+ @Override
public Object getArray(Class<?> cls, String key)
{
return getArray(cls, key, null);
@@ -1379,6 +1432,7 @@ public abstract class AbstractConfigurat
* @throws IllegalArgumentException if the default value is not a compatible
* array
*/
+ @Override
public Object getArray(Class<?> cls, String key, Object defaultValue)
{
checkDefaultValueArray(cls, defaultValue);
@@ -1387,6 +1441,7 @@ public abstract class AbstractConfigurat
getInterpolator()), defaultValue);
}
+ @Override
public <T> List<T> getList(Class<T> cls, String key)
{
return getList(cls, key, null);
@@ -1397,6 +1452,7 @@ public abstract class AbstractConfigurat
* {@code getCollection()}. As target collection a newly created
* {@code ArrayList} is passed in.
*/
+ @Override
public <T> List<T> getList(Class<T> cls, String key, List<T> defaultValue)
{
List<T> result = new ArrayList<T>();
@@ -1407,6 +1463,7 @@ public abstract class AbstractConfigurat
return result;
}
+ @Override
public <T> Collection<T> getCollection(Class<T> cls, String key,
Collection<T> target)
{
@@ -1418,6 +1475,7 @@ public abstract class AbstractConfigurat
* {@link ConversionHandler} to perform the actual conversion. If no target
* collection is provided, an {@code ArrayList} is created.
*/
+ @Override
public <T> Collection<T> getCollection(Class<T> cls, String key,
Collection<T> target, Collection<T> defaultValue)
{
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/CombinedConfiguration.java Mon Mar 24 21:20:10 2014
@@ -634,6 +634,7 @@ public class CombinedConfiguration exten
*
* @param event the update event
*/
+ @Override
public void configurationChanged(ConfigurationEvent event)
{
if (event.isBeforeUpdate())
@@ -954,16 +955,16 @@ public class CombinedConfiguration exten
private class ConfigData
{
/** Stores a reference to the configuration. */
- private Configuration configuration;
+ private final Configuration configuration;
/** Stores the name under which the configuration is stored. */
- private String name;
+ private final String name;
/** Stores the at information as path of nodes. */
- private Collection<String> atPath;
+ private final Collection<String> atPath;
/** Stores the at string.*/
- private String at;
+ private final String at;
/** Stores the root node for this child configuration.*/
private ConfigurationNode rootNode;
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationLookup.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationLookup.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationLookup.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationLookup.java Mon Mar 24 21:20:10 2014
@@ -71,6 +71,7 @@ public class ConfigurationLookup impleme
* associated configuration. The return value is directly returned. Note
* that this may be a complex object, e.g. a collection or an array.
*/
+ @Override
public Object lookup(String variable)
{
return getConfiguration().getProperty(variable);
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationMap.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationMap.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationMap.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationMap.java Mon Mar 24 21:20:10 2014
@@ -123,23 +123,26 @@ public class ConfigurationMap extends Ab
private final class Entry implements Map.Entry<Object, Object>
{
/** The key of the map entry. */
- private Object key;
+ private final Object key;
private Entry(Object key)
{
this.key = key;
}
+ @Override
public Object getKey()
{
return key;
}
+ @Override
public Object getValue()
{
return configuration.getProperty((String) key);
}
+ @Override
public Object setValue(Object value)
{
Object old = getValue();
@@ -161,16 +164,19 @@ public class ConfigurationMap extends Ab
keys = configuration.getKeys();
}
+ @Override
public boolean hasNext()
{
return keys.hasNext();
}
+ @Override
public Map.Entry<Object, Object> next()
{
return new Entry(keys.next());
}
+ @Override
public void remove()
{
keys.remove();
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationUtils.java Mon Mar 24 21:20:10 2014
@@ -78,19 +78,23 @@ public final class ConfigurationUtils
*/
private static final EventSource DUMMY_EVENT_SOURCE = new EventSource()
{
+ @Override
public void addConfigurationListener(ConfigurationListener l)
{
}
+ @Override
public boolean removeConfigurationListener(ConfigurationListener l)
{
return false;
}
+ @Override
public void addErrorListener(ConfigurationErrorListener l)
{
}
+ @Override
public boolean removeErrorListener(ConfigurationErrorListener l)
{
return false;
@@ -449,6 +453,7 @@ public final class ConfigurationUtils
}
((EventSource) src).addErrorListener(new ConfigurationErrorListener()
{
+ @Override
public void configurationError(ConfigurationErrorEvent event)
{
// Throw a runtime exception
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationXMLReader.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationXMLReader.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ConfigurationXMLReader.java Mon Mar 24 21:20:10 2014
@@ -79,6 +79,7 @@ public abstract class ConfigurationXMLRe
* @throws IOException if no configuration was specified
* @throws SAXException if an error occurs during parsing
*/
+ @Override
public void parse(String systemId) throws IOException, SAXException
{
parseConfiguration();
@@ -92,6 +93,7 @@ public abstract class ConfigurationXMLRe
* @throws IOException if no configuration was specified
* @throws SAXException if an error occurs during parsing
*/
+ @Override
public void parse(InputSource input) throws IOException, SAXException
{
parseConfiguration();
@@ -103,6 +105,7 @@ public abstract class ConfigurationXMLRe
* @param name the name of the feature
* @return always <b>false</b> (no features are supported)
*/
+ @Override
public boolean getFeature(String name)
{
return false;
@@ -114,6 +117,7 @@ public abstract class ConfigurationXMLRe
* @param name the name of the feature to be set
* @param value the value of the feature
*/
+ @Override
public void setFeature(String name, boolean value)
{
}
@@ -123,6 +127,7 @@ public abstract class ConfigurationXMLRe
*
* @return the content handler
*/
+ @Override
public ContentHandler getContentHandler()
{
return contentHandler;
@@ -134,6 +139,7 @@ public abstract class ConfigurationXMLRe
*
* @param handler the content handler
*/
+ @Override
public void setContentHandler(ContentHandler handler)
{
contentHandler = handler;
@@ -145,6 +151,7 @@ public abstract class ConfigurationXMLRe
*
* @return the DTD handler
*/
+ @Override
public DTDHandler getDTDHandler()
{
return null;
@@ -155,6 +162,7 @@ public abstract class ConfigurationXMLRe
*
* @param handler the handler to be set
*/
+ @Override
public void setDTDHandler(DTDHandler handler)
{
}
@@ -165,6 +173,7 @@ public abstract class ConfigurationXMLRe
*
* @return the entity resolver
*/
+ @Override
public EntityResolver getEntityResolver()
{
return null;
@@ -175,6 +184,7 @@ public abstract class ConfigurationXMLRe
*
* @param resolver the entity resolver
*/
+ @Override
public void setEntityResolver(EntityResolver resolver)
{
}
@@ -185,6 +195,7 @@ public abstract class ConfigurationXMLRe
*
* @return the error handler
*/
+ @Override
public ErrorHandler getErrorHandler()
{
return null;
@@ -195,6 +206,7 @@ public abstract class ConfigurationXMLRe
*
* @param handler the error handler
*/
+ @Override
public void setErrorHandler(ErrorHandler handler)
{
}
@@ -206,6 +218,7 @@ public abstract class ConfigurationXMLRe
* @param name the name of the requested property
* @return the property value
*/
+ @Override
public Object getProperty(String name)
{
return null;
@@ -218,6 +231,7 @@ public abstract class ConfigurationXMLRe
* @param name the property name
* @param value the property value
*/
+ @Override
public void setProperty(String name, Object value)
{
}
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java Mon Mar 24 21:20:10 2014
@@ -65,6 +65,8 @@ import org.apache.commons.logging.LogFac
*/
public class DynamicCombinedConfiguration extends CombinedConfiguration
{
+ private static final long serialVersionUID = 680097981171908142L;
+
/**
* Stores the current configuration for each involved thread. This value is
* set at the beginning of an operation and removed at the end.
@@ -77,10 +79,10 @@ public class DynamicCombinedConfiguratio
new ConcurrentHashMap<String, CombinedConfiguration>();
/** Stores a list with the contained configurations. */
- private List<ConfigData> configurations = new ArrayList<ConfigData>();
+ private final List<ConfigData> configurations = new ArrayList<ConfigData>();
/** Stores a map with the named configurations. */
- private Map<String, Configuration> namedConfigurations =
+ private final Map<String, Configuration> namedConfigurations =
new HashMap<String, Configuration>();
/** The key pattern for the CombinedConfiguration map */
@@ -1049,13 +1051,13 @@ public class DynamicCombinedConfiguratio
static class ConfigData
{
/** Stores a reference to the configuration. */
- private Configuration configuration;
+ private final Configuration configuration;
/** Stores the name under which the configuration is stored. */
- private String name;
+ private final String name;
/** Stores the at string.*/
- private String at;
+ private final String at;
/**
* Creates a new instance of {@code ConfigData} and initializes
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/INIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/INIConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/INIConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/INIConfiguration.java Mon Mar 24 21:20:10 2014
@@ -276,6 +276,7 @@ public class INIConfiguration extends Ba
* configuration
* @throws IOException if an I/O error occurs
*/
+ @Override
public void write(Writer writer) throws ConfigurationException, IOException
{
PrintWriter out = new PrintWriter(writer);
@@ -332,6 +333,7 @@ public class INIConfiguration extends Ba
* configuration
* @throws IOException if an I/O error occurs
*/
+ @Override
public void read(Reader in) throws ConfigurationException, IOException
{
BufferedReader bufferedReader = new BufferedReader(in);
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ImmutableConfigurationInvocationHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ImmutableConfigurationInvocationHandler.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ImmutableConfigurationInvocationHandler.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/ImmutableConfigurationInvocationHandler.java Mon Mar 24 21:20:10 2014
@@ -72,6 +72,7 @@ class ImmutableConfigurationInvocationHa
* {@inheritDoc} This implementation delegates to the wrapped configuration
* object. Result objects are wrapped if necessary.
*/
+ @Override
public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable
{
@@ -119,6 +120,7 @@ class ImmutableConfigurationInvocationHa
* {@inheritDoc} This implementation just delegates to the underlying
* iterator.
*/
+ @Override
public boolean hasNext()
{
return wrappedIterator.hasNext();
@@ -128,6 +130,7 @@ class ImmutableConfigurationInvocationHa
* {@inheritDoc} This implementation just delegates to the underlying
* iterator.
*/
+ @Override
public Object next()
{
return wrappedIterator.next();
@@ -137,6 +140,7 @@ class ImmutableConfigurationInvocationHa
* {@inheritDoc} This implementation just throws an exception: removing
* objects is not supported.
*/
+ @Override
public void remove()
{
throw new UnsupportedOperationException(
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/JNDIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/JNDIConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/JNDIConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/JNDIConfiguration.java Mon Mar 24 21:20:10 2014
@@ -56,7 +56,7 @@ public class JNDIConfiguration extends A
private Context baseContext;
/** The Set of keys that have been virtually cleared. */
- private Set<String> clearedProperties = new HashSet<String>();
+ private final Set<String> clearedProperties = new HashSet<String>();
/**
* Creates a JNDIConfiguration using the default initial context as the
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PatternSubtreeConfigurationWrapper.java Mon Mar 24 21:20:10 2014
@@ -48,6 +48,8 @@ import org.apache.commons.configuration.
public class PatternSubtreeConfigurationWrapper extends BaseHierarchicalConfiguration
implements FileBasedConfiguration
{
+ private static final long serialVersionUID = 7456061169617014189L;
+
/** The wrapped configuration */
private final HierarchicalConfiguration<ImmutableNode> config;
@@ -58,7 +60,7 @@ public class PatternSubtreeConfiguration
private final boolean trailing;
/** True if the constructor has finished */
- private boolean init;
+ private final boolean init;
/**
* Constructor
@@ -443,11 +445,13 @@ public class PatternSubtreeConfiguration
getConfig().clearErrorListeners();
}
+ @Override
public void write(Writer writer) throws ConfigurationException, IOException
{
fetchFileBased().write(writer);
}
+ @Override
public void read(Reader reader) throws ConfigurationException, IOException
{
fetchFileBased().read(reader);
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PrefixedKeysIterator.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PrefixedKeysIterator.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PrefixedKeysIterator.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PrefixedKeysIterator.java Mon Mar 24 21:20:10 2014
@@ -62,6 +62,7 @@ class PrefixedKeysIterator implements It
*
* @return a flag if there is a next element
*/
+ @Override
public boolean hasNext()
{
return nextElementSet || setNextElement();
@@ -74,6 +75,7 @@ class PrefixedKeysIterator implements It
* @return the next element in the iteration
* @throws NoSuchElementException if there is no next element
*/
+ @Override
public String next()
{
if (!nextElementSet && !setNextElement())
@@ -93,6 +95,7 @@ class PrefixedKeysIterator implements It
* @throws IllegalStateException if {@code hasNext()} has already
* been called.
*/
+ @Override
public void remove()
{
if (nextElementSet)
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PropertiesConfiguration.java Mon Mar 24 21:20:10 2014
@@ -486,6 +486,7 @@ public class PropertiesConfiguration ext
* @param locator the current {@code FileLocator}
* @since 2.0
*/
+ @Override
public void initFileLocator(FileLocator locator)
{
this.locator = locator;
@@ -500,6 +501,7 @@ public class PropertiesConfiguration ext
*
* @since 2.0
*/
+ @Override
public void read(Reader in) throws ConfigurationException, IOException
{
getLayout().load(this, in);
@@ -512,6 +514,7 @@ public class PropertiesConfiguration ext
*
* @since 2.0
*/
+ @Override
public void write(Writer out) throws ConfigurationException, IOException
{
getLayout().save(this, out);
@@ -901,6 +904,7 @@ public class PropertiesConfiguration ext
private static final ValueTransformer TRANSFORMER =
new ValueTransformer()
{
+ @Override
public Object transformValue(Object value)
{
String strVal = String.valueOf(value);
@@ -1249,11 +1253,13 @@ public class PropertiesConfiguration ext
*/
public static class DefaultIOFactory implements IOFactory
{
+ @Override
public PropertiesReader createPropertiesReader(Reader in)
{
return new PropertiesReader(in);
}
+ @Override
public PropertiesWriter createPropertiesWriter(Writer out,
ListDelimiterHandler handler)
{
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/PropertiesConfigurationLayout.java Mon Mar 24 21:20:10 2014
@@ -605,6 +605,7 @@ public class PropertiesConfigurationLayo
*
* @param event the event object
*/
+ @Override
public void configurationChanged(ConfigurationEvent event)
{
if (!event.isBeforeUpdate())
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/StrictConfigurationComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/StrictConfigurationComparator.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/StrictConfigurationComparator.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/StrictConfigurationComparator.java Mon Mar 24 21:20:10 2014
@@ -46,6 +46,7 @@ public class StrictConfigurationComparat
* found in a and for each key in a, the corresponding value
* is the sale in for the same key in b
*/
+ @Override
public boolean compare(Configuration a, Configuration b)
{
if (a == null && b == null)
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/SubsetConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/SubsetConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/SubsetConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/SubsetConfiguration.java Mon Mar 24 21:20:10 2014
@@ -310,6 +310,7 @@ public class SubsetConfiguration extends
*
* @return a flag whether there are more elements
*/
+ @Override
public boolean hasNext()
{
return parentIterator.hasNext();
@@ -322,6 +323,7 @@ public class SubsetConfiguration extends
*
* @return the next element
*/
+ @Override
public String next()
{
return getChildKey(parentIterator.next());
@@ -331,6 +333,7 @@ public class SubsetConfiguration extends
* Removes the current element from the iteration. Delegates to the
* parent iterator.
*/
+ @Override
public void remove()
{
parentIterator.remove();
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLConfiguration.java Mon Mar 24 21:20:10 2014
@@ -883,6 +883,7 @@ public class XMLConfiguration extends Ba
/**
* {@inheritDoc} Stores the passed in locator for the upcoming IO operation.
*/
+ @Override
public void initFileLocator(FileLocator loc)
{
locator = loc;
@@ -898,6 +899,7 @@ public class XMLConfiguration extends Ba
* @throws ConfigurationException if an error occurs
* @throws IOException if an IO error occurs
*/
+ @Override
public void read(Reader in) throws ConfigurationException, IOException
{
load(new InputSource(in));
@@ -914,6 +916,7 @@ public class XMLConfiguration extends Ba
* @throws ConfigurationException if an error occurs
* @throws IOException if an IO error occurs
*/
+ @Override
public void read(InputStream in) throws ConfigurationException, IOException
{
load(new InputSource(in));
@@ -960,6 +963,7 @@ public class XMLConfiguration extends Ba
* @throws ConfigurationException if an error occurs
* @throws IOException if an IO error occurs
*/
+ @Override
public void write(Writer writer) throws ConfigurationException, IOException
{
try
@@ -1170,6 +1174,7 @@ public class XMLConfiguration extends Ba
* @throws IllegalArgumentException if the public ID is undefined
* @since 1.5
*/
+ @Override
public void registerEntityId(String publicId, URL entityURL)
{
if (entityResolver instanceof EntityRegistry)
@@ -1191,6 +1196,7 @@ public class XMLConfiguration extends Ba
* @since 1.5
* @deprecated Use getEntityResolver().resolveEntity()
*/
+ @Override
@Deprecated
public InputSource resolveEntity(String publicId, String systemId)
throws SAXException
@@ -1211,6 +1217,7 @@ public class XMLConfiguration extends Ba
*
* @return a map with the registered entity IDs
*/
+ @Override
public Map<String, URL> getRegisteredEntities()
{
if (entityResolver instanceof EntityRegistry)
@@ -1396,7 +1403,7 @@ public class XMLConfiguration extends Ba
static class XMLBuilderVisitor extends BuilderVisitor
{
/** Stores the document to be constructed. */
- private Document document;
+ private final Document document;
/** Stores the list delimiter handler .*/
private final ListDelimiterHandler listDelimiterHandler;
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLPropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLPropertiesConfiguration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLPropertiesConfiguration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/XMLPropertiesConfiguration.java Mon Mar 24 21:20:10 2014
@@ -135,6 +135,7 @@ public class XMLPropertiesConfiguration
this.header = header;
}
+ @Override
public void read(Reader in) throws ConfigurationException
{
SAXParserFactory factory = SAXParserFactory.newInstance();
@@ -148,6 +149,7 @@ public class XMLPropertiesConfiguration
XMLReader xmlReader = parser.getXMLReader();
xmlReader.setEntityResolver(new EntityResolver()
{
+ @Override
public InputSource resolveEntity(String publicId, String systemId)
{
return new InputSource(getClass().getClassLoader().getResourceAsStream("properties.dtd"));
@@ -202,6 +204,7 @@ public class XMLPropertiesConfiguration
}
}
+ @Override
public void write(Writer out) throws ConfigurationException
{
PrintWriter writer = new PrintWriter(out);
@@ -319,6 +322,7 @@ public class XMLPropertiesConfiguration
*
* @param locator the associated {@code FileLocator}
*/
+ @Override
public void initFileLocator(FileLocator locator)
{
this.locator = locator;
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java Mon Mar 24 21:20:10 2014
@@ -665,26 +665,31 @@ public final class BeanHelper
this.data = data;
}
+ @Override
public void initBean(Object bean, BeanDeclaration data)
{
beanHelper.initBean(bean, data);
}
+ @Override
public Object getParameter()
{
return param;
}
+ @Override
public BeanDeclaration getBeanDeclaration()
{
return data;
}
+ @Override
public Class<?> getBeanClass()
{
return beanClass;
}
+ @Override
public Object createBean(BeanDeclaration data)
{
return beanHelper.createBean(data);
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/CombinedBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/CombinedBeanDeclaration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/CombinedBeanDeclaration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/CombinedBeanDeclaration.java Mon Mar 24 21:20:10 2014
@@ -72,6 +72,7 @@ public class CombinedBeanDeclaration imp
* non-<b>null</b> value is returned. If none of the child declarations have
* a defined bean factory name, result is <b>null</b>.
*/
+ @Override
public String getBeanFactoryName()
{
for (BeanDeclaration d : childDeclarations)
@@ -91,6 +92,7 @@ public class CombinedBeanDeclaration imp
* non-<b>null</b> value is returned. If none of the child declarations have
* a defined bean factory parameter, result is <b>null</b>.
*/
+ @Override
public Object getBeanFactoryParameter()
{
for (BeanDeclaration d : childDeclarations)
@@ -110,6 +112,7 @@ public class CombinedBeanDeclaration imp
* non-<b>null</b> value is returned. If none of the child declarations have
* a defined bean class, result is <b>null</b>.
*/
+ @Override
public String getBeanClassName()
{
for (BeanDeclaration d : childDeclarations)
@@ -129,6 +132,7 @@ public class CombinedBeanDeclaration imp
* child declarations, the declaration that comes before in the list of
* children takes precedence.
*/
+ @Override
public Map<String, Object> getBeanProperties()
{
Map<String, Object> result = new HashMap<String, Object>();
@@ -150,6 +154,7 @@ public class CombinedBeanDeclaration imp
* defined in multiple child declarations, the declaration that comes before
* in the list of children takes precedence.
*/
+ @Override
public Map<String, Object> getNestedBeanDeclarations()
{
Map<String, Object> result = new HashMap<String, Object>();
@@ -172,6 +177,7 @@ public class CombinedBeanDeclaration imp
* child declarations provide constructor arguments, result is an empty
* collection.
*/
+ @Override
public Collection<ConstructorArg> getConstructorArgs()
{
for (BeanDeclaration d : childDeclarations)
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java Mon Mar 24 21:20:10 2014
@@ -76,6 +76,7 @@ public class ConfigurationDynaBean exten
}
}
+ @Override
public void set(String name, Object value)
{
if (LOG.isTraceEnabled())
@@ -110,6 +111,7 @@ public class ConfigurationDynaBean exten
}
}
+ @Override
public Object get(String name)
{
if (LOG.isTraceEnabled())
@@ -141,6 +143,7 @@ public class ConfigurationDynaBean exten
return result;
}
+ @Override
public boolean contains(String name, String key)
{
Configuration subset = getConfiguration().subset(name);
@@ -152,6 +155,7 @@ public class ConfigurationDynaBean exten
return subset.containsKey(key);
}
+ @Override
public Object get(String name, int index)
{
if (!checkIndexedProperty(name))
@@ -164,6 +168,7 @@ public class ConfigurationDynaBean exten
return list.get(index);
}
+ @Override
public Object get(String name, String key)
{
Configuration subset = getConfiguration().subset(name);
@@ -175,17 +180,20 @@ public class ConfigurationDynaBean exten
return subset.getProperty(key);
}
+ @Override
public DynaClass getDynaClass()
{
return new ConfigurationDynaClass(getConfiguration());
}
+ @Override
public void remove(String name, String key)
{
Configuration subset = new SubsetConfiguration(getConfiguration(), name, PROPERTY_DELIMITER);
subset.setProperty(key, null);
}
+ @Override
public void set(String name, int index, Object value)
{
if (!checkIndexedProperty(name) && index > 0)
@@ -215,6 +223,7 @@ public class ConfigurationDynaBean exten
}
}
+ @Override
public void set(String name, String key, Object value)
{
getConfiguration().setProperty(name + "." + key, value);
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java Mon Mar 24 21:20:10 2014
@@ -60,6 +60,7 @@ public class ConfigurationDynaClass impl
this.configuration = configuration;
}
+ @Override
public DynaProperty getDynaProperty(String name)
{
if (LOG.isTraceEnabled())
@@ -118,6 +119,7 @@ public class ConfigurationDynaClass impl
}
}
+ @Override
public DynaProperty[] getDynaProperties()
{
if (LOG.isTraceEnabled())
@@ -144,11 +146,13 @@ public class ConfigurationDynaClass impl
return propertyArray;
}
+ @Override
public String getName()
{
return ConfigurationDynaBean.class.getName();
}
+ @Override
public DynaBean newInstance() throws IllegalAccessException, InstantiationException
{
return new ConfigurationDynaBean(configuration);
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/DefaultBeanFactory.java Mon Mar 24 21:20:10 2014
@@ -109,6 +109,7 @@ public class DefaultBeanFactory implemen
* @return the new bean instance
* @throws Exception if an error occurs
*/
+ @Override
public Object createBean(BeanCreationContext bcc) throws Exception
{
Object result = createBeanInstance(bcc);
@@ -122,6 +123,7 @@ public class DefaultBeanFactory implemen
*
* @return the default bean class
*/
+ @Override
public Class<?> getDefaultBeanClass()
{
return null;
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/beanutils/XMLBeanDeclaration.java Mon Mar 24 21:20:10 2014
@@ -330,6 +330,7 @@ public class XMLBeanDeclaration implemen
*
* @return the name of the bean factory
*/
+ @Override
public String getBeanFactoryName()
{
return getConfiguration().getString(ATTR_BEAN_FACTORY);
@@ -341,6 +342,7 @@ public class XMLBeanDeclaration implemen
*
* @return the parameter for the bean factory
*/
+ @Override
public Object getBeanFactoryParameter()
{
return getConfiguration().getProperty(ATTR_FACTORY_PARAM);
@@ -352,6 +354,7 @@ public class XMLBeanDeclaration implemen
*
* @return the name of the bean's class
*/
+ @Override
public String getBeanClassName()
{
return getConfiguration().getString(ATTR_BEAN_CLASS, getDefaultBeanClassName());
@@ -363,6 +366,7 @@ public class XMLBeanDeclaration implemen
*
* @return a map with the bean's properties
*/
+ @Override
public Map<String, Object> getBeanProperties()
{
Map<String, Object> props = new HashMap<String, Object>();
@@ -384,6 +388,7 @@ public class XMLBeanDeclaration implemen
*
* @return a map with bean declarations for complex properties
*/
+ @Override
public Map<String, Object> getNestedBeanDeclarations()
{
Map<String, Object> nested = new HashMap<String, Object>();
@@ -427,6 +432,7 @@ public class XMLBeanDeclaration implemen
* interpreted as a simple value. If no nested constructor argument
* declarations are found, result is an empty collection.
*/
+ @Override
public Collection<ConstructorArg> getConstructorArgs()
{
Collection<ConstructorArg> args = new LinkedList<ConstructorArg>();
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/AutoSaveListener.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/AutoSaveListener.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/AutoSaveListener.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/AutoSaveListener.java Mon Mar 24 21:20:10 2014
@@ -80,6 +80,7 @@ class AutoSaveListener extends FileHandl
* update of the configuration has been performed and currently no load
* operation is in progress.
*/
+ @Override
public void configurationChanged(ConfigurationEvent event)
{
if (autoSaveRequired(event))
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BasicBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BasicBuilderParameters.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BasicBuilderParameters.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BasicBuilderParameters.java Mon Mar 24 21:20:10 2014
@@ -103,6 +103,7 @@ public class BasicBuilderParameters impl
* (e.g. for lookup objects) are stored as defensive copies, so the
* original data cannot be modified.
*/
+ @Override
public Map<String, Object> getParameters()
{
HashMap<String, Object> result =
@@ -127,6 +128,7 @@ public class BasicBuilderParameters impl
* @param log the {@code Log} for the configuration produced by this builder
* @return a reference to this object for method chaining
*/
+ @Override
public BasicBuilderParameters setLogger(Log log)
{
return setProperty(PROP_LOGGER, log);
@@ -143,6 +145,7 @@ public class BasicBuilderParameters impl
* @param b the value of the property
* @return a reference to this object for method chaining
*/
+ @Override
public BasicBuilderParameters setThrowExceptionOnMissing(boolean b)
{
return setProperty(PROP_THROW_EXCEPTION_ON_MISSING, Boolean.valueOf(b));
@@ -159,6 +162,7 @@ public class BasicBuilderParameters impl
* @return a reference to this object for method chaining
* @see AbstractConfiguration#setListDelimiterHandler(ListDelimiterHandler)
*/
+ @Override
public BasicBuilderParameters setListDelimiterHandler(
ListDelimiterHandler handler)
{
@@ -169,6 +173,7 @@ public class BasicBuilderParameters impl
* {@inheritDoc} The passed in {@code ConfigurationInterpolator} is set
* without modifications.
*/
+ @Override
public BasicBuilderParameters setInterpolator(ConfigurationInterpolator ci)
{
return setProperty(PROP_INTERPOLATOR, ci);
@@ -179,6 +184,7 @@ public class BasicBuilderParameters impl
* <b>null</b> argument causes all prefix lookups to be removed from the
* internal parameters map.
*/
+ @Override
public BasicBuilderParameters setPrefixLookups(
Map<String, ? extends Lookup> lookups)
{
@@ -199,6 +205,7 @@ public class BasicBuilderParameters impl
* <b>null</b> argument causes all default lookups to be removed from the
* internal parameters map.
*/
+ @Override
public BasicBuilderParameters setDefaultLookups(
Collection<? extends Lookup> lookups)
{
@@ -218,6 +225,7 @@ public class BasicBuilderParameters impl
* {@inheritDoc} This implementation stores the passed in
* {@code ConfigurationInterpolator} object in the internal parameters map.
*/
+ @Override
public BasicBuilderParameters setParentInterpolator(
ConfigurationInterpolator parent)
{
@@ -228,6 +236,7 @@ public class BasicBuilderParameters impl
* {@inheritDoc} This implementation stores the passed in
* {@code Synchronizer} object in the internal parameters map.
*/
+ @Override
public BasicBuilderParameters setSynchronizer(Synchronizer sync)
{
return setProperty(PROP_SYNCHRONIZER, sync);
@@ -237,6 +246,7 @@ public class BasicBuilderParameters impl
* {@inheritDoc} This implementation stores the passed in
* {@code ConversionHandler} object in the internal parameters map.
*/
+ @Override
public BasicBuilderParameters setConversionHandler(ConversionHandler handler)
{
return setProperty(PROP_CONVERSION_HANDLER, handler);
@@ -249,6 +259,7 @@ public class BasicBuilderParameters impl
* configuration object. The {@code fetchBeanHelper()} method can be used to
* obtain the {@code BeanHelper} instance from a parameters map.
*/
+ @Override
public BasicBuilderParameters setBeanHelper(BeanHelper beanHelper)
{
return setProperty(PROP_BEAN_HELPER, beanHelper);
Modified: commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java?rev=1581069&r1=1581068&r2=1581069&view=diff
==============================================================================
--- commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/immutableNodes/src/main/java/org/apache/commons/configuration/builder/BasicConfigurationBuilder.java Mon Mar 24 21:20:10 2014
@@ -341,6 +341,7 @@ public class BasicConfigurationBuilder<T
* is reset. The double-check idiom for lazy initialization is used (Bloch,
* Effective Java, item 71).
*/
+ @Override
public T getConfiguration() throws ConfigurationException
{
T resObj = result;
@@ -364,6 +365,7 @@ public class BasicConfigurationBuilder<T
*
* @throws IllegalArgumentException if the listener is <b>null</b>
*/
+ @Override
public void addBuilderListener(BuilderListener l)
{
if (l == null)
@@ -378,6 +380,7 @@ public class BasicConfigurationBuilder<T
* {@inheritDoc} If the specified listener is not registered at this object,
* this method has no effect.
*/
+ @Override
public void removeBuilderListener(BuilderListener l)
{
builderListeners.removeListener(l);
@@ -561,34 +564,40 @@ public class BasicConfigurationBuilder<T
{
return new BeanDeclaration()
{
+ @Override
public Map<String, Object> getNestedBeanDeclarations()
{
// no nested beans
return Collections.emptyMap();
}
+ @Override
public Collection<ConstructorArg> getConstructorArgs()
{
// no constructor arguments
return Collections.emptySet();
}
+ @Override
public Map<String, Object> getBeanProperties()
{
// the properties are equivalent to the parameters
return params;
}
+ @Override
public Object getBeanFactoryParameter()
{
return null;
}
+ @Override
public String getBeanFactoryName()
{
return null;
}
+ @Override
public String getBeanClassName()
{
return getResultClass().getName();