morgand 2003/01/25 10:59:23
Modified: jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing
ConstraintTag.java
jelly/src/java/org/apache/commons/jelly
DynaBeanTagSupport.java TagSupport.java
jelly/src/java/org/apache/commons/jelly/impl
DynamicBeanTag.java DynamicDynaBeanTag.java
StaticTag.java
Log:
converting from Exception to JellyTagException
Revision Changes Path
1.8 +7 -6
jakarta-commons-sandbox/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java
Index: ConstraintTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/ConstraintTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConstraintTag.java 24 Jan 2003 05:26:13 -0000 1.7
+++ ConstraintTag.java 25 Jan 2003 18:59:23 -0000 1.8
@@ -5,6 +5,7 @@
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.jelly.DynaBeanTagSupport;
import org.apache.commons.jelly.JellyException;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.TagFactory;
@@ -66,16 +67,16 @@
// --------------------------------------------- ATTRIBUTES
- public void beforeSetAttributes ( ) throws JellyException {
+ public void beforeSetAttributes ( ) throws JellyTagException {
try {
createBean(factory);
} catch (InstantiationException e) {
- throw new JellyException(e.toString());
+ throw new JellyTagException(e.toString());
}
}
- public void setAttribute ( String name, Object value ) throws JellyException {
+ public void setAttribute ( String name, Object value ) throws
JellyTagException {
// no real need for DynaBeans or ?
if ( "var".equals(name) ) {
var = value.toString();
@@ -84,9 +85,9 @@
try {
BeanUtils.setProperty( bean, name, value );
} catch (IllegalAccessException e) {
- throw new JellyException(e.toString());
+ throw new JellyTagException(e.toString());
} catch (InvocationTargetException e) {
- throw new JellyException(e.toString());
+ throw new JellyTagException(e.toString());
}
}
@@ -94,7 +95,7 @@
// --------------------------------------------------
/** Children invocation... just nothing...
*/
- public void doTag ( XMLOutput output ) throws Exception {
+ public void doTag ( XMLOutput output ) throws JellyTagException {
if ( var != null ) context.setVariable ( var, getBean() );
invokeBody ( output );
// nothing else to do... the getConstraintObject method should have
been called.
1.9 +2 -2
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DynaBeanTagSupport.java 24 Jan 2003 01:48:45 -0000 1.8
+++ DynaBeanTagSupport.java 25 Jan 2003 18:59:23 -0000 1.9
@@ -88,7 +88,7 @@
}
/** Sets the context in which the tag will be run */
- public void setContext(JellyContext context) throws JellyException {
+ public void setContext(JellyContext context) throws JellyTagException {
this.context = context;
beforeSetAttributes();
}
@@ -130,7 +130,7 @@
/**
* Callback to allow processing to occur before the attributes are about to be
set
*/
- public void beforeSetAttributes() throws JellyException {
+ public void beforeSetAttributes() throws JellyTagException {
}
}
1.25 +6 -6
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/TagSupport.java
Index: TagSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/TagSupport.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- TagSupport.java 25 Jan 2003 17:37:25 -0000 1.24
+++ TagSupport.java 25 Jan 2003 18:59:23 -0000 1.25
@@ -222,7 +222,7 @@
}
/** Sets the context in which the tag will be run */
- public void setContext(JellyContext context) throws JellyException {
+ public void setContext(JellyContext context) throws JellyTagException {
this.context = context;
}
1.8 +4 -3
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DynamicBeanTag.java 24 Jan 2003 10:04:32 -0000 1.7
+++ DynamicBeanTag.java 25 Jan 2003 18:59:23 -0000 1.8
@@ -74,6 +74,7 @@
import org.apache.commons.jelly.DynaBeanTagSupport;
import org.apache.commons.jelly.JellyException;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.XMLOutput;
@@ -132,15 +133,15 @@
this.variableNameAttribute = variableNameAttribute;
}
- public void beforeSetAttributes() throws JellyException {
+ public void beforeSetAttributes() throws JellyTagException {
// create a new dynabean before the attributes are set
try {
bean = beanClass.newInstance();
setDynaBean( new ConvertingWrapDynaBean( bean ) );
} catch (InstantiationException e) {
- throw new JellyException("Could not instantiate dynabean",e);
+ throw new JellyTagException("Could not instantiate dynabean",e);
} catch (IllegalAccessException e) {
- throw new JellyException("Could not instantiate dynabean",e);
+ throw new JellyTagException("Could not instantiate dynabean",e);
}
setAttributesSet.clear();
1.6 +4 -3
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DynamicDynaBeanTag.java 24 Jan 2003 01:48:48 -0000 1.5
+++ DynamicDynaBeanTag.java 25 Jan 2003 18:59:23 -0000 1.6
@@ -69,6 +69,7 @@
import org.apache.commons.beanutils.DynaClass;
import org.apache.commons.jelly.DynaBeanTagSupport;
import org.apache.commons.jelly.JellyException;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
@@ -112,14 +113,14 @@
this.variableNameAttribute = variableNameAttribute;
}
- public void beforeSetAttributes() throws JellyException {
+ public void beforeSetAttributes() throws JellyTagException {
// create a new dynabean before the attributes are set
try {
setDynaBean( beanClass.newInstance() );
} catch (IllegalAccessException e) {
- throw new JellyException("Could not instantiate dynabean",e);
+ throw new JellyTagException("Could not instantiate dynabean",e);
} catch (InstantiationException e) {
- throw new JellyException("Could not instantiate dynabean",e);
+ throw new JellyTagException("Could not instantiate dynabean",e);
}
setAttributesSet.clear();
1.14 +16 -9
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/StaticTag.java
Index: StaticTag.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl/StaticTag.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- StaticTag.java 11 Dec 2002 12:40:55 -0000 1.13
+++ StaticTag.java 25 Jan 2003 18:59:23 -0000 1.14
@@ -62,7 +62,10 @@
package org.apache.commons.jelly.impl;
import org.apache.commons.jelly.DynaTagSupport;
+import org.apache.commons.jelly.JellyTagException;
import org.apache.commons.jelly.XMLOutput;
+
+import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
/**
@@ -102,10 +105,14 @@
// Tag interface
//-------------------------------------------------------------------------
- public void doTag(XMLOutput output) throws Exception {
- output.startElement(uri, localName, qname, attributes);
- invokeBody(output);
- output.endElement(uri, localName, qname);
+ public void doTag(XMLOutput output) throws JellyTagException {
+ try {
+ output.startElement(uri, localName, qname, attributes);
+ invokeBody(output);
+ output.endElement(uri, localName, qname);
+ } catch (SAXException e) {
+ throw new JellyTagException(e);
+ }
}
// DynaTag interface
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
