mcconnell 2003/02/10 22:47:31
Modified: src/java/org/apache/avalon/framework/configuration
NamespacedSAXConfigurationHandler.java
DefaultConfigurationSerializer.java
AbstractConfiguration.java
Log:
Updated for checkstyle compliance.
Revision Changes Path
1.16 +6 -6
avalon/src/java/org/apache/avalon/framework/configuration/NamespacedSAXConfigurationHandler.java
Index: NamespacedSAXConfigurationHandler.java
===================================================================
RCS file:
/home/cvs/avalon/src/java/org/apache/avalon/framework/configuration/NamespacedSAXConfigurationHandler.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- NamespacedSAXConfigurationHandler.java 10 Feb 2003 07:19:16 -0000
1.15
+++ NamespacedSAXConfigurationHandler.java 11 Feb 2003 06:47:30 -0000
1.16
@@ -221,9 +221,9 @@
final String trimmedValue = accumulatedValue.trim();
if( trimmedValue.length() > 0 )
{
- throw new SAXException( "Not allowed to define mixed content
in the " +
- "element " +
finishedConfiguration.getName() + " at " +
- finishedConfiguration.getLocation()
);
+ throw new SAXException( "Not allowed to define mixed content
in the "
+ + "element " +
finishedConfiguration.getName() + " at "
+ +
finishedConfiguration.getLocation() );
}
}
@@ -384,9 +384,9 @@
else
{
return
- m_locator.getSystemId() + ":" +
- m_locator.getLineNumber() + ":" +
- m_locator.getColumnNumber();
+ m_locator.getSystemId() + ":"
+ + m_locator.getLineNumber() + ":"
+ + m_locator.getColumnNumber();
}
}
1.23 +1 -1
avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfigurationSerializer.java
Index: DefaultConfigurationSerializer.java
===================================================================
RCS file:
/home/cvs/avalon/src/java/org/apache/avalon/framework/configuration/DefaultConfigurationSerializer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- DefaultConfigurationSerializer.java 10 Feb 2003 07:19:16 -0000
1.22
+++ DefaultConfigurationSerializer.java 11 Feb 2003 06:47:30 -0000
1.23
@@ -102,7 +102,7 @@
/**
* Create a ContentHandler for an OutputStream
- * @param out an <code>OutputStream</code> value
+ * @param result the result
* @return contenthandler that goes to specified OutputStream
*/
protected ContentHandler createContentHandler( final Result result )
1.26 +25 -25
avalon/src/java/org/apache/avalon/framework/configuration/AbstractConfiguration.java
Index: AbstractConfiguration.java
===================================================================
RCS file:
/home/cvs/avalon/src/java/org/apache/avalon/framework/configuration/AbstractConfiguration.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- AbstractConfiguration.java 10 Feb 2003 07:19:16 -0000 1.25
+++ AbstractConfiguration.java 11 Feb 2003 06:47:30 -0000 1.26
@@ -109,9 +109,9 @@
catch( final Exception nfe )
{
final String message =
- "Cannot parse the value \"" + value +
- "\" as an integer in the configuration element \"" +
- getName() + "\" at " + getLocation();
+ "Cannot parse the value \"" + value
+ + "\" as an integer in the configuration element \""
+ + getName() + "\" at " + getLocation();
throw new ConfigurationException( message );
}
}
@@ -172,9 +172,9 @@
catch( final Exception nfe )
{
final String message =
- "Cannot parse the value \"" + value +
- "\" as a long in the configuration element \"" +
- getName() + "\" at " + getLocation();
+ "Cannot parse the value \"" + value
+ + "\" as a long in the configuration element \""
+ + getName() + "\" at " + getLocation();
throw new ConfigurationException( message );
}
}
@@ -217,9 +217,9 @@
catch( final Exception nfe )
{
final String message =
- "Cannot parse the value \"" + value +
- "\" as a float in the configuration element \"" +
- getName() + "\" at " + getLocation();
+ "Cannot parse the value \"" + value
+ + "\" as a float in the configuration element \""
+ + getName() + "\" at " + getLocation();
throw new ConfigurationException( message );
}
}
@@ -264,9 +264,9 @@
else
{
final String message =
- "Cannot parse the value \"" + value +
- "\" as a boolean in the configuration element \"" +
- getName() + "\" at " + getLocation();
+ "Cannot parse the value \"" + value
+ + "\" as a boolean in the configuration element \""
+ + getName() + "\" at " + getLocation();
throw new ConfigurationException( message );
}
}
@@ -344,9 +344,9 @@
catch( final Exception nfe )
{
final String message =
- "Cannot parse the value \"" + value +
- "\" as an integer in the attribute \"" +
- name + "\" at " + getLocation();
+ "Cannot parse the value \"" + value
+ + "\" as an integer in the attribute \""
+ + name + "\" at " + getLocation();
throw new ConfigurationException( message );
}
}
@@ -412,9 +412,9 @@
catch( final Exception nfe )
{
final String message =
- "Cannot parse the value \"" + value +
- "\" as a long in the attribute \"" +
- name + "\" at " + getLocation();
+ "Cannot parse the value \"" + value
+ + "\" as a long in the attribute \""
+ + name + "\" at " + getLocation();
throw new ConfigurationException( message );
}
}
@@ -461,9 +461,9 @@
catch( final Exception e )
{
final String message =
- "Cannot parse the value \"" + value +
- "\" as a float in the attribute \"" +
- name + "\" at " + getLocation();
+ "Cannot parse the value \"" + value
+ + "\" as a float in the attribute \""
+ + name + "\" at " + getLocation();
throw new ConfigurationException( message );
}
}
@@ -512,9 +512,9 @@
else
{
final String message =
- "Cannot parse the value \"" + value +
- "\" as a boolean in the attribute \"" +
- name + "\" at " + getLocation();
+ "Cannot parse the value \"" + value
+ + "\" as a boolean in the attribute \""
+ + name + "\" at " + getLocation();
throw new ConfigurationException( message );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
