svn commit: r559203 - in /incubator/wicket/trunk/jdk-1.4/wicket/src: main/java/org/apache/wicket/util/lang/PropertyResolver.java test/java/org/apache/wicket/util/lang/PropertyResolverTest.java

[knopp]

Author: knopp
Date: Tue Jul 24 13:56:24 2007
New Revision: 559203

URL: http://svn.apache.org/viewvc?view=rev&rev=559203
Log:
WICKET-668

Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
    
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java?view=diff&rev=559203&r1=559202&r2=559203
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/lang/PropertyResolver.java
 Tue Jul 24 13:56:24 2007
@@ -994,6 +994,7 @@
                        this.getMethod = getMethod;
                        this.getMethod.setAccessible(true);
                        this.field = field;
+                       setMethod = findSetter(getMethod, 
getMethod.getDeclaringClass());
                }
 
                /**
@@ -1027,10 +1028,6 @@
                public final void setValue(final Object object, final Object 
value,
                                PropertyResolverConverter converter)
                {
-                       if (setMethod == null)
-                       {
-                               setMethod = findSetter(getMethod, 
object.getClass());
-                       }
                        if (setMethod != null)
                        {
                                Object converted = converter.convert(value, 
getMethod.getReturnType());
@@ -1104,11 +1101,6 @@
                 */
                public Object newValue(Object object)
                {
-                       if (setMethod == null)
-                       {
-                               setMethod = findSetter(getMethod, 
object.getClass());
-                       }
-
                        if (setMethod == null)
                        {
                                log.warn("Null setMethod");

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java?view=diff&rev=559203&r1=559202&r2=559203
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/util/lang/PropertyResolverTest.java
 Tue Jul 24 13:56:24 2007
@@ -444,7 +444,7 @@
                
                // FIXME: We shouldn't need to run this first in order for the 
getName() stuff to work.
                // See WICKET-668 for details.
-               PropertyResolver.setValue("number", address, new Integer(1), 
CONVERTER);
+               //PropertyResolver.setValue("number", address, new Integer(1), 
CONVERTER);
                
                Method method = PropertyResolver.getPropertySetter("number", 
address);
                assertEquals(method.getName(), "setNumber");