Changeset 12774 for trunk/abcl/src/org/armedbear/lisp/java.lisp

Timestamp:

07/01/10 21:02:45 (13 years ago)

Author:

astalla

Message:

Added support for implementing multiple interfaces using jmake-proxy

File:

• trunk/abcl/src/org/armedbear/lisp/java.lisp (modified) (3 diffs)

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

@@ -93 +93 @@
 
 (defgeneric jmake-proxy (interface implementation &optional lisp-this)
-  (:documentation "Returns a proxy Java object implementing the provided interface using methods implemented in Lisp - typically closures, but implementations are free to provide other mechanisms. You can pass an optional 'lisp-this' object that will be passed to the implementing methods as their first argument. If you don't provide this object, NIL will be used. The second argument of the Lisp methods is the name of the Java method being implemented. This has the implication that overloaded methods are merged, so you have to manually discriminate them if you want to. The remaining arguments are java-objects wrapping the method's parameters."))
+  (:documentation "Returns a proxy Java object implementing the provided interface(s) using methods implemented in Lisp - typically closures, but implementations are free to provide other mechanisms. You can pass an optional 'lisp-this' object that will be passed to the implementing methods as their first argument. If you don't provide this object, NIL will be used. The second argument of the Lisp methods is the name of the Java method being implemented. This has the implication that overloaded methods are merged, so you have to manually discriminate them if you want to. The remaining arguments are java-objects wrapping the method's parameters."))
+
+(defun canonicalize-jproxy-interfaces (ifaces)
+  (if (listp ifaces)
+      (mapcar #'jclass ifaces)
+      (list (jclass ifaces))))
+
 
 (defmethod jmake-proxy (interface invocation-handler &optional lisp-this)
   "Basic implementation that directly uses an invocation handler."
-  (%jmake-proxy (jclass interface) invocation-handler lisp-this))
+  (%jmake-proxy (canonicalize-jproxy-interfaces interface) invocation-handler lisp-this))
 
 (defmethod jmake-proxy (interface (implementation function) &optional lisp-this)
   "Implements a Java interface forwarding method calls to a Lisp function."
-  (%jmake-proxy (jclass interface) (jmake-invocation-handler implementation) lisp-this))
+  (%jmake-proxy (canonicalize-jproxy-interfaces interface) (jmake-invocation-handler implementation) lisp-this))
 
 (defmethod jmake-proxy (interface (implementation package) &optional lisp-this)
@@ -115 +121 @@
           (princ (char-upcase char) str)))
         name)))))
-    (%jmake-proxy (jclass interface)
+    (%jmake-proxy (canonicalize-jproxy-interfaces interface)
       (jmake-invocation-handler 
        (lambda (obj method &rest args)
@@ -134 +140 @@
 (defmethod jmake-proxy (interface (implementation hash-table) &optional lisp-this)
   "Implements a Java interface using closures in an hash-table keyed by Java method name."
-  (%jmake-proxy (jclass interface)
+  (%jmake-proxy (canonicalize-jproxy-interfaces interface)
     (jmake-invocation-handler 
      (lambda (obj method &rest args)