Author: oheger
Date: Tue Aug 16 06:21:42 2011
New Revision: 1158121
URL: http://svn.apache.org/viewvc?rev=1158121&view=rev
Log:
Checkstyle
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java?rev=1158121&r1=1158120&r2=1158121&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
Tue Aug 16 06:21:42 2011
@@ -29,13 +29,13 @@ import java.util.Set;
import org.apache.commons.configuration.event.ConfigurationErrorListener;
import org.apache.commons.configuration.event.ConfigurationListener;
+import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration.tree.ConfigurationNode;
import org.apache.commons.configuration.tree.ExpressionEngine;
import org.apache.commons.configuration.tree.NodeCombiner;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
+import org.apache.commons.lang.text.StrSubstitutor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang.text.StrSubstitutor;
/**
* DynamicCombinedConfiguration allows a set of CombinedConfigurations to be
used. Each CombinedConfiguration
@@ -78,6 +78,7 @@ public class DynamicCombinedConfiguratio
/** The name of the logger to use for each CombinedConfiguration */
private String loggerName = DynamicCombinedConfiguration.class.getName();
+ /** The object for handling variable substitution in key patterns. */
private StrSubstitutor localSubst = new StrSubstitutor(new
ConfigurationInterpolator());
/**
