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 2012/07/29 22:06:32 UTC
svn commit: r1366932 - in
/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils:
BeanHelper.java ConfigurationDynaBean.java ConfigurationDynaClass.java
Author: oheger
Date: Sun Jul 29 20:06:31 2012
New Revision: 1366932
URL: http://svn.apache.org/viewvc?rev=1366932&view=rev
Log:
Checkstyle: Renamed static final fields to match Java naming conventions for constants.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java?rev=1366932&r1=1366931&r2=1366932&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/BeanHelper.java Sun Jul 29 20:06:31 2012
@@ -60,7 +60,7 @@ import org.apache.commons.lang.ClassUtil
public final class BeanHelper
{
/** Stores a map with the registered bean factories. */
- private static final Map<String, BeanFactory> beanFactories = Collections
+ private static final Map<String, BeanFactory> BEAN_FACTORIES = Collections
.synchronizedMap(new HashMap<String, BeanFactory>());
/**
@@ -97,7 +97,7 @@ public final class BeanHelper
throw new IllegalArgumentException("Bean factory must not be null!");
}
- beanFactories.put(name, factory);
+ BEAN_FACTORIES.put(name, factory);
}
/**
@@ -110,7 +110,7 @@ public final class BeanHelper
*/
public static BeanFactory deregisterBeanFactory(String name)
{
- return beanFactories.remove(name);
+ return BEAN_FACTORIES.remove(name);
}
/**
@@ -120,7 +120,7 @@ public final class BeanHelper
*/
public static Set<String> registeredFactoryNames()
{
- return beanFactories.keySet();
+ return BEAN_FACTORIES.keySet();
}
/**
@@ -448,7 +448,7 @@ public final class BeanHelper
String factoryName = data.getBeanFactoryName();
if (factoryName != null)
{
- BeanFactory factory = beanFactories.get(factoryName);
+ BeanFactory factory = BEAN_FACTORIES.get(factoryName);
if (factory == null)
{
throw new ConfigurationRuntimeException(
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java?rev=1366932&r1=1366931&r2=1366932&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaBean.java Sun Jul 29 20:06:31 2012
@@ -59,7 +59,7 @@ public class ConfigurationDynaBean exten
private static final String PROPERTY_DELIMITER = ".";
/** The logger.*/
- private static final Log log = LogFactory.getLog(ConfigurationDynaBean.class);
+ private static final Log LOG = LogFactory.getLog(ConfigurationDynaBean.class);
/**
* Creates a new instance of {@code ConfigurationDynaBean} and sets
@@ -70,17 +70,17 @@ public class ConfigurationDynaBean exten
public ConfigurationDynaBean(Configuration configuration)
{
super(configuration);
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("ConfigurationDynaBean(" + configuration + ")");
+ LOG.trace("ConfigurationDynaBean(" + configuration + ")");
}
}
public void set(String name, Object value)
{
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("set(" + name + "," + value + ")");
+ LOG.trace("set(" + name + "," + value + ")");
}
if (value == null)
@@ -112,9 +112,9 @@ public class ConfigurationDynaBean exten
public Object get(String name)
{
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("get(" + name + ")");
+ LOG.trace("get(" + name + ")");
}
// get configuration property
@@ -129,9 +129,9 @@ public class ConfigurationDynaBean exten
}
}
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug(name + "=[" + result + "]");
+ LOG.debug(name + "=[" + result + "]");
}
if (result == null)
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java?rev=1366932&r1=1366931&r2=1366932&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/beanutils/ConfigurationDynaClass.java Sun Jul 29 20:06:31 2012
@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFac
public class ConfigurationDynaClass implements DynaClass
{
/** The logger.*/
- private static final Log log = LogFactory.getLog(ConfigurationDynaClass.class);
+ private static final Log LOG = LogFactory.getLog(ConfigurationDynaClass.class);
/** Stores the associated configuration.*/
private final Configuration configuration;
@@ -53,18 +53,18 @@ public class ConfigurationDynaClass impl
public ConfigurationDynaClass(Configuration configuration)
{
super();
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("ConfigurationDynaClass(" + configuration + ")");
+ LOG.trace("ConfigurationDynaClass(" + configuration + ")");
}
this.configuration = configuration;
}
public DynaProperty getDynaProperty(String name)
{
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("getDynaProperty(" + name + ")");
+ LOG.trace("getDynaProperty(" + name + ")");
}
if (name == null)
@@ -120,9 +120,9 @@ public class ConfigurationDynaClass impl
public DynaProperty[] getDynaProperties()
{
- if (log.isTraceEnabled())
+ if (LOG.isTraceEnabled())
{
- log.trace("getDynaProperties()");
+ LOG.trace("getDynaProperties()");
}
Iterator<String> keys = configuration.getKeys();
@@ -136,9 +136,9 @@ public class ConfigurationDynaClass impl
DynaProperty[] propertyArray = new DynaProperty[properties.size()];
properties.toArray(propertyArray);
- if (log.isDebugEnabled())
+ if (LOG.isDebugEnabled())
{
- log.debug("Found " + properties.size() + " properties.");
+ LOG.debug("Found " + properties.size() + " properties.");
}
return propertyArray;