Re: [cp-patches] FYI: Patch java/beans/PropertyDescriptor.java

[Robert Schuster]

Hi Jeroen,
can you tell me which regression the patch fixed. Its nothing bad with the patch I just try to find out what I have done wrong because it was me who fumbled on this class lately :-$

cu
Robert

Jeroen Frijters wrote:

Hi,

I committed the attached patch to fix a Mauve failure.

Regards,
Jeroen

2004-12-07  Jeroen Frijters  <address@hidden>

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

Index: java/beans/PropertyDescriptor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/PropertyDescriptor.java,v
retrieving revision 1.11
diff -u -r1.11 PropertyDescriptor.java
--- java/beans/PropertyDescriptor.java	13 Nov 2004 00:08:14 -0000	1.11
+++ java/beans/PropertyDescriptor.java	7 Dec 2004 15:31:13 -0000
@@ -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;
     }
  

_______________________________________________
Classpath-patches mailing list
address@hidden
http://lists.gnu.org/mailman/listinfo/classpath-patches