Author: oheger
Date: Fri Dec 28 20:30:47 2012
New Revision: 1426625
URL: http://svn.apache.org/viewvc?rev=1426625&view=rev
Log:
Renamed method.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/BaseConfigurationBuilderProvider.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ConfigurationBuilderProvider.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/BaseConfigurationBuilderProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/BaseConfigurationBuilderProvider.java?rev=1426625&r1=1426624&r2=1426625&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/BaseConfigurationBuilderProvider.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/BaseConfigurationBuilderProvider.java
Fri Dec 28 20:30:47 2012
@@ -168,7 +168,7 @@ public class BaseConfigurationBuilderPro
* create a new builder instance using reflection and to configure it with
* parameter values defined by the passed in {@code BeanDeclaration}.
*/
- public ConfigurationBuilder<? extends Configuration> getConfiguration(
+ public ConfigurationBuilder<? extends Configuration>
getConfigurationBuilder(
ConfigurationDeclaration decl) throws ConfigurationException
{
try
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java?rev=1426625&r1=1426624&r2=1426625&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java
Fri Dec 28 20:30:47 2012
@@ -1554,7 +1554,7 @@ public class CombinedConfigurationBuilde
new ConfigurationDeclaration(
CombinedConfigurationBuilder.this, src);
ConfigurationBuilder<? extends Configuration> builder =
- provider.getConfiguration(decl);
+ provider.getConfigurationBuilder(decl);
builders.add(builder);
declarations.put(builder, decl);
if (decl.getName() != null)
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ConfigurationBuilderProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ConfigurationBuilderProvider.java?rev=1426625&r1=1426624&r2=1426625&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ConfigurationBuilderProvider.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/ConfigurationBuilderProvider.java
Fri Dec 28 20:30:47 2012
@@ -48,7 +48,7 @@ public interface ConfigurationBuilderPro
* @return the {@code ConfigurationBuilder} object created by this provider
* @throws ConfigurationException if an error occurs
*/
- ConfigurationBuilder<? extends Configuration> getConfiguration(
+ ConfigurationBuilder<? extends Configuration> getConfigurationBuilder(
ConfigurationDeclaration decl)
throws ConfigurationException;
}
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java?rev=1426625&r1=1426624&r2=1426625&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java
Fri Dec 28 20:30:47 2012
@@ -127,7 +127,7 @@ public class TestBaseConfigurationBuilde
HierarchicalConfiguration declConfig = setUpConfig(reload);
ConfigurationDeclaration decl = createDeclaration(declConfig);
ConfigurationBuilder<? extends Configuration> builder =
- createProvider().getConfiguration(decl);
+ createProvider().getConfigurationBuilder(decl);
Configuration config = builder.getConfiguration();
assertEquals("Wrong configuration class",
PropertiesConfiguration.class, config.getClass());
@@ -201,7 +201,7 @@ public class TestBaseConfigurationBuilde
.getName()));
HierarchicalConfiguration declConfig = setUpConfig(true);
ConfigurationDeclaration decl = createDeclaration(declConfig);
- provider.getConfiguration(decl);
+ provider.getConfigurationBuilder(decl);
}
/**
@@ -224,7 +224,7 @@ public class TestBaseConfigurationBuilde
ConfigurationDeclaration decl = createDeclaration(declConfig);
BasicConfigurationBuilder<? extends Configuration> builder =
(BasicConfigurationBuilder<? extends Configuration>)
createProvider()
- .getConfiguration(decl);
+ .getConfigurationBuilder(decl);
assertEquals("Wrong flag value", expFlag, builder.isAllowFailOnInit());
}
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java?rev=1426625&r1=1426624&r2=1426625&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestCombinedConfigurationBuilder.java
Fri Dec 28 20:30:47 2012
@@ -548,7 +548,7 @@ public class TestCombinedConfigurationBu
attrs))).registerProvider(tagName,
new ConfigurationBuilderProvider()
{
- public ConfigurationBuilder<? extends
Configuration> getConfiguration(
+ public ConfigurationBuilder<? extends
Configuration> getConfigurationBuilder(
ConfigurationDeclaration decl)
throws ConfigurationException
{
@@ -961,7 +961,7 @@ public class TestCombinedConfigurationBu
this.propertyKey = propertyKey;
}
- public ConfigurationBuilder<? extends Configuration> getConfiguration(
+ public ConfigurationBuilder<? extends Configuration>
getConfigurationBuilder(
ConfigurationDeclaration decl) throws ConfigurationException
{
HierarchicalConfiguration config =
