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

Timestamp:

01/03/09 13:17:22 (14 years ago)

Author:

Mark Evenson

Message:

Revert inadvertent r11528.

File:

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

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

@@ -76 +76 @@
     (apply #'%jnew-proxy interface method-names-and-defs)))
 
-(defun jmake-invocation-handler (function)
-  (%jmake-invocation-handler function))
- 
-(when (autoloadp 'jmake-proxy)
-  (fmakunbound 'jmake-proxy))
- 
-(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."))
-
-(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))
-
-(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))
-
- (defmethod jmake-proxy (interface (implementation package) &optional lisp-this)
-   "Implements a Java interface mapping Java method names to symbols
-in a given package. javaMethodName is mapped to a JAVA-METHOD-NAME
-symbol. An error is signaled if no such symbol exists in the package,
-or if the symbol exists but does not name a function."
-
-   (flet ((java->lisp (name)
-      (with-output-to-string (str)
-        (let ((last-lower-p nil))
-    (map nil (lambda (char)
-         (let ((upper-p (char= (char-upcase char) char)))
-           (when (and last-lower-p upper-p)
-             (princ "-" str))
-           (setf last-lower-p (not upper-p))
-           (princ (char-upcase char) str)))
-         name)))))
-     (%jmake-proxy (jclass interface)
-       (jmake-invocation-handler 
-        (lambda (obj method &rest args)
-          (let ((sym (find-symbol
-          (java->lisp method)
-          implementation)))
-      (unless sym
-        (error "Symbol ~A, implementation of method ~A, not found in ~A"
-         (java->lisp method)
-         method
-         implementation))
-      (if (fboundp sym)
-          (apply (symbol-function sym) obj method args)
-          (error "Function ~A, implementation of method ~A, not found in ~A"
-           sym method implementation)))))
-       lisp-this)))
-
-(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-invocation-handler 
-     (lambda (obj method &rest args)
-       (let ((fn (gethash method implementation)))
-         (if fn
-       (apply fn obj args)
-       (error "Implementation for method ~A not found in ~A"
-        method implementation)))))
-    lisp-this))
- 
 (defun jobject-class (obj)
   "Returns the Java class that OBJ belongs to"
@@ -307 +234 @@
 
 (provide "JAVA-EXTENSIONS")
- (defun jproperty-value (obj prop)
-   (%jget-property-value obj prop))
- 
- (defun (setf jproperty-value) (value obj prop)
-   (%jset-property-value obj prop value))
-