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:10:37 UTC
svn commit: r727661 - in
/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2:
DefaultConfigurationBuilder.java beanutils/ConfigurationDynaClass.java
plist/XMLPropertyListConfiguration.java
Author: oheger
Date: Wed Dec 17 23:10:36 2008
New Revision: 727661
URL: http://svn.apache.org/viewvc?rev=727661&view=rev
Log:
Fixed findbugs warnings.
Modified:
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java
commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java?rev=727661&r1=727660&r2=727661&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/DefaultConfigurationBuilder.java Wed Dec 17 23:10:36 2008
@@ -669,7 +669,7 @@
{
for (SubConfiguration<ConfigurationNode> config : configurationsAt(KEY_CONFIGURATION_LOOKUPS))
{
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
+ XMLBeanDeclaration<ConfigurationNode> decl = new XMLBeanDeclaration<ConfigurationNode>(config);
String key = config.getString(KEY_LOOKUP_KEY);
ConfigurationInterpolator.registerGlobalLookup(key, (StrLookup) BeanHelper.createBean(decl));
}
@@ -793,7 +793,7 @@
*/
private void registerBeanFactory()
{
- synchronized (getClass())
+ synchronized (DefaultConfigurationBuilder.class)
{
if (!BeanHelper.registeredFactoryNames().contains(
CONFIG_BEAN_FACTORY_NAME))
@@ -1565,7 +1565,7 @@
{
config = new DatabaseConfiguration(datasource, table, keyColumn, valueColumn);
}
- else
+ else
{
config = new DatabaseConfiguration(datasource, table, nameColumn, keyColumn, valueColumn, name);
}
Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java?rev=727661&r1=727660&r2=727661&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/beanutils/ConfigurationDynaClass.java Wed Dec 17 23:10:36 2008
@@ -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);
@@ -79,7 +79,7 @@
}
else
{
- Class type = value.getClass();
+ Class<?> type = value.getClass();
if (type == Byte.class)
{
Modified: commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java?rev=727661&r1=727660&r2=727661&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java (original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/main/java/org/apache/commons/configuration2/plist/XMLPropertyListConfiguration.java Wed Dec 17 23:10:36 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;
@@ -48,7 +49,6 @@
import org.apache.commons.configuration2.tree.DefaultConfigurationNode;
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;
@@ -186,6 +186,7 @@
super(url);
}
+ @Override
public void setProperty(String key, Object value)
{
// special case for byte arrays, they must be stored as is in the configuration
@@ -210,6 +211,7 @@
}
}
+ @Override
public void addProperty(String key, Object value)
{
if (value instanceof byte[])
@@ -407,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 StringBuilder buffer = new StringBuilder();
@@ -458,6 +460,7 @@
stack.add(node);
}
+ @Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException
{
if ("array".equals(qName))
@@ -481,6 +484,7 @@
}
}
+ @Override
public void endElement(String uri, String localName, String qName) throws SAXException
{
if ("key".equals(qName))
@@ -543,6 +547,7 @@
buffer.setLength(0);
}
+ @Override
public void characters(char[] ch, int start, int length) throws SAXException
{
buffer.append(ch, start, length);
@@ -706,6 +711,7 @@
*
* @param value the value to be added
*/
+ @Override
public void addValue(Object value)
{
list.add(value);
@@ -716,6 +722,7 @@
*
* @return the {@link List} of values
*/
+ @Override
public Object getValue()
{
return list;