Author: oheger
Date: Wed Aug 17 19:57:01 2011
New Revision: 1158885
URL: http://svn.apache.org/viewvc?rev=1158885&view=rev
Log:
Checkstyle
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/MultiFileHierarchicalConfiguration.java
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/MultiFileHierarchicalConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/MultiFileHierarchicalConfiguration.java?rev=1158885&r1=1158884&r2=1158885&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/MultiFileHierarchicalConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/MultiFileHierarchicalConfiguration.java
Wed Aug 17 19:57:01 2011
@@ -31,19 +31,19 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.configuration.event.ConfigurationErrorEvent;
import org.apache.commons.configuration.event.ConfigurationErrorListener;
import org.apache.commons.configuration.event.ConfigurationEvent;
import org.apache.commons.configuration.event.ConfigurationListener;
-import org.apache.commons.configuration.tree.ConfigurationNode;
-import org.apache.commons.configuration.tree.ExpressionEngine;
+import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration.reloading.ReloadingStrategy;
import org.apache.commons.configuration.resolver.EntityResolverSupport;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.configuration.tree.ConfigurationNode;
+import org.apache.commons.configuration.tree.ExpressionEngine;
+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;
import org.xml.sax.EntityResolver;
import org.xml.sax.SAXParseException;
@@ -103,6 +103,7 @@ public class MultiFileHierarchicalConfig
/** The EntityResolver */
private EntityResolver entityResolver;
+ /** The internally used helper object for variable substitution. */
private StrSubstitutor localSubst = new StrSubstitutor(new
ConfigurationInterpolator());
/**