Changeset 12813

Timestamp:

07/19/10 21:04:23 (13 years ago)

Author:

astalla

Message:

Java interop, small improvement: the first argument to jnew can now also be a jclass reference.

File:

• trunk/abcl/src/org/armedbear/lisp/Java.java (modified) (1 diff)

trunk/abcl/src/org/armedbear/lisp/Java.java

@@ -524 +524 @@
         constructor = findConstructor(javaClass(classRef), args);
     } else {
-        constructor = (Constructor) JavaObject.getObject(classRef);
+        Object object = JavaObject.getObject(classRef);
+        if(object instanceof Constructor) {
+      constructor = (Constructor) object;
+        } else if(object instanceof Class<?>) {
+      constructor = findConstructor((Class<?>) object, args);
+        } else {
+      return type_error(classRef,
+            list(Symbol.OR,
+                 list(Symbol.JCLASS,
+                new SimpleString("java.lang.reflect.Constructor")),
+                 list(Symbol.JCLASS,
+                new SimpleString("java.lang.Class"))));
+        }
     }
                 Class[] argTypes = constructor.getParameterTypes();