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:23:48 UTC
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/plugins Declaration.java PluginCreateRule.java PluginDeclarationRule.java PluginManager.java PluginRules.java
rdonkin 2004/01/10 09:23:47
Modified: digester/src/java/org/apache/commons/digester/plugins
Declaration.java PluginCreateRule.java
PluginDeclarationRule.java PluginManager.java
PluginRules.java
Log:
Cosmetic changes to please checkstyle.
Revision Changes Path
1.8 +11 -11 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/Declaration.java
Index: Declaration.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/Declaration.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Declaration.java 16 Nov 2003 22:37:35 -0000 1.7
+++ Declaration.java 10 Jan 2004 17:23:47 -0000 1.8
@@ -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
@@ -344,8 +344,8 @@
Object none = ruleMethod.invoke(null, params);
} catch (Exception e) {
throw new PluginWrappedException(
- "Unable to configure class [" + pluginClass + "]"
- + " using method [" + ruleMethodName + "]", e);
+ "Unable to configure class [" + pluginClass + "]" +
+ " using method [" + ruleMethodName + "]", e);
}
return;
}
@@ -374,8 +374,8 @@
// look for resource
{
String resourceName =
- pluginClass.getClass().getName().replace('.', '/')
- + "RuleInfo.xml";
+ pluginClass.getClass().getName().replace('.', '/') +
+ "RuleInfo.xml";
InputStream is =
pluginClass.getClassLoader().getResourceAsStream(
resourceName);
@@ -433,9 +433,9 @@
Object none = ruleMethod.invoke(null, params);
} catch (Exception e) {
throw new PluginWrappedException(
- "Unable to configure class [" + pluginClass + "]"
- + " using rule class [" + ruleClass + "]"
- + " method [" + ruleMethodName + "]", e);
+ "Unable to configure class [" + pluginClass + "]" +
+ " using rule class [" + ruleClass + "]" +
+ " method [" + ruleMethodName + "]", e);
}
}
1.10 +14 -14 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginCreateRule.java
Index: PluginCreateRule.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginCreateRule.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PluginCreateRule.java 18 Nov 2003 22:14:22 -0000 1.9
+++ PluginCreateRule.java 10 Jan 2004 17:23:47 -0000 1.10
@@ -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
@@ -444,9 +444,9 @@
Declaration currDeclaration = null;
if (debug) {
- log.debug("PluginCreateRule.begin: installing new plugin: "
- + "oldrules=" + oldRules.toString()
- + ", localrules=" + localRules.toString());
+ log.debug("PluginCreateRule.begin: installing new plugin: " +
+ "oldrules=" + oldRules.toString() +
+ ", localrules=" + localRules.toString());
}
String pluginClassName;
@@ -499,8 +499,8 @@
}
else {
throw new PluginInvalidInputException(
- "No plugin class specified for element "
- + pattern);
+ "No plugin class specified for element " +
+ pattern);
}
// now load up the custom rules into a private Rules instance
@@ -528,9 +528,9 @@
Rules oldRules = digester.getRules();
if (debug) {
- log.debug("PluginCreateRule.begin: firing nested rules: "
- + "oldrules=" + oldRules.toString()
- + ", localrules=" + localRules.toString());
+ log.debug("PluginCreateRule.begin: firing nested rules: " +
+ "oldrules=" + oldRules.toString() +
+ ", localrules=" + localRules.toString());
}
// assert oldRules = localRules.oldRules
@@ -539,8 +539,8 @@
digester.setRules(oldRules);
if (debug) {
- log.debug("PluginCreateRule.begin: restored old rules to "
- + "oldrules=" + oldRules.toString());
+ log.debug("PluginCreateRule.begin: restored old rules to " +
+ "oldrules=" + oldRules.toString());
}
}
1.7 +10 -10 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginDeclarationRule.java
Index: PluginDeclarationRule.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginDeclarationRule.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PluginDeclarationRule.java 16 Nov 2003 22:37:35 -0000 1.6
+++ PluginDeclarationRule.java 10 Jan 2004 17:23:47 -0000 1.7
@@ -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
@@ -129,14 +129,14 @@
if (id == null) {
throw new PluginInvalidInputException(
- "mandatory attribute id not present on tag"
- + " <" + name + ">");
+ "mandatory attribute id not present on tag" +
+ " <" + name + ">");
}
if (pluginClassName == null) {
throw new PluginInvalidInputException(
- "mandatory attribute class not present on tag"
- + " <" + name + ">");
+ "mandatory attribute class not present on tag" +
+ " <" + name + ">");
}
Declaration newDecl = new Declaration(pluginClassName);
@@ -198,8 +198,8 @@
// simple for now.
if (pm.getDeclarationByClass(pluginClassName) != null) {
throw new PluginInvalidInputException(
- "Plugin id [" + id + "] maps to class [" + pluginClassName + "]"
- + " which has already been mapped by some other id.");
+ "Plugin id [" + id + "] maps to class [" + pluginClassName + "]" +
+ " which has already been mapped by some other id.");
}
pm.addDeclaration(newDecl);
1.6 +6 -6 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PluginManager.java 16 Nov 2003 22:37:35 -0000 1.5
+++ PluginManager.java 10 Jan 2004 17:23:47 -0000 1.6
@@ -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
@@ -123,8 +123,8 @@
declarationsById.put(id, decl);
if (debug) {
log.debug(
- "Indexing plugin-id [" + id + "]"
- + " -> class [" + pluginClass.getName() + "]");
+ "Indexing plugin-id [" + id + "]" +
+ " -> class [" + pluginClass.getName() + "]");
}
}
}
1.8 +12 -12 jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginRules.java
Index: PluginRules.java
===================================================================
RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/plugins/PluginRules.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PluginRules.java 18 Nov 2003 22:32:16 -0000 1.7
+++ PluginRules.java 10 Jan 2004 17:23:47 -0000 1.8
@@ -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
@@ -315,8 +315,8 @@
if (debug) {
log.debug(
- "Matching pattern [" + pattern
- + "] on rules object " + this.toString());
+ "Matching pattern [" + pattern +
+ "] on rules object " + this.toString());
}
List matches;
@@ -325,8 +325,8 @@
// assert pattern.startsWith(currPluginCreateRule.getPattern())
if (debug) {
log.debug(
- "Pattern [" + pattern + "] matching PluginCreateRule "
- + currPluginCreateRule.toString());
+ "Pattern [" + pattern + "] matching PluginCreateRule " +
+ currPluginCreateRule.toString());
}
matches = new ArrayList(1);
matches.add(currPluginCreateRule);
@@ -358,8 +358,8 @@
if (debug) {
log.debug(
- "Entering PluginCreateRule " + pcr.toString()
- + " on rules object " + this.toString());
+ "Entering PluginCreateRule " + pcr.toString() +
+ " on rules object " + this.toString());
}
currPluginCreateRule = pcr;
@@ -386,8 +386,8 @@
currPluginCreateRule = null;
if (debug) {
log.debug(
- "Leaving PluginCreateRule " + pcr.toString()
- + " on rules object " + this.toString());
+ "Leaving PluginCreateRule " + pcr.toString() +
+ " on rules object " + this.toString());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org