diff options
author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-22 14:06:53 +0000 |
---|---|---|
committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-22 14:06:53 +0000 |
commit | 309237c05c438f4d872caee1e15990e986d6a200 (patch) | |
tree | f9bf21cc86eaa4bedc99cb14bf3385139851a29f /libjava/java/beans | |
parent | d6b22e91afb6811fa5f2ce5b71c20e2d9f428374 (diff) | |
download | ppe42-gcc-309237c05c438f4d872caee1e15990e986d6a200.tar.gz ppe42-gcc-309237c05c438f4d872caee1e15990e986d6a200.zip |
2005-02-22 Jeroen Frijters <jeroen@frijters.net>
* java/beans/PropertyDescriptor.java
(PropertyDescriptor,setReadMethod): Set propertyType.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95393 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/beans')
-rw-r--r-- | libjava/java/beans/PropertyDescriptor.java | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/libjava/java/beans/PropertyDescriptor.java b/libjava/java/beans/PropertyDescriptor.java index 84c31763023..57ed4f8cadf 100644 --- a/libjava/java/beans/PropertyDescriptor.java +++ b/libjava/java/beans/PropertyDescriptor.java @@ -126,7 +126,7 @@ public class PropertyDescriptor extends FeatureDescriptor } // finally check the methods compatibility - checkMethods(getMethod, setMethod); + propertyType = checkMethods(getMethod, setMethod); } /** Create a new PropertyDescriptor by introspection. @@ -178,7 +178,7 @@ public class PropertyDescriptor extends FeatureDescriptor "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 @@ public class PropertyDescriptor extends FeatureDescriptor 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 class PropertyDescriptor extends FeatureDescriptor */ public void setReadMethod(Method readMethod) throws IntrospectionException { - checkMethods(readMethod, setMethod); + propertyType = checkMethods(readMethod, setMethod); getMethod = readMethod; } |