Commit 627851cd by Jeroen Frijters Committed by Michael Koch

2005-02-22 Jeroen Frijters <jeroen@frijters.net>

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

From-SVN: r95393
parent a010a295
2005-02-22 Jeroen Frijters <jeroen@frijters.net>
* java/beans/PropertyDescriptor.java
(PropertyDescriptor,setReadMethod): Set propertyType.
2005-02-22 Michael Koch <konqueror@gmx.de> 2005-02-22 Michael Koch <konqueror@gmx.de>
* java/nio/DirectByteBufferImpl.java * java/nio/DirectByteBufferImpl.java
......
...@@ -126,7 +126,7 @@ public class PropertyDescriptor extends FeatureDescriptor ...@@ -126,7 +126,7 @@ public class PropertyDescriptor extends FeatureDescriptor
} }
// finally check the methods compatibility // finally check the methods compatibility
checkMethods(getMethod, setMethod); propertyType = checkMethods(getMethod, setMethod);
} }
/** Create a new PropertyDescriptor by introspection. /** Create a new PropertyDescriptor by introspection.
...@@ -178,7 +178,7 @@ public class PropertyDescriptor extends FeatureDescriptor ...@@ -178,7 +178,7 @@ public class PropertyDescriptor extends FeatureDescriptor
"Cannot find a setter method called " + setMethodName); "Cannot find a setter method called " + setMethodName);
} }
checkMethods(getMethod, setMethod); propertyType = checkMethods(getMethod, setMethod);
} }
/** Create a new PropertyDescriptor using explicit Methods. /** Create a new PropertyDescriptor using explicit Methods.
...@@ -205,17 +205,7 @@ public class PropertyDescriptor extends FeatureDescriptor ...@@ -205,17 +205,7 @@ public class PropertyDescriptor extends FeatureDescriptor
setName(name); setName(name);
getMethod = readMethod; getMethod = readMethod;
setMethod = writeMethod; setMethod = writeMethod;
propertyType = checkMethods(getMethod, setMethod);
if (getMethod != null)
{
this.propertyType = getMethod.getReturnType();
}
else if (setMethod != null)
{
this.propertyType = setMethod.getParameterTypes()[0];
}
checkMethods(getMethod, setMethod);
} }
/** Get the property type. /** Get the property type.
...@@ -250,7 +240,7 @@ public class PropertyDescriptor extends FeatureDescriptor ...@@ -250,7 +240,7 @@ public class PropertyDescriptor extends FeatureDescriptor
*/ */
public void setReadMethod(Method readMethod) throws IntrospectionException public void setReadMethod(Method readMethod) throws IntrospectionException
{ {
checkMethods(readMethod, setMethod); propertyType = checkMethods(readMethod, setMethod);
getMethod = readMethod; getMethod = readMethod;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment