You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mo...@apache.org on 2003/01/24 02:44:22 UTC
cvs commit: jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/impl DynamicBeanTag.java DynamicDynaBeanTag.java
morgand 2003/01/23 17:44:21
Modified: jelly/src/java/org/apache/commons/jelly
DynaBeanTagSupport.java
jelly/src/java/org/apache/commons/jelly/impl
DynamicBeanTag.java DynamicDynaBeanTag.java
Log:
beforeSetAttributes() throws JellyException instead of Exception
Revision Changes Path
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DynaBeanTagSupport.java 30 Oct 2002 19:16:26 -0000 1.6
+++ DynaBeanTagSupport.java 24 Jan 2003 01:44:20 -0000 1.7
@@ -130,7 +130,7 @@
/**
* Callback to allow processing to occur before the attributes are about to be set
*/
- public void beforeSetAttributes() throws Exception {
+ public void beforeSetAttributes() throws JellyException {
}
}
1.5 +9 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DynamicBeanTag.java 30 Oct 2002 19:16:23 -0000 1.4
+++ DynamicBeanTag.java 24 Jan 2003 01:44:21 -0000 1.5
@@ -132,10 +132,16 @@
this.variableNameAttribute = variableNameAttribute;
}
- public void beforeSetAttributes() throws Exception {
+ public void beforeSetAttributes() throws JellyException {
// create a new dynabean before the attributes are set
- bean = beanClass.newInstance();
- setDynaBean( new ConvertingWrapDynaBean( bean ) );
+ try {
+ bean = beanClass.newInstance();
+ setDynaBean( new ConvertingWrapDynaBean( bean ) );
+ } catch (InstantiationException e) {
+ throw new JellyException("Could not instantiate dynabean",e);
+ } catch (IllegalAccessException e) {
+ throw new JellyException("Could not instantiate dynabean",e);
+ }
setAttributesSet.clear();
}
1.4 +9 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynamicDynaBeanTag.java 11 Dec 2002 12:40:55 -0000 1.3
+++ DynamicDynaBeanTag.java 24 Jan 2003 01:44:21 -0000 1.4
@@ -68,6 +68,7 @@
import org.apache.commons.beanutils.DynaClass;
import org.apache.commons.jelly.DynaBeanTagSupport;
+import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.expression.Expression;
@@ -111,9 +112,15 @@
this.variableNameAttribute = variableNameAttribute;
}
- public void beforeSetAttributes() throws Exception {
+ public void beforeSetAttributes() throws JellyException {
// create a new dynabean before the attributes are set
- setDynaBean( beanClass.newInstance() );
+ try {
+ setDynaBean( beanClass.newInstance() );
+ } catch (IllegalAccessException e) {
+ throw new JellyException("Could not instantiate dynabean",e);
+ } catch (InstantiationException e) {
+ throw new JellyException("Could not instantiate dynabean",e);
+ }
setAttributesSet.clear();
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>