click-commits mailing list archives

Author: sabob
Date: Thu Sep  2 07:26:51 2010
New Revision: 991825

URL: http://svn.apache.org/viewvc?rev=991825&view=rev
Log:
CLK-694. Use BigDecimal constructor for converting number based objects

Modified:
    click/trunk/click/framework/src/org/apache/click/util/ContainerUtils.java
    click/trunk/click/framework/src/org/apache/click/util/RequestTypeConverter.java

Modified: click/trunk/click/framework/src/org/apache/click/util/ContainerUtils.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/util/ContainerUtils.java?rev=991825&r1=991824&r2=991825&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/util/ContainerUtils.java (original)
+++ click/trunk/click/framework/src/org/apache/click/util/ContainerUtils.java Thu Sep  2 07:26:51
2010
@@ -893,7 +893,7 @@ public class ContainerUtils {
      * @param path the full expression path (used for logging purposes)
      * @return the getter method
      */
-    private final static Method findGetter(Object object, String property,
+    private static Method findGetter(Object object, String property,
         String path) {
 
         // Find the getter for property
@@ -933,7 +933,7 @@ public class ContainerUtils {
      * @param path the full expression path (used for logging)
      * @return the getter result
      */
-    private final static Object invokeGetter(Method getterMethod, Object source,
+    private static Object invokeGetter(Method getterMethod, Object source,
         String property, String path) {
 
         try {
@@ -963,7 +963,7 @@ public class ContainerUtils {
      * @param path the full expression path (used for logging purposes)
      * @return the setter method
      */
-    private final static Method findSetter(Object source,
+    private static Method findSetter(Object source,
         String property, Class<?> targetClass, String path) {
         Method method = null;
 
@@ -996,7 +996,7 @@ public class ContainerUtils {
      * @param property the setter method property name (used for logging)
      * @param path the full expression path (used for logging)
      */
-    private final static void invokeSetter(Method setterMethod, Object source,
+    private static void invokeSetter(Method setterMethod, Object source,
         Object target, String property, String path) {
 
         try {
@@ -1397,7 +1397,13 @@ public class ContainerUtils {
             }
             return OgnlOps.convertValue(value, toType);
         }
-        
+
+        /**
+     * Convert the given value into a BigDecimal.
+     *
+     * @param value the object to convert into a BigDecimal
+     * @return the converted BigDecimal value
+     */
         private BigDecimal bigDecValue( Object value ) {
             if (value == null)
                 return BigDecimal.valueOf(0L);
@@ -1406,10 +1412,7 @@ public class ContainerUtils {
                 return (BigDecimal)value;
             if ( c == BigInteger.class )
                 return new BigDecimal( (BigInteger)value );
-            if ( c.getSuperclass() == Number.class )
-                //return new BigDecimal( ((Number)value).doubleValue() );
-                return BigDecimal.valueOf(((Number)value).doubleValue());
-            if ( c == Boolean.class )
+                  if ( c == Boolean.class )
                 return BigDecimal.valueOf(((Boolean)value).booleanValue()? 1 : 0 );
             if ( c == Character.class )
                 return BigDecimal.valueOf(((Character)value).charValue() );

Modified: click/trunk/click/framework/src/org/apache/click/util/RequestTypeConverter.java
URL: http://svn.apache.org/viewvc/click/trunk/click/framework/src/org/apache/click/util/RequestTypeConverter.java?rev=991825&r1=991824&r2=991825&view=diff
==============================================================================
--- click/trunk/click/framework/src/org/apache/click/util/RequestTypeConverter.java (original)
+++ click/trunk/click/framework/src/org/apache/click/util/RequestTypeConverter.java Thu Sep
 2 07:26:51 2010
@@ -122,7 +122,7 @@ public class RequestTypeConverter implem
                     result = OgnlOps.bigIntValue(value);
 
                 } else if (toType == BigDecimal.class) {
-                    result = OgnlOps.bigDecValue(value);
+                    result = bigDecValue(value);
 
                 } else  if (toType == String.class) {
                     result = OgnlOps.stringValue(value);
@@ -264,4 +264,31 @@ public class RequestTypeConverter implem
         }
     }
 
+    /**
+     * Convert the given value into a BigDecimal.
+     *
+     * @param value the object to convert into a BigDecimal
+     * @return the converted BigDecimal value
+     */
+    private BigDecimal bigDecValue(Object value) {
+        if (value == null) {
+            return BigDecimal.valueOf(0L);
+        }
+        Class<?> c = value.getClass();
+        if (c == BigDecimal.class) {
+            return (BigDecimal) value;
+        }
+        if (c == BigInteger.class) {
+            return new BigDecimal((BigInteger) value);
+        }
+
+        if (c == Boolean.class) {
+            return BigDecimal.valueOf(((Boolean) value).booleanValue() ? 1 : 0);
+        }
+        if (c == Character.class) {
+            return BigDecimal.valueOf(((Character) value).charValue());
+        }
+
+        return new BigDecimal(value.toString().trim());
+    }
 }