morgand 2003/01/26 02:55:57
Modified: jelly/src/java/org/apache/commons/jelly
DynaBeanTagSupport.java Tag.java
jelly/src/java/org/apache/commons/jelly/impl
DynamicBeanTag.java DynamicDynaBeanTag.java
DynamicTag.java
Log:
converting Jelly to use JellyTagExceptions
Revision Changes Path
1.11 +1 -1
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/DynaBeanTagSupport.java
Index: DynaBeanTagSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/DynaBeanTagSupport.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DynaBeanTagSupport.java 26 Jan 2003 07:50:23 -0000 1.10
+++ DynaBeanTagSupport.java 26 Jan 2003 10:55:56 -0000 1.11
@@ -95,7 +95,7 @@
/** Sets an attribute value of this tag before the tag is invoked
*/
- public void setAttribute(String name, Object value) throws JellyException {
+ public void setAttribute(String name, Object value) throws JellyTagException {
getDynaBean().set(name, value);
}
1.13 +7 -7
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Tag.java
Index: Tag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/Tag.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Tag.java 24 Jan 2003 19:03:24 -0000 1.12
+++ Tag.java 26 Jan 2003 10:55:56 -0000 1.13
@@ -103,12 +103,12 @@
/**
* Sets the context in which the tag will be run
*/
- public void setContext(JellyContext context) throws JellyException;
+ public void setContext(JellyContext context) throws JellyTagException;
/**
* Evaluates this tag after all the tags properties have been initialized.
*/
- public void doTag(XMLOutput output) throws Exception;
+ public void doTag(XMLOutput output) throws JellyTagException;
/**
* A helper method to invoke this tags body
1.9 +6 -12
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicBeanTag.java
Index: DynamicBeanTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicBeanTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DynamicBeanTag.java 25 Jan 2003 18:59:23 -0000 1.8
+++ DynamicBeanTag.java 26 Jan 2003 10:55:56 -0000 1.9
@@ -147,7 +147,7 @@
setAttributesSet.clear();
}
- public void setAttribute(String name, Object value) throws JellyException {
+ public void setAttribute(String name, Object value) throws JellyTagException {
boolean isVariableName = false;
if (variableNameAttribute != null ) {
if ( variableNameAttribute.equals( name ) ) {
@@ -175,7 +175,7 @@
// Tag interface
//-------------------------------------------------------------------------
- public void doTag(XMLOutput output) throws Exception {
+ public void doTag(XMLOutput output) throws JellyTagException {
// lets find any attributes that are not set and
for ( Iterator iter = attributes.values().iterator(); iter.hasNext(); ) {
@@ -234,14 +234,8 @@
Throwable inner = e.getTargetException();
- if ( inner instanceof Exception )
- {
- throw (Exception) inner;
- }
- else
- {
- throw new JellyException( inner );
- }
+ throw new JellyTagException(e);
+
}
}
}
@@ -255,7 +249,7 @@
* @param method Method that was invoked
* @param e Exception throw when <code>method</code> was invoked
*/
- private void methodInvocationException(Object bean, Method method, Exception e)
throws Exception {
+ private void methodInvocationException(Object bean, Method method, Exception e)
throws JellyTagException {
log.error("Could not invoke " + method, e);
BeanMap beanMap = new BeanMap(bean);
@@ -267,7 +261,7 @@
}
log.error(beanMap);
- throw e;
+ throw new JellyTagException(e);
}
// Properties
1.7 +2 -2
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
Index: DynamicDynaBeanTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DynamicDynaBeanTag.java 25 Jan 2003 18:59:23 -0000 1.6
+++ DynamicDynaBeanTag.java 26 Jan 2003 10:55:56 -0000 1.7
@@ -126,7 +126,7 @@
setAttributesSet.clear();
}
- public void setAttribute(String name, Object value) throws JellyException {
+ public void setAttribute(String name, Object value) throws JellyTagException {
boolean isVariableName = false;
if (variableNameAttribute != null ) {
if ( variableNameAttribute.equals( name ) ) {
@@ -154,7 +154,7 @@
// Tag interface
//-------------------------------------------------------------------------
- public void doTag(XMLOutput output) throws Exception {
+ public void doTag(XMLOutput output) throws JellyTagException {
// lets find any attributes that are not set and
for ( Iterator iter = attributes.values().iterator(); iter.hasNext(); ) {
1.5 +2 -1
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicTag.java
Index: DynamicTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/DynamicTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DynamicTag.java 11 Dec 2002 12:40:55 -0000 1.4
+++ DynamicTag.java 26 Jan 2003 10:55:56 -0000 1.5
@@ -66,6 +66,7 @@
import org.apache.commons.jelly.DynaTagSupport;
import org.apache.commons.jelly.JellyContext;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.Script;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.logging.Log;
@@ -101,7 +102,7 @@
// Tag interface
//-------------------------------------------------------------------------
- public void doTag(XMLOutput output) throws Exception {
+ public void doTag(XMLOutput output) throws JellyTagException {
if ( log.isDebugEnabled() ) {
log.debug("Invoking dynamic tag with attributes: " + attributes);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
