orlikowski 2003/02/13 00:21:49
Modified: src/bsf-2.3/bsf/src/org/apache/bsf/util EngineUtils.java
Log:
Apply patch submitted by Rony G. Flatscher, and make some indentation
cleanups.
Rony's patch takes care of method invocations having a character among
the arguments.
Applied/Reviewed by: Victor J. Orlikowski
Revision Changes Path
1.3 +256 -252
jakarta-bsf/src/bsf-2.3/bsf/src/org/apache/bsf/util/EngineUtils.java
Index: EngineUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-bsf/src/bsf-2.3/bsf/src/org/apache/bsf/util/EngineUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EngineUtils.java 7 Nov 2002 01:49:12 -0000 1.2
+++ EngineUtils.java 13 Feb 2003 08:21:49 -0000 1.3
@@ -71,256 +71,260 @@
* @author Sam Ruby
*/
public class EngineUtils {
- // the BSF class loader that knows how to load from the a specific
- // temp directory
- static BSFClassLoader bsfCL;
-
- //////////////////////////////////////////////////////////////////////////
-
- /**
- * Add a script as a listener to some event coming out of an object. The
- * first two args identify the src of the event and the event set
- * and the rest identify the script which should be run when the event
- * fires.
- *
- * @param bean event source
- * @param eventSetName name of event set from event src to bind to
- * @param filter filter for events
- * @param engine BSFEngine which can run this script
- * @param manager BSFManager of the above engine
- * @param source (context info) the source of this expression
- (e.g., filename)
- * @param lineNo (context info) the line number in source for expr
- * @param columnNo (context info) the column number in source for expr
- * @param script the script to execute when the event occurs
- *
- * @exception BSFException if anything goes wrong while running the script
- */
- public static void addEventListener (Object bean, String eventSetName,
- String filter,
- BSFEngine engine, BSFManager manager,
- String source, int lineNo,
- int columnNo, Object script)
- throws BSFException {
- BSFEventProcessor ep = new BSFEventProcessor (engine, manager, filter,
- source, lineNo, columnNo,
- script);
- try {
- ReflectionUtils.addEventListener (bean, eventSetName, ep);
- } catch (Exception e) {
- e.printStackTrace ();
- throw new BSFException (BSFException.REASON_OTHER_ERROR,
- "ouch while adding event listener: " + e, e);
- }
- }
- //////////////////////////////////////////////////////////////////////////
-
- /**
- * Finds and invokes a method with the given signature on the given
- * bean. The signature of the method that's invoked is first taken
- * as the types of the args, but if that fails, this tries to convert
- * any primitive wrapper type args to their primitive counterparts
- * to see whether a method exists that way. If it does, done.
- *
- * @param bean the object on which to invoke the method
- * @param methodName name of the method
- * @param args arguments to be given to the method
- *
- * @return the result of invoking the method, if any
- *
- * @exception BSFException if something goes wrong
- */
- public static Object callBeanMethod (Object bean, String methodName,
- Object[] args) throws BSFException {
- // determine arg types. note that a null argtype matches any object type
- Class[] argTypes = null;
- if (args != null) {
- argTypes = new Class[args.length];
- for (int i = 0; i < args.length; i++) {
- argTypes[i] = (args[i] == null) ? null : args[i].getClass ();
- }
- }
-
- // we want to allow a static call to occur on an object, similar
- // to what Java allows. So isStaticOnly is set to false.
- boolean isStaticOnly = false;
- Class beanClass = (bean instanceof Class) ? (Class)bean : bean.getClass ();
-
- // now try to call method with the right signature
- try {
- Method m;
- try {
- m = MethodUtils.getMethod (beanClass, methodName, argTypes,
- isStaticOnly);
- } catch (NoSuchMethodException e) {
- // ok, so that didn't work - now try converting any primitive
- // wrapper types to their primitive counterparts
- try {
- // if args is null the NullPointerException will get caught
- // below and the right thing'll happen .. ugly but works
- for (int i = 0; i < args.length; i++) {
- if (args[i] instanceof Number) {
- // byte is convertible to all primitive numeric types,
- // so this'll find anything in that order and the
- // actual type will be that specified by the method decl
- argTypes[i] = byte.class;
- if(args[i] instanceof Float) argTypes[i]= float.class;
- else if(args[i] instanceof Double ) argTypes[i]= double.class;
- } else if (args[i] instanceof Boolean) {
- argTypes[i] = boolean.class;
- }
- }
- m = MethodUtils.getMethod (beanClass, methodName, argTypes,
- isStaticOnly);
- } catch (Exception e2) {
- // throw the original
- throw e;
- }
- }
-
- // call it, and return the result
- return m.invoke (bean, args);
- } catch (Exception e) {
- // something went wrong while invoking method
- Throwable t = (e instanceof InvocationTargetException) ?
- ((InvocationTargetException)e).getTargetException () :
- null;
- throw new BSFException (BSFException.REASON_OTHER_ERROR,
- "method invocation failed: " + e +
- ((t==null)?"":(" target exception: "+t)), t);
- }
- }
- //////////////////////////////////////////////////////////////////////////
-
- /**
- * Creates a new bean. The signature of teh constructor that's invoked
- * is first taken as the types of the args, but if that fails, this tries
- * to convert any primitive wrapper type args to their primitive
- * counterparts to see whether a method exists that way. If it does, done.
- *
- * @param className fully qualified name of class to instantiate
- * @param args array of constructor args (or null if none)
- *
- * @return the created bean
- *
- * @exception BSFException if something goes wrong (@see
- * org.apache.cs.util.MethodUtils for the real
- * exceptions that can occur).
- */
- public static Object createBean (String className,
- Object args[]) throws BSFException {
- Bean obj;
-
- Class[] argTypes = null;
- if (args != null) {
- argTypes = new Class[args.length];
- for (int i = 0; i < args.length; i++) {
- argTypes[i] = (args[i] != null) ? args[i].getClass () : null;
- }
- }
-
- try {
- try {
- obj = ReflectionUtils.createBean (null, className, argTypes, args);
- return obj.value;
- } catch (NoSuchMethodException me) {
- // ok, so that didn't work - now try converting any primitive
- // wrapper types to their primitive counterparts
- try {
- // if args is null the NullPointerException will get caught
- // below and the right thing'll happen .. ugly but works
- for (int i = 0; i < args.length; i++) {
- if (args[i] instanceof Number) {
- // byte is convertible to all primitive numeric types,
- // so this'll find anything in that order and the
- // actual type will be that specified by the method decl
- argTypes[i] = byte.class;
- } else if (args[i] instanceof Boolean) {
- argTypes[i] = boolean.class;
- }
- }
- obj = ReflectionUtils.createBean (null, className, argTypes, args);
- return obj.value;
- } catch (Exception e) {
- // throw the previous exception
- throw me;
- }
- }
- } catch (Exception e) {
- throw new BSFException (BSFException.REASON_OTHER_ERROR,
- e.getMessage (), e);
- }
- }
- //////////////////////////////////////////////////////////////////////////
-
- /**
- * Given a class return the type signature string fragment for it.
- * That is, return "I" for int, "J" for long, ... etc..
- *
- * @param cl class object for whom the signature fragment is needed.
- *
- * @return the string representing the type signature
- */
- public static String getTypeSignatureString (Class cl) {
- if (cl.isPrimitive ()) {
- if (cl == boolean.class) {
- return "Z";
- } else if (cl == byte.class) {
- return "B";
- } else if (cl == char.class) {
- return "C";
- } else if (cl == short.class) {
- return "S";
- } else if (cl == int.class) {
- return "I";
- } else if (cl == long.class) {
- return "J";
- } else if (cl == float.class) {
- return "F";
- } else if (cl == double.class) {
- return "D";
- } else { // (cl == void.class)
- return "V";
- }
- } else {
- StringBuffer sb = new StringBuffer ("L");
- sb.append (cl.getName ());
- sb.append (";");
- return sb.toString().replace ('.', '/');
- }
- }
- //////////////////////////////////////////////////////////////////////////
-
- /**
- * Load a class using the class loader of given manager. If that fails
- * try using a class loader that loads from the tempdir of the manager.
- *
- * @param mgr BSFManager who's classLoader and tempDir props are
- * consulted
- * @param name name of the class to load
- *
- * @return the loaded class
- *
- * @exception BSFException if something goes wrong.
- */
- public static Class loadClass (BSFManager mgr, String name)
-
throws BSFException {
- ClassLoader classLoader = mgr.getClassLoader ();
- try {
- return (classLoader == null) ? Class.forName (name)
- :
classLoader.loadClass (name);
- } catch (ClassNotFoundException e) {
- // try to load it from the temp dir using my own class loader
- try {
- if (bsfCL == null) {
- bsfCL = new BSFClassLoader ();
- }
- bsfCL.setTempDir (mgr.getTempDir ());
- return bsfCL.loadClass (name);
- } catch (ClassNotFoundException e2) {
- throw new BSFException (BSFException.REASON_OTHER_ERROR,
- "unable to load class '" + name + "':" + e, e);
- }
- }
- }
+ // the BSF class loader that knows how to load from the a specific
+ // temp directory
+ static BSFClassLoader bsfCL;
+
+ /**
+ * Add a script as a listener to some event coming out of an object. The
+ * first two args identify the src of the event and the event set
+ * and the rest identify the script which should be run when the event
+ * fires.
+ *
+ * @param bean event source
+ * @param eventSetName name of event set from event src to bind to
+ * @param filter filter for events
+ * @param engine BSFEngine which can run this script
+ * @param manager BSFManager of the above engine
+ * @param source (context info) the source of this expression
+ * (e.g., filename)
+ * @param lineNo (context info) the line number in source for expr
+ * @param columnNo (context info) the column number in source for expr
+ * @param script the script to execute when the event occurs
+ *
+ * @exception BSFException if anything goes wrong while running the script
+ */
+ public static void addEventListener (Object bean, String eventSetName,
+ String filter, BSFEngine engine,
+ BSFManager manager, String source,
+ int lineNo, int columnNo,
+ Object script) throws BSFException {
+ BSFEventProcessor ep = new BSFEventProcessor (engine, manager, filter,
+ source, lineNo, columnNo,
+ script);
+
+ try {
+ ReflectionUtils.addEventListener (bean, eventSetName, ep);
+ } catch (Exception e) {
+ e.printStackTrace ();
+ throw new BSFException (BSFException.REASON_OTHER_ERROR,
+ "ouch while adding event listener: "
+ + e, e);
+ }
+ }
+
+ /**
+ * Finds and invokes a method with the given signature on the given
+ * bean. The signature of the method that's invoked is first taken
+ * as the types of the args, but if that fails, this tries to convert
+ * any primitive wrapper type args to their primitive counterparts
+ * to see whether a method exists that way. If it does, done.
+ *
+ * @param bean the object on which to invoke the method
+ * @param methodName name of the method
+ * @param args arguments to be given to the method
+ *
+ * @return the result of invoking the method, if any
+ *
+ * @exception BSFException if something goes wrong
+ */
+ public static Object callBeanMethod (Object bean, String methodName,
+ Object[] args) throws BSFException {
+ Class[] argTypes = null;
+ // determine arg types. note that a null argtype
+ // matches any object type
+
+ if (args != null) {
+ argTypes = new Class[args.length];
+ for (int i = 0; i < args.length; i++) {
+ argTypes[i] = (args[i] == null) ? null : args[i].getClass ();
+ }
+ }
+
+ // we want to allow a static call to occur on an object, similar
+ // to what Java allows. So isStaticOnly is set to false.
+ boolean isStaticOnly = false;
+ Class beanClass = (bean instanceof Class) ? (Class)bean :
+ bean.getClass ();
+
+ // now try to call method with the right signature
+ try {
+ Method m = null;
+
+ try {
+ m = MethodUtils.getMethod (beanClass, methodName, argTypes,
+ isStaticOnly);
+ } catch (NoSuchMethodException e) {
+ // ok, so that didn't work - now try converting any primitive
+ // wrapper types to their primitive counterparts
+ try {
+ // if args is null the NullPointerException will get caught
+ // below and the right thing'll happen .. ugly but works
+ for (int i = 0; i < args.length; i++) {
+ if (args[i] instanceof Number) {
+ // byte is convertible to all primitive numeric types,
+ // so this'll find anything in that order and the
+ // actual type will be that specified by the method decl
+ argTypes[i] = byte.class;
+ if(args[i] instanceof Float)
+ argTypes[i] = float.class;
+ else if(args[i] instanceof Double)
+ argTypes[i] = double.class;
+ }
+ else if (args[i] instanceof Boolean)
+ argTypes[i] = boolean.class;
+ else if (args[i] instanceof Character)
+ argTypes[i] = char.class;
+ }
+ m = MethodUtils.getMethod (beanClass, methodName,
+ argTypes, isStaticOnly);
+ } catch (Exception e2) {
+ // throw the original
+ throw e;
+ }
+ }
+
+ // call it, and return the result
+ return m.invoke (bean, args);
+
+ } catch (Exception e) {
+ // something went wrong while invoking method
+ Throwable t = (e instanceof InvocationTargetException) ?
+ ((InvocationTargetException)e).getTargetException () :
+ null;
+ throw new BSFException (BSFException.REASON_OTHER_ERROR,
+ "method invocation failed: " + e +
+ ((t==null) ? "" :
+ (" target exception: " + t)), t);
+ }
+ }
+
+ /**
+ * Creates a new bean. The signature of the constructor that's invoked
+ * is first taken as the types of the args, but if that fails, this tries
+ * to convert any primitive wrapper type args to their primitive
+ * counterparts to see whether a method exists that way. If it does, done.
+ *
+ * @param className fully qualified name of class to instantiate
+ * @param args array of constructor args (or null if none)
+ *
+ * @return the created bean
+ *
+ * @exception BSFException if something goes wrong (@see
+ * org.apache.cs.util.MethodUtils for the real
+ * exceptions that can occur).
+ */
+ public static Object createBean (String className, Object args[])
+ throws BSFException {
+ Bean obj;
+ Class[] argTypes = null;
+
+ if (args != null) {
+ argTypes = new Class[args.length];
+ for (int i = 0; i < args.length; i++) {
+ argTypes[i] = (args[i] != null) ? args[i].getClass () : null;
+ }
+ }
+
+ try {
+ try {
+ obj = ReflectionUtils.createBean (null, className,
+ argTypes, args);
+ return obj.value;
+ } catch (NoSuchMethodException me) {
+ // ok, so that didn't work - now try converting any primitive
+ // wrapper types to their primitive counterparts
+ try {
+ // if args is null the NullPointerException will get caught
+ // below and the right thing'll happen .. ugly but works
+ for (int i = 0; i < args.length; i++) {
+ if (args[i] instanceof Number)
+ argTypes[i] = byte.class;
+ else if (args[i] instanceof Boolean)
+ argTypes[i] = boolean.class;
+ else if (args[i] instanceof Character)
+ argTypes[i] = char.class;
+ }
+ obj = ReflectionUtils.createBean (null, className,
+ argTypes, args);
+ return obj.value;
+ } catch (Exception e) {
+ // throw the previous exception
+ throw me;
+ }
+ }
+ } catch (Exception e) {
+ throw new BSFException (BSFException.REASON_OTHER_ERROR,
+ e.getMessage (), e);
+ }
+ }
+
+ /**
+ * Given a class return the type signature string fragment for it.
+ * That is, return "I" for int, "J" for long, ... etc..
+ *
+ * @param cl class object for whom the signature fragment is needed.
+ *
+ * @return the string representing the type signature
+ */
+ public static String getTypeSignatureString (Class cl) {
+ if (cl.isPrimitive ()) {
+ if (cl == boolean.class)
+ return "Z";
+ else if (cl == byte.class)
+ return "B";
+ else if (cl == char.class)
+ return "C";
+ else if (cl == short.class)
+ return "S";
+ else if (cl == int.class)
+ return "I";
+ else if (cl == long.class)
+ return "J";
+ else if (cl == float.class)
+ return "F";
+ else if (cl == double.class)
+ return "D";
+ else
+ return "V";
+ } else {
+ StringBuffer sb = new StringBuffer ("L");
+ sb.append (cl.getName ());
+ sb.append (";");
+ return sb.toString().replace ('.', '/');
+ }
+ }
+
+ /**
+ * Load a class using the class loader of given manager. If that fails
+ * try using a class loader that loads from the tempdir of the manager.
+ *
+ * @param mgr BSFManager who's classLoader and tempDir props are
+ * consulted
+ * @param name name of the class to load
+ *
+ * @return the loaded class
+ *
+ * @exception BSFException if something goes wrong.
+ */
+ public static Class loadClass (BSFManager mgr, String name)
+ throws BSFException {
+ ClassLoader classLoader = mgr.getClassLoader ();
+
+ try {
+ return (classLoader == null) ? Class.forName (name)
+ : classLoader.loadClass (name);
+ } catch (ClassNotFoundException e) {
+ // try to load it from the temp dir using my own class loader
+ try {
+ if (bsfCL == null)
+ bsfCL = new BSFClassLoader ();
+ bsfCL.setTempDir (mgr.getTempDir ());
+ return bsfCL.loadClass (name);
+ } catch (ClassNotFoundException e2) {
+ throw new BSFException (BSFException.REASON_OTHER_ERROR,
+ "unable to load class '" + name + "':" + e, e);
+ }
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
