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 2003/11/03 00:26:59 UTC
cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/plugins Declaration.java PluginCreateRule.java PluginRules.java PluginAssertionError.java
rdonkin 2003/11/02 15:26:59
Modified: digester/src/java/org/apache/commons/digester/plugins
Declaration.java PluginCreateRule.java
PluginRules.java
Removed: digester/src/java/org/apache/commons/digester/plugins
PluginAssertionError.java
Log:
Replaced Error subclass with RuntimeException. Patch sbumitted by Simon Kitching.
Revision Changes Path
1.6 +6 -6 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Declaration.java 28 Oct 2003 23:31:08 -0000 1.5
+++ Declaration.java 2 Nov 2003 23:26:59 -0000 1.6
@@ -230,7 +230,7 @@
}
if (initialised_) {
- throw new PluginAssertionError("Init called multiple times.");
+ throw new PluginAssertionFailure("Init called multiple times.");
}
if ((pluginClass_ == null) && (pluginClassName_ != null)) {
@@ -301,7 +301,7 @@
}
if (!initialised_) {
- throw new PluginAssertionError("Not initialised.");
+ throw new PluginAssertionFailure("Not initialised.");
}
// load from explicit file
@@ -408,7 +408,7 @@
throws PluginWrappedException {
try
{
- throw new PluginAssertionError(
+ throw new PluginAssertionFailure(
"Load from stream not yet supported.");
}
finally {
1.6 +4 -4 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PluginCreateRule.java 28 Oct 2003 23:31:08 -0000 1.5
+++ PluginCreateRule.java 2 Nov 2003 23:26:59 -0000 1.6
@@ -319,7 +319,7 @@
// ok here we are actually instantiating a new plugin object,
// and storing its rules into a new Rules object
if (localRules_ != null) {
- throw new PluginAssertionError(
+ throw new PluginAssertionFailure(
"Begin called when localRules_ is not null.");
}
1.5 +6 -6 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PluginRules.java 28 Oct 2003 23:31:08 -0000 1.4
+++ PluginRules.java 2 Nov 2003 23:26:59 -0000 1.5
@@ -344,7 +344,7 @@
boolean debug = log.isDebugEnabled();
if (currPluginCreateRule_ != null) {
- throw new PluginAssertionError(
+ throw new PluginAssertionFailure(
"endPlugin called when currPluginCreateRule_ is not null.");
}
@@ -366,12 +366,12 @@
boolean debug = log.isDebugEnabled();
if (currPluginCreateRule_ == null) {
- throw new PluginAssertionError(
+ throw new PluginAssertionFailure(
"endPlugin called when currPluginCreateRule_ is null.");
}
if (currPluginCreateRule_ != pcr) {
- throw new PluginAssertionError(
+ throw new PluginAssertionFailure(
"endPlugin called with unexpected PluginCreateRule_.");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org