svn commit: r949315 - in /tapestry/tapestry5/trunk/tapestry-ioc/src: main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java test/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImplTest.java

[drobiazko]

Author: drobiazko
Date: Fri May 28 23:06:01 2010
New Revision: 949315

URL: http://svn.apache.org/viewvc?rev=949315&view=rev
Log:
TAP5-1166: ClassPropertyAdapterImpl should skip static fields

Modified:
    
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
    
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImplTest.java

Modified: 
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java?rev=949315&r1=949314&r2=949315&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
 Fri May 28 23:06:01 2010
@@ -23,6 +23,7 @@ import org.apache.tapestry5.ioc.services
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.List;
 import java.util.Map;
 
@@ -59,6 +60,9 @@ public class ClassPropertyAdapterImpl im
 
         for (Field f : beanType.getFields())
         {
+            if(Modifier.isStatic(f.getModifiers()))
+                continue;
+            
             String name = f.getName();
 
             if (!adapters.containsKey(name))

Modified: 
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImplTest.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImplTest.java?rev=949315&r1=949314&r2=949315&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImplTest.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImplTest.java
 Fri May 28 23:06:01 2010
@@ -41,6 +41,8 @@ public class PropertyAccessImplTest exte
 
     public static class Bean
     {
+        public static Double PI = 3.14;
+        
         @DataType("fred")
         @Validate("field-value-overridden")
         private int value;