svn commit: r951867 - in /pivot/trunk/core/src/org/apache/pivot: beans/BeanAdapter.java serialization/CSVSerializer.java

[gb...@apache.org]

Author: gbrown
Date: Sun Jun  6 14:25:42 2010
New Revision: 951867

URL: http://svn.apache.org/viewvc?rev=951867&view=rev
Log:
Resolve issues PIVOT-518 and PIVOT-519.

Modified:
    pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java
    pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java

Modified: pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java?rev=951867&r1=951866&r2=951867&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/beans/BeanAdapter.java Sun Jun  6 14:25:42 2010
@@ -581,7 +581,7 @@ public class BeanAdapter implements Map<
     }
 
     /**
-     * Returns the public, non-static field for a property. Note that fields
+     * Returns the public, non-static fields for a property. Note that fields
      * will only be consulted for bean properties after bean methods.
      *
      * @param type
@@ -592,7 +592,7 @@ public class BeanAdapter implements Map<
      *
      * @return
      * The field, or <tt>null</tt> if the field does not exist, or is
-     * non-public or static
+     * non-public or static.
      */
     public static Field getField(Class<?> type, String fieldName) {
         Field field = null;
@@ -602,10 +602,9 @@ public class BeanAdapter implements Map<
 
             int modifiers = field.getModifiers();
 
-            // Exclude non-public, static, and final fields
+            // Exclude non-public and static fields
             if ((modifiers & Modifier.PUBLIC) == 0
-                || (modifiers & Modifier.STATIC) > 0
-                || (modifiers & Modifier.FINAL) > 0) {
+                || (modifiers & Modifier.STATIC) > 0) {
                 field = null;
             }
         } catch (NoSuchFieldException exception) {

Modified: pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java
URL: http://svn.apache.org/viewvc/pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java?rev=951867&r1=951866&r2=951867&view=diff
==============================================================================
--- pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java (original)
+++ pivot/trunk/core/src/org/apache/pivot/serialization/CSVSerializer.java Sun Jun  6 14:25:42 2010
@@ -400,6 +400,9 @@ public class CSVSerializer implements Se
             c = reader.read();
         }
 
+        // Trim the value
+        value = value.trim();
+
         return value;
     }