[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fix for PropertyDescriptor

[Kaffe CVS]

PatchSet 5569 
Date: 2004/12/08 18:24:46
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: fix for PropertyDescriptor

2004-12-08  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/beans/PropertyDescriptor.java:
        Resynced with GNU Classpath.

        2004-12-07  Jeroen Frijters  <jeroen at frijters.net>

        * java/beans/PropertyDescriptor.java
        (PropertyDescriptor,setReadMethod): Set propertyType.

Members: 
	ChangeLog:1.3115->1.3116 
	libraries/javalib/java/beans/PropertyDescriptor.java:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3115 kaffe/ChangeLog:1.3116
--- kaffe/ChangeLog:1.3115	Wed Dec  8 18:03:35 2004
+++ kaffe/ChangeLog	Wed Dec  8 18:24:46 2004
@@ -1,5 +1,15 @@
 2004-12-08  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/beans/PropertyDescriptor.java:
+	Resynced with GNU Classpath.
+	
+	2004-12-07  Jeroen Frijters  <jeroen at frijters.net>
+
+	* java/beans/PropertyDescriptor.java
+	(PropertyDescriptor,setReadMethod): Set propertyType.
+	
+2004-12-08  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/javax/imageio/stream/FileCacheImageInputStream.java,
 	libraries/javalib/javax/imageio/stream/FileCacheImageOutputStream.java,
 	libraries/javalib/javax/imageio/stream/FileImageInputStream.java,
Index: kaffe/libraries/javalib/java/beans/PropertyDescriptor.java
diff -u kaffe/libraries/javalib/java/beans/PropertyDescriptor.java:1.8 kaffe/libraries/javalib/java/beans/PropertyDescriptor.java:1.9
--- kaffe/libraries/javalib/java/beans/PropertyDescriptor.java:1.8	Mon Nov 15 01:20:46 2004
+++ kaffe/libraries/javalib/java/beans/PropertyDescriptor.java	Wed Dec  8 18:24:48 2004
@@ -126,7 +126,7 @@
         }
 
         // finally check the methods compatibility        
-        checkMethods(getMethod, setMethod);
+        propertyType = checkMethods(getMethod, setMethod);
     }
 
     /** Create a new PropertyDescriptor by introspection.
@@ -178,7 +178,7 @@
                 "Cannot find a setter method called " + setMethodName);
         }
 
-        checkMethods(getMethod, setMethod);
+        propertyType = checkMethods(getMethod, setMethod);
     }
 
     /** Create a new PropertyDescriptor using explicit Methods.
@@ -205,17 +205,7 @@
         setName(name);
         getMethod = readMethod;
         setMethod = writeMethod;
-
-        if (getMethod != null)
-        {
-            this.propertyType = getMethod.getReturnType();
-        }
-        else if (setMethod != null)
-        {
-            this.propertyType = setMethod.getParameterTypes()[0];
-        }
-
-        checkMethods(getMethod, setMethod);
+        propertyType = checkMethods(getMethod, setMethod);
     }
 
     /** Get the property type.
@@ -250,7 +240,7 @@
      */
     public void setReadMethod(Method readMethod) throws IntrospectionException
     {
-        checkMethods(readMethod, setMethod);
+        propertyType = checkMethods(readMethod, setMethod);
 
         getMethod = readMethod;
     }