mcconnell 2003/02/10 23:15:43
Modified: src/java/org/apache/avalon/framework/configuration
ConfigurationUtil.java AbstractConfiguration.java
Log:
Checkstyle compliance update.
Revision Changes Path
1.10 +4 -3
avalon/src/java/org/apache/avalon/framework/configuration/ConfigurationUtil.java
Index: ConfigurationUtil.java
===================================================================
RCS file:
/home/cvs/avalon/src/java/org/apache/avalon/framework/configuration/ConfigurationUtil.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ConfigurationUtil.java 11 Feb 2003 07:08:02 -0000 1.9
+++ ConfigurationUtil.java 11 Feb 2003 07:15:42 -0000 1.10
@@ -52,6 +52,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+
package org.apache.avalon.framework.configuration;
import javax.xml.parsers.DocumentBuilder;
@@ -213,8 +214,8 @@
{
final String value1 = c1.getValue( null );
final String value2 = c2.getValue( null );
- return ( value1 == null && value2 == null ) ||
- ( value1 != null && value1.equals( value2 ) );
+ return ( value1 == null && value2 == null )
+ || ( value1 != null && value1.equals( value2 ) );
}
/**
1.27 +8 -8
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- AbstractConfiguration.java 11 Feb 2003 06:47:30 -0000 1.26
+++ AbstractConfiguration.java 11 Feb 2003 07:15:42 -0000 1.27
@@ -521,18 +521,18 @@
private boolean isTrue( final String value )
{
- return value.equalsIgnoreCase( "true" ) ||
- value.equalsIgnoreCase( "yes" ) ||
- value.equalsIgnoreCase( "on" ) ||
- value.equalsIgnoreCase( "1" );
+ return value.equalsIgnoreCase( "true" )
+ || value.equalsIgnoreCase( "yes" )
+ || value.equalsIgnoreCase( "on" )
+ || value.equalsIgnoreCase( "1" );
}
private boolean isFalse( final String value )
{
- return value.equalsIgnoreCase( "false" ) ||
- value.equalsIgnoreCase( "no" ) ||
- value.equalsIgnoreCase( "off" ) ||
- value.equalsIgnoreCase( "0" );
+ return value.equalsIgnoreCase( "false" )
+ || value.equalsIgnoreCase( "no" )
+ || value.equalsIgnoreCase( "off" )
+ || value.equalsIgnoreCase( "0" );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
