Author: oheger
Date: Sat Dec 29 20:21:06 2012
New Revision: 1426824
URL: http://svn.apache.org/viewvc?rev=1426824&view=rev
Log:
Removed obsolete code.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/builder/combined/CombinedConfigurationBuilder.java
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=1426824&r1=1426823&r2=1426824&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
Sat Dec 29 20:21:06 2012
@@ -470,28 +470,6 @@ public class CombinedConfigurationBuilde
/** A map with the default configuration builder providers. */
private static final Map<String, ConfigurationBuilderProvider>
DEFAULT_PROVIDERS_MAP;
- /**
- * A specialized {@code StrLookup} object which operates on the combined
- * configuration constructed by this builder. This object is used as
- * default lookup for {@code ConfigurationInterpolator} objects assigned to
- * newly created configuration objects.
- */
-// private final StrLookup combinedConfigLookup = new StrLookup()
-// {
-// @Override
-// public String lookup(String key)
-// {
-// if (constructedConfiguration != null)
-// {
-// Object value =
-// constructedConfiguration.resolveContainerStore(key);
-// return (value != null) ? value.toString() : null;
-// }
-// return null;
-// }
-// };
-//
-
/** The builder for the definition configuration. */
private ConfigurationBuilder<? extends HierarchicalConfiguration>
definitionBuilder;
@@ -936,27 +914,6 @@ public class CombinedConfigurationBuilde
}
/**
- * Performs interpolation. This method will not only take this
configuration
- * instance into account (which is the one that loaded the configuration
- * definition file), but also the so far constructed combined
configuration.
- * So variables can be used that point to properties that are defined in
- * configuration sources loaded by this builder.
- *
- * @param value the value to be interpolated
- * @return the interpolated value
- */
-// @Override
-// protected Object interpolate(Object value)
-// {
-// Object result = super.interpolate(value);
-// if (constructedConfiguration != null)
-// {
-// result = constructedConfiguration.interpolate(result);
-// }
-// return result;
-// }
-
- /**
* Returns the {@code ConfigurationBuilderProvider} for the given tag. This
* method is called during creation of the result configuration. (It is not
* allowed to call it at another point of time; result is then
