cvs commit: jakarta-struts/src/share/org/apache/struts/util ConvertUtils.java

[craigmcc]

craigmcc    01/01/27 17:18:55

  Modified:    src/share/org/apache/struts/util ConvertUtils.java
  Log:
  Add support for Short.  TODO: Deal with the "settable default values"
  addition, but implement it slightly differently.
  
  Submitted by: Ralph Schaer <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.4       +27 -4     
jakarta-struts/src/share/org/apache/struts/util/ConvertUtils.java
  
  Index: ConvertUtils.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/ConvertUtils.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConvertUtils.java 2001/01/28 01:07:57     1.3
  +++ ConvertUtils.java 2001/01/28 01:18:54     1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/ConvertUtils.java,v 1.3 
2001/01/28 01:07:57 craigmcc Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/01/28 01:07:57 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/ConvertUtils.java,v 1.4 
2001/01/28 01:18:54 craigmcc Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/01/28 01:18:54 $
    *
    * ====================================================================
    *
  @@ -73,7 +73,7 @@
    * @author Craig R. McClanahan
    * @author Ralph Schaer
    * @author Chris Audley
  - * @version $Revision: 1.3 $ $Date: 2001/01/28 01:07:57 $
  + * @version $Revision: 1.4 $ $Date: 2001/01/28 01:18:54 $
    */
   
   public final class ConvertUtils {
  @@ -147,6 +147,8 @@
               return (convertByte(value));
           } else if (clazz == Float.TYPE) {
               return (convertFloat(value));
  +        } else if (clazz == Short.TYPE) {
  +            return (convertShort(value));
           } else {
               if (value == null)
                   return ((String) null);
  @@ -215,6 +217,11 @@
               for (int i = 0; i < len; i++)
                   array[i] = convertFloat(values[i]).floatValue();
               return (array);
  +        } else if (type == Short.TYPE) {
  +            short array[] = new short[len];
  +            for (int i = 0; i < len; i++)
  +                array[i] = convertShort(values[i]).shortValue();
  +            return (array);
           } else {
               if (values == null)
                   return ((String[]) null);
  @@ -343,6 +350,22 @@
               return (new Long(value));
           } catch (NumberFormatException e) {
               return (new Long(0));
  +        }
  +
  +    }
  +
  +
  +    /**
  +     * Convert a String value to a corresponding Short value.
  +     *
  +     * @param value The string value to convert
  +     */
  +    private static Short convertShort(String value) {
  +
  +        try {
  +            return (new Short(value));
  +        } catch (NumberFormatException e) {
  +            return (new Short((short) 0));
           }
   
       }