Changeset 12022

Timestamp:

06/24/09 19:14:51 (14 years ago)

Author:

astalla

Message:

Better type conversion Lisp <-> Java for property getters/setters.

File:

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

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

@@ -756 +756 @@
             return (LispObject) value;
         } else if(value != null) {
-            return JavaObject.getInstance(value);
+            return JavaObject.getInstance(value, true);
         } else {
             return NIL;
@@ -779 +779 @@
     PropertyDescriptor pd = getPropertyDescriptor(obj, propertyName);
     Object jValue;
-    if(value == NIL) {
+    //TODO maybe we should do this in javaInstance(Class)
+    if(value instanceof JavaObject) {
+        jValue = value.javaInstance();
+    } else {
         if(Boolean.TYPE.equals(pd.getPropertyType()) ||
            Boolean.class.equals(pd.getPropertyType())) {
-      jValue = false;
+      jValue = value != NIL;
         } else {
-      jValue = null;
+      jValue = value != NIL ? value.javaInstance() : null;
         }
-    } else {
-        jValue = value.javaInstance();
     }
     pd.getWriteMethod().invoke(obj, jValue);