You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2008/12/18 08:16:10 UTC
svn commit: r727664 - in
/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration:
DefaultConfigurationBuilder.java DynamicCombinedConfiguration.java
beanutils/ConfigurationDynaClass.java plist/XMLPropertyListConfiguration.java
Author: oheger
Date: Wed Dec 17 23:16:09 2008
New Revision: 727664
URL: http://svn.apache.org/viewvc?rev=727664&view=rev
Log:
Fixed findbugs warnings.
Modified:
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DynamicCombinedConfiguration.java
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java
commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java
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=727664&r1=727663&r2=727664&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 Wed Dec 17 23:16:09 2008
@@ -794,7 +794,7 @@
*/
private void registerBeanFactory()
{
- synchronized (getClass())
+ synchronized (DefaultConfigurationBuilder.class)
{
if (!BeanHelper.registeredFactoryNames().contains(
CONFIG_BEAN_FACTORY_NAME))
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=727664&r1=727663&r2=727664&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 Wed Dec 17 23:16:09 2008
@@ -16,22 +16,22 @@
*/
package org.apache.commons.configuration;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
import org.apache.commons.configuration.event.ConfigurationErrorListener;
import org.apache.commons.configuration.event.ConfigurationListener;
-import org.apache.commons.configuration.tree.NodeCombiner;
import org.apache.commons.configuration.tree.ConfigurationNode;
import org.apache.commons.configuration.tree.ExpressionEngine;
-
-import java.util.List;
-import java.util.Iterator;
-import java.util.Collection;
-import java.util.Set;
-import java.util.Properties;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.math.BigDecimal;
-import java.math.BigInteger;
+import org.apache.commons.configuration.tree.NodeCombiner;
/**
* DynamicCombinedConfiguration allows a set of CombinedConfigurations to be used. Each CombinedConfiguration
@@ -776,7 +776,7 @@
/**
* Internal class that identifies each Configuration.
*/
- class ConfigData
+ static class ConfigData
{
/** Stores a reference to the configuration. */
private AbstractConfiguration configuration;
Modified: commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java?rev=727664&r1=727663&r2=727664&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java (original)
+++ commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java Wed Dec 17 23:16:09 2008
@@ -17,8 +17,8 @@
package org.apache.commons.configuration.beanutils;
-import java.util.Iterator;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.apache.commons.beanutils.DynaBean;
@@ -69,7 +69,7 @@
if (name == null)
{
- throw new IllegalArgumentException("No such property name=[" + name + "]");
+ throw new IllegalArgumentException("Property name must not be null!");
}
Object value = configuration.getProperty(name);
Modified: commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java?rev=727664&r1=727663&r2=727664&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/plist/XMLPropertyListConfiguration.java Wed Dec 17 23:16:09 2008
@@ -35,6 +35,7 @@
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
+
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
@@ -46,7 +47,6 @@
import org.apache.commons.configuration.MapConfiguration;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
-
import org.xml.sax.Attributes;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
@@ -409,7 +409,7 @@
/**
* SAX Handler to build the configuration nodes while the document is being parsed.
*/
- private class XMLPropertyListHandler extends DefaultHandler
+ private static class XMLPropertyListHandler extends DefaultHandler
{
/** The buffer containing the text node being read */
private StringBuffer buffer = new StringBuffer();