Author: oheger
Date: Wed Jul 26 13:19:30 2006
New Revision: 425832
URL: http://svn.apache.org/viewvc?rev=425832&view=rev
Log:
Checkstyle
Modified:
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/AbstractConfiguration.java
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/CombinedConfiguration.java
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationBuilder.java
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/PropertiesConfiguration.java
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/PropertyConverter.java
Modified:
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/AbstractConfiguration.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/AbstractConfiguration.java?rev=425832&r1=425831&r2=425832&view=diff
==============================================================================
---
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/AbstractConfiguration.java
(original)
+++
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/AbstractConfiguration.java
Wed Jul 26 13:19:30 2006
@@ -89,7 +89,7 @@
* When set to true the given configuration delimiter will not be used
* while parsing for this configuration.
*/
- private boolean delimiterParsingDisabled = false;
+ private boolean delimiterParsingDisabled;
/**
* Whether the configuration should throw NoSuchElementExceptions or simply
@@ -111,9 +111,11 @@
}
/**
+ * Sets the default list delimiter.
+ *
+ * @param delimiter the delimiter character
* @deprecated Use AbstractConfiguration.setDefaultListDelimiter(char)
* instead
- * @param delimiter
*/
public static void setDelimiter(char delimiter)
{
@@ -131,6 +133,9 @@
}
/**
+ * Returns the default list delimiter.
+ *
+ * @return the default list delimiter
* @deprecated Use AbstractConfiguration.getDefaultListDelimiter() instead
*/
public static char getDelimiter()
@@ -181,7 +186,8 @@
* Note: this change will only be effective for new parsings. If you
* want it to take effect for all loaded properties use the no arg
constructor
* and call this method before setting source.
- * @param delimiterParsingDisabled
+ * @param delimiterParsingDisabled a flag whether delimiter parsing should
+ * be disabled
*/
public void setDelimiterParsingDisabled(boolean delimiterParsingDisabled)
{
Modified:
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/CombinedConfiguration.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/CombinedConfiguration.java?rev=425832&r1=425831&r2=425832&view=diff
==============================================================================
---
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/CombinedConfiguration.java
(original)
+++
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/CombinedConfiguration.java
Wed Jul 26 13:19:30 2006
@@ -91,6 +91,9 @@
* properly synchronization.
* </p>
*
+ * @author <a
+ *
href="http://jakarta.apache.org/commons/configuration/team-list.html";>Commons
+ * Configuration team</a>
* @since 1.3
* @version $Id$
*/
Modified:
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationBuilder.java?rev=425832&r1=425831&r2=425832&view=diff
==============================================================================
---
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationBuilder.java
(original)
+++
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/ConfigurationBuilder.java
Wed Jul 26 13:19:30 2006
@@ -27,7 +27,9 @@
* configuration constructed by this builder.
* </p>
*
- * @author Oliver Heger
+ * @author <a
+ *
href="http://jakarta.apache.org/commons/configuration/team-list.html";>Commons
+ * Configuration team</a>
* @version $Id$
*/
public interface ConfigurationBuilder
@@ -41,4 +43,4 @@
* @throws ConfigurationException if an error occurs
*/
Configuration getConfiguration() throws ConfigurationException;
-}
\ No newline at end of file
+}
Modified:
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java?rev=425832&r1=425831&r2=425832&view=diff
==============================================================================
---
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
(original)
+++
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
Wed Jul 26 13:19:30 2006
@@ -160,7 +160,9 @@
* </p>
*
* @since 1.3
- * @author Oliver Heger
+ * @author <a
+ *
href="http://jakarta.apache.org/commons/configuration/team-list.html";>Commons
+ * Configuration team</a>
* @version $Id: DefaultConfigurationBuilder.java 384601 2006-03-09 20:22:58Z
* oheger $
*/
@@ -228,7 +230,8 @@
static final String KEY_UNION = "/additional/*";
/** Constant for an expression that selects override configurations. */
- static final String KEY_OVERRIDE1 = "/*[local-name() != 'additional' and
local-name() != 'override' and local-name() != '"
+ static final String KEY_OVERRIDE1 = "/*[local-name() != 'additional' and "
+ + "local-name() != 'override' and local-name() != '"
+ SEC_HEADER + "']";
/**
@@ -291,12 +294,12 @@
/** An array with the names of the default tags. */
private static final String[] DEFAULT_TAGS =
- { "properties", "xml", "hierarchicalXml", "jndi", "system", "plist",
"configuration" };
+ {"properties", "xml", "hierarchicalXml", "jndi", "system", "plist",
"configuration"};
/** An array with the providers for the default tags. */
private static final ConfigurationProvider[] DEFAULT_PROVIDERS =
- { PROPERTIES_PROVIDER, XML_PROVIDER, XML_PROVIDER, JNDI_PROVIDER,
- SYSTEM_PROVIDER, PLIST_PROVIDER, BUILDER_PROVIDER };
+ {PROPERTIES_PROVIDER, XML_PROVIDER, XML_PROVIDER, JNDI_PROVIDER,
+ SYSTEM_PROVIDER, PLIST_PROVIDER, BUILDER_PROVIDER};
/** Stores the configuration that is currently constructed.*/
private CombinedConfiguration constructedConfiguration;
Modified:
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java?rev=425832&r1=425831&r2=425832&view=diff
==============================================================================
---
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java
(original)
+++
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/HierarchicalConfiguration.java
Wed Jul 26 13:19:30 2006
@@ -901,7 +901,8 @@
/**
* A data class for storing (hierarchical) property information. A property
* can have a value and an arbitrary number of child properties. From
version 1.3 on this class
- * is only a thin wrapper over the <code>[EMAIL PROTECTED]
org.apache.commons.configuration.tree.DefaultConfigurationNode
DefaultconfigurationNode}</code>
+ * is only a thin wrapper over the
+ * <code>[EMAIL PROTECTED]
org.apache.commons.configuration.tree.DefaultConfigurationNode
DefaultconfigurationNode}</code>
* class that exists mainly for the purpose of backwards compatibility.
*/
public static class Node extends DefaultConfigurationNode implements
Serializable
Modified:
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/PropertiesConfiguration.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/PropertiesConfiguration.java?rev=425832&r1=425831&r2=425832&view=diff
==============================================================================
---
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/PropertiesConfiguration.java
(original)
+++
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/PropertiesConfiguration.java
Wed Jul 26 13:19:30 2006
@@ -160,6 +160,9 @@
*/
public class PropertiesConfiguration extends AbstractFileConfiguration
{
+ /** Constant for the supported comment characters.*/
+ static final String COMMENT_CHARS = "#!";
+
/**
* This is the name of the property that can point to other
* properties file for including other properties files.
@@ -181,9 +184,6 @@
/** Constant for the platform specific line separator.*/
private static final String LINE_SEPARATOR =
System.getProperty("line.separator");
- /** Constant for the supported comment characters.*/
- static final String COMMENT_CHARS = "#!";
-
/** Constant for the radix of hex numbers.*/
private static final int HEX_RADIX = 16;
@@ -445,8 +445,7 @@
}
else
{
- files = new String[]
- { value };
+ files = new String[]{value};
}
for (int i = 0; i < files.length; i++)
{
Modified:
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/PropertyConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/PropertyConverter.java?rev=425832&r1=425831&r2=425832&view=diff
==============================================================================
---
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/PropertyConverter.java
(original)
+++
jakarta/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/PropertyConverter.java
Wed Jul 26 13:19:30 2006
@@ -60,7 +60,7 @@
/** Constant for the argument classes of the Number constructor that takes
* a String.
*/
- private static final Class[] CONSTR_ARGS = { String.class };
+ private static final Class[] CONSTR_ARGS = {String.class};
/**
* Private constructor prevents instances from being created.
@@ -298,8 +298,7 @@
try
{
Constructor constr = targetClass.getConstructor(CONSTR_ARGS);
- return (Number) constr.newInstance(new Object[]
- { str });
+ return (Number) constr.newInstance(new Object[]{str});
}
catch (InvocationTargetException itex)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
