Changeset 14326

Timestamp:

12/17/12 15:22:09 (11 years ago)

Author:

Mark Evenson

Message:

Refactor java.beans.* out of Java.java.

Enables patches for building on Android to exclude source by
file-level compilation units.

Location:

trunk/abcl/src/org/armedbear/lisp

Files:

• Java.java (modified) (3 diffs)
• JavaBeans.java (added)

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

@@ -36 +36 @@
 import static org.armedbear.lisp.Lisp.*;
 
-import java.beans.BeanInfo;
-import java.beans.IntrospectionException;
-import java.beans.Introspector;
-import java.beans.PropertyDescriptor;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
@@ -1242 +1238 @@
     };
 
-    private static final Primitive JGET_PROPERTY_VALUE = new pf__jget_property_value();
-    @DocString(name="%jget-propety-value", args="java-object property-name",
-    doc="Gets a JavaBeans property on JAVA-OBJECT.\n" +
-        "SYSTEM-INTERNAL: Use jproperty-value instead.")
-    private static final class pf__jget_property_value extends Primitive
-    {
-        pf__jget_property_value() 
-        {
-      super("%jget-property-value", PACKAGE_JAVA, false,
-                  "java-object property-name");
-        }
-      
-        @Override
-        public LispObject execute(LispObject javaObject, LispObject propertyName) {
-      try {
-        Object obj = javaObject.javaInstance();
-        PropertyDescriptor pd = getPropertyDescriptor(obj, propertyName);
-        Object value = pd.getReadMethod().invoke(obj);
-        if(value instanceof LispObject) {
-            return (LispObject) value;
-        } else if(value != null) {
-            return JavaObject.getInstance(value, true);
-        } else {
-            return NIL;
-        }
-      } catch (Exception e) {
-                return error(new JavaException(e));
-      }
-        }
-    };
-    
-    private static final Primitive JSET_PROPERTY_VALUE = new pf__jset_property_value();
-    @DocString(name="%jset-propety-value", args="java-object property-name value",
-    doc="Sets a JavaBean property on JAVA-OBJECT.\n" +
-        "SYSTEM-INTERNAL: Use (setf jproperty-value) instead.")
-    private static final class pf__jset_property_value extends Primitive
-    {
-        pf__jset_property_value()
-        {
-      super("%jset-property-value", PACKAGE_JAVA, false,
-                  "java-object property-name value");
-        }
-      
-        @Override
-        public LispObject execute(LispObject javaObject, LispObject propertyName, LispObject value) {
-      Object obj = null;
-      try {
-    obj = javaObject.javaInstance();
-    PropertyDescriptor pd = getPropertyDescriptor(obj, propertyName);
-    Object jValue;
-    //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 = value != NIL;
-        } else {
-      jValue = value != NIL ? value.javaInstance() : null;
-        }
-    }
-    pd.getWriteMethod().invoke(obj, jValue);
-    return value;
-      } catch (Exception e) {
-            return error(new JavaException(e));
-      }
-        }
-    };
-
     private static final Primitive JRUN_EXCEPTION_PROTECTED = new pf_jrun_exception_protected();
     @DocString(name="jrun-exception-protected", args="closure",
@@ -1339 +1266 @@
     };
 
-    static PropertyDescriptor getPropertyDescriptor(Object obj, LispObject propertyName) throws IntrospectionException {
-        String prop = ((AbstractString) propertyName).getStringValue();
-        BeanInfo beanInfo = Introspector.getBeanInfo(obj.getClass());
-        for(PropertyDescriptor pd : beanInfo.getPropertyDescriptors()) {
-          if(pd.getName().equals(prop)) {
-            return pd;
-          }
-        }
-        error(new LispError("Property " + prop + " not found in " + obj));
-
-        return null; // not reached
-    }
-    
     private static Class classForName(String className) {
   return classForName(className, JavaClassLoader.getPersistentInstance());