Author: oheger
Date: Tue Nov 25 13:20:01 2008
New Revision: 720600
URL: http://svn.apache.org/viewvc?rev=720600&view=rev
Log:
Checkstyle
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/INIConfiguration.java
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java?rev=720600&r1=720599&r2=720600&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java
(original)
+++
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationUtils.java
Tue Nov 25 13:20:01 2008
@@ -60,6 +60,9 @@
/** Constant for the name of the clone() method.*/
private static final String METHOD_CLONE = "clone";
+ /** Constant for Java version 1.4.*/
+ private static final float JAVA_1_4 = 1.4f;
+
/** The logger.*/
private static Log log = LogFactory.getLog(ConfigurationUtils.class);
@@ -733,7 +736,7 @@
*/
static URL toURL(File file) throws MalformedURLException
{
- if (SystemUtils.isJavaVersionAtLeast(1.4f))
+ if (SystemUtils.isJavaVersionAtLeast(JAVA_1_4))
{
try
{
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java?rev=720600&r1=720599&r2=720600&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
(original)
+++
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
Tue Nov 25 13:20:01 2008
@@ -30,13 +30,13 @@
import org.apache.commons.configuration.beanutils.BeanHelper;
import org.apache.commons.configuration.beanutils.DefaultBeanFactory;
import org.apache.commons.configuration.beanutils.XMLBeanDeclaration;
+import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration.tree.ConfigurationNode;
import org.apache.commons.configuration.tree.DefaultExpressionEngine;
import org.apache.commons.configuration.tree.OverrideCombiner;
import org.apache.commons.configuration.tree.UnionCombiner;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.lang.text.StrLookup;
+import org.apache.commons.logging.LogFactory;
/**
* <p>
@@ -666,7 +666,7 @@
HierarchicalConfiguration config = (HierarchicalConfiguration)
it.next();
XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
String key = config.getString(KEY_LOOKUP_KEY);
- ConfigurationInterpolator.registerGlobalLookup(key,
(StrLookup)BeanHelper.createBean(decl));
+ ConfigurationInterpolator.registerGlobalLookup(key, (StrLookup)
BeanHelper.createBean(decl));
}
}
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/INIConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/INIConfiguration.java?rev=720600&r1=720599&r2=720600&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/INIConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/INIConfiguration.java
Tue Nov 25 13:20:01 2008
@@ -403,7 +403,7 @@
}
String v = result.toString();
- if(!quoted)
+ if (!quoted)
{
v = v.trim();
}