morgand 2003/01/23 20:17:46
Modified: jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing
BeanFactory.java ConstraintTag.java Factory.java
Log:
updated Swing tags with latest exceptions
Revision Changes Path
1.3 +6 -2
jakarta-commons-sandbox/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BeanFactory.java
Index: BeanFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/BeanFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BeanFactory.java 30 Oct 2002 19:16:19 -0000 1.2
+++ BeanFactory.java 24 Jan 2003 04:17:46 -0000 1.3
@@ -78,7 +78,11 @@
/**
* Create a new component instance
*/
- public Object newInstance() throws Exception {
- return beanClass.newInstance();
+ public Object newInstance() throws InstantiationException {
+ try {
+ return beanClass.newInstance();
+ } catch (IllegalAccessException e) {
+ throw new InstantiationException(e.toString());
+ }
}
}
1.6 +23 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ConstraintTag.java 11 Dec 2002 12:40:57 -0000 1.5
+++ ConstraintTag.java 24 Jan 2003 04:17:46 -0000 1.6
@@ -1,7 +1,10 @@
package org.apache.commons.jelly.tags.swing;
+import java.lang.reflect.InvocationTargetException;
+
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.jelly.DynaBeanTagSupport;
+import org.apache.commons.jelly.JellyException;
import org.apache.commons.jelly.Tag;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.jelly.impl.TagFactory;
@@ -57,22 +60,36 @@
this.factory = factory;
}
- public void createBean ( Factory factory ) throws Exception {
+ protected void createBean ( Factory factory ) throws InstantiationException {
bean = factory.newInstance();
}
// --------------------------------------------- ATTRIBUTES
- public void beforeSetAttributes ( ) throws Exception {
- createBean(factory);
+ public void beforeSetAttributes ( ) throws JellyException {
+ try {
+ createBean(factory);
+ } catch (InstantiationException e) {
+ throw new JellyException(e.toString());
+ }
}
- public void setAttribute ( String name, Object value ) throws Exception {
+ public void setAttribute ( String name, Object value ) throws JellyException {
// no real need for DynaBeans or ?
- if ( "var".equals(name) )
+ if ( "var".equals(name) ) {
var = value.toString();
- else BeanUtils.setProperty( bean, name, value );
+ } else {
+
+ try {
+ BeanUtils.setProperty( bean, name, value );
+ } catch (IllegalAccessException e) {
+ throw new JellyException(e.toString());
+ } catch (InvocationTargetException e) {
+ throw new JellyException(e.toString());
+ }
+
+ }
}
// --------------------------------------------------
/** Children invocation... just nothing...
1.3 +1 -1
jakarta-commons-sandbox/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/Factory.java
Index: Factory.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/Factory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Factory.java 30 Oct 2002 19:16:19 -0000 1.2
+++ Factory.java 24 Jan 2003 04:17:46 -0000 1.3
@@ -73,5 +73,5 @@
/**
* Create a new component instance
*/
- Object newInstance() throws Exception;
+ Object newInstance() throws InstantiationException;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
