You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by rd...@apache.org on 2004/01/10 18:24:10 UTC
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester BeanPropertySetterRule.java CallMethodRule.java Digester.java FactoryCreateRule.java ParserFeatureSetterFactory.java
rdonkin 2004/01/10 09:24:10
Modified: digester/src/java/org/apache/commons/digester
BeanPropertySetterRule.java CallMethodRule.java
Digester.java FactoryCreateRule.java
ParserFeatureSetterFactory.java
Log:
Cosmetic changes to please checkstyle.
Revision Changes Path
1.16 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java
Index: BeanPropertySetterRule.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- BeanPropertySetterRule.java 9 Oct 2003 21:09:46 -0000 1.15
+++ BeanPropertySetterRule.java 10 Jan 2004 17:24:10 -0000 1.16
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,7 +57,7 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- */
+ */
package org.apache.commons.digester;
1.27 +7 -7 jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java
Index: CallMethodRule.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- CallMethodRule.java 9 Oct 2003 21:09:46 -0000 1.26
+++ CallMethodRule.java 10 Jan 2004 17:24:10 -0000 1.27
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -450,8 +450,8 @@
// convert nulls and convert stringy parameters
// for non-stringy param types
if(
- parameters[i] == null
- || (parameters[i] instanceof String &&
+ parameters[i] == null ||
+ (parameters[i] instanceof String &&
!String.class.isAssignableFrom(paramTypes[i]))) {
paramValues[i] =
1.89 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java
Index: Digester.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- Digester.java 6 Jan 2004 22:15:57 -0000 1.88
+++ Digester.java 10 Jan 2004 17:24:10 -0000 1.89
@@ -2679,8 +2679,8 @@
}
}
if (locator != null) {
- String error = "Error at (" + locator.getLineNumber() + ", "
- + locator.getColumnNumber() + ": " + message;
+ String error = "Error at (" + locator.getLineNumber() + ", " +
+ locator.getColumnNumber() + ": " + message;
if (e != null) {
return new SAXParseException(error, locator, e);
} else {
1.16 +10 -10 jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java
Index: FactoryCreateRule.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FactoryCreateRule.java 9 Oct 2003 21:09:46 -0000 1.15
+++ FactoryCreateRule.java 10 Jan 2004 17:24:10 -0000 1.16
@@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2004 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -422,8 +422,8 @@
} catch (Exception e) {
// log message and error
if (digester.log.isInfoEnabled()) {
- digester.log.info("[FactoryCreateRule] Create exception ignored: "
- + ((e.getMessage() == null) ? e.getClass().getName() : e.getMessage()));
+ digester.log.info("[FactoryCreateRule] Create exception ignored: " +
+ ((e.getMessage() == null) ? e.getClass().getName() : e.getMessage()));
if (digester.log.isDebugEnabled()) {
digester.log.debug("[FactoryCreateRule] Ignored exception:", e);
}
@@ -451,9 +451,9 @@
// check if object was created
// this only happens if an exception was thrown and we're ignoring them
if (
- ignoreCreateExceptions
- && exceptionIgnoredStack != null
- && !(exceptionIgnoredStack.empty())) {
+ ignoreCreateExceptions &&
+ exceptionIgnoredStack != null &&
+ !(exceptionIgnoredStack.empty())) {
if (((Boolean) exceptionIgnoredStack.pop()).booleanValue()) {
// creation exception was ignored
1.2 +3 -0 jakarta-commons/digester/src/java/org/apache/commons/digester/ParserFeatureSetterFactory.java
Index: ParserFeatureSetterFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ParserFeatureSetterFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParserFeatureSetterFactory.java 6 Jan 2004 22:15:22 -0000 1.1
+++ ParserFeatureSetterFactory.java 10 Jan 2004 17:24:10 -0000 1.2
@@ -1,4 +1,7 @@
/*
+ * $Header$
+ * $Revision$
+ * $Date$
*
* ====================================================================
*
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org