You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/06/19 16:56:30 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model BigDecimalField.java DoubleField.java FloatField.java StringField.java StringKeyField.java

henning     2003/06/19 07:56:30

  Modified:    src/java/org/apache/turbine/services/intake/model
                        BigDecimalField.java DoubleField.java
                        FloatField.java StringField.java
                        StringKeyField.java
  Log:
  Adding the new validator classes to the various fields in the model.
  
  Patch donated by Colin Chalmers <co...@maxware.nl>
  
  Revision  Changes    Path
  1.9       +4 -4      jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BigDecimalField.java
  
  Index: BigDecimalField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/BigDecimalField.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- BigDecimalField.java	7 Apr 2003 15:37:55 -0000	1.8
  +++ BigDecimalField.java	19 Jun 2003 14:56:30 -0000	1.9
  @@ -61,7 +61,7 @@
   import org.apache.commons.lang.StringUtils;
   
   import org.apache.turbine.services.intake.IntakeException;
  -import org.apache.turbine.services.intake.validator.NumberValidator;
  +import org.apache.turbine.services.intake.validator.BigDecimalValidator;
   import org.apache.turbine.services.intake.xmlmodel.XmlField;
   
   /**
  @@ -111,7 +111,7 @@
        */
       protected String getDefaultValidator()
       {
  -        return NumberValidator.class.getName();
  +        return BigDecimalValidator.class.getName();
       }
   
       /**
  @@ -125,7 +125,7 @@
               BigDecimal[] values = new BigDecimal[inputs.length];
               for (int i = 0; i < inputs.length; i++)
               {
  -                values[i] = StringUtils.isNotEmpty(inputs[i]) 
  +                values[i] = StringUtils.isNotEmpty(inputs[i])
                           ? canonicalizeDecimalInput(inputs[i]) : null;
               }
               setTestValue(values);
  
  
  
  1.6       +4 -4      jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DoubleField.java
  
  Index: DoubleField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/DoubleField.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DoubleField.java	7 Apr 2003 15:37:55 -0000	1.5
  +++ DoubleField.java	19 Jun 2003 14:56:30 -0000	1.6
  @@ -57,7 +57,7 @@
   import org.apache.commons.lang.StringUtils;
   
   import org.apache.turbine.services.intake.IntakeException;
  -import org.apache.turbine.services.intake.validator.NumberValidator;
  +import org.apache.turbine.services.intake.validator.DoubleValidator;
   import org.apache.turbine.services.intake.xmlmodel.XmlField;
   
   /**
  @@ -106,7 +106,7 @@
        */
       protected String getDefaultValidator()
       {
  -        return NumberValidator.class.getName();
  +        return DoubleValidator.class.getName();
       }
   
       /**
  @@ -120,7 +120,7 @@
               Double[] values = new Double[inputs.length];
               for (int i = 0; i < inputs.length; i++)
               {
  -                values[i] = StringUtils.isNotEmpty(inputs[i]) 
  +                values[i] = StringUtils.isNotEmpty(inputs[i])
                           ? new Double(inputs[i]) : null;
               }
               setTestValue(values);
  
  
  
  1.8       +4 -4      jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FloatField.java
  
  Index: FloatField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/FloatField.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FloatField.java	7 Apr 2003 15:37:55 -0000	1.7
  +++ FloatField.java	19 Jun 2003 14:56:30 -0000	1.8
  @@ -57,7 +57,7 @@
   import org.apache.commons.lang.StringUtils;
   
   import org.apache.turbine.services.intake.IntakeException;
  -import org.apache.turbine.services.intake.validator.NumberValidator;
  +import org.apache.turbine.services.intake.validator.FloatValidator;
   import org.apache.turbine.services.intake.xmlmodel.XmlField;
   
   /**
  @@ -110,7 +110,7 @@
        */
       protected String getDefaultValidator()
       {
  -        return NumberValidator.class.getName();
  +        return FloatValidator.class.getName();
       }
   
       /**
  @@ -124,7 +124,7 @@
               Float[] values = new Float[inputs.length];
               for (int i = 0; i < inputs.length; i++)
               {
  -                values[i] = StringUtils.isNotEmpty(inputs[i]) 
  +                values[i] = StringUtils.isNotEmpty(inputs[i])
                           ? new Float(inputs[i]) : null;
               }
               setTestValue(values);
  
  
  
  1.8       +12 -1     jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringField.java
  
  Index: StringField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringField.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- StringField.java	7 Apr 2003 15:37:55 -0000	1.7
  +++ StringField.java	19 Jun 2003 14:56:30 -0000	1.8
  @@ -57,6 +57,7 @@
   import org.apache.commons.lang.StringUtils;
   
   import org.apache.turbine.services.intake.IntakeException;
  +import org.apache.turbine.services.intake.validator.StringValidator;
   import org.apache.turbine.services.intake.xmlmodel.XmlField;
   
   /**
  @@ -82,6 +83,16 @@
               throws IntakeException
       {
           super(field, group);
  +    }
  +
  +    /**
  +     * Produces the fully qualified class name of the default validator.
  +     *
  +     * @return class name of the default validator
  +     */
  +    protected String getDefaultValidator()
  +    {
  +        return StringValidator.class.getName();
       }
   
       /**
  
  
  
  1.10      +17 -3     jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringKeyField.java
  
  Index: StringKeyField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/StringKeyField.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- StringKeyField.java	7 Apr 2003 15:37:55 -0000	1.9
  +++ StringKeyField.java	19 Jun 2003 14:56:30 -0000	1.10
  @@ -59,6 +59,7 @@
   import org.apache.torque.om.StringKey;
   
   import org.apache.turbine.services.intake.IntakeException;
  +import org.apache.turbine.services.intake.validator.StringValidator;
   import org.apache.turbine.services.intake.xmlmodel.XmlField;
   
   /**
  @@ -66,6 +67,7 @@
    * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
    * @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
    * @version $Id$
  + * @deprecated Use String instead
    */
   public class StringKeyField
           extends Field
  @@ -85,6 +87,16 @@
       }
   
       /**
  +     * Produces the fully qualified class name of the default validator.
  +     *
  +     * @return class name of the default validator
  +     */
  +    protected String getDefaultValidator()
  +    {
  +        return StringValidator.class.getName();
  +    }
  +
  +    /**
        * Sets the default value for a String field
        *
        * @param prop Parameter for the default values
  @@ -110,14 +122,16 @@
               StringKey[] ival = new StringKey[ss.length];
               for (int i = 0; i < ss.length; i++)
               {
  -                ival[i] = (StringUtils.isNotEmpty(ss[i])) ? new StringKey(ss[i]) : null;
  +                ival[i] = (StringUtils.isNotEmpty(ss[i]))
  +                        ? new StringKey(ss[i]) : null;
               }
               setTestValue(ival);
           }
           else
           {
               String val = parser.getString(getKey());
  -            setTestValue((StringUtils.isNotEmpty(val)) ? new StringKey(val) : null);
  +            setTestValue((StringUtils.isNotEmpty(val))
  +                    ? new StringKey(val) : null);
           }
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org


Re: cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model BigDecimalField.java DoubleField.java FloatField.java StringField.java StringKeyField.java

Posted by Colin Chalmers <co...@maxware.nl>.
Yup youre right should be StringField

colin

----- Original Message -----
From: "Quinton McCombs" <qm...@nequalsone.com>
To: "'Turbine Developers List'" <tu...@jakarta.apache.org>
Sent: Thursday, June 19, 2003 6:01 PM
Subject: RE: cvs commit:
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model
BigDecimalField.java DoubleField.java FloatField.java StringField.java
StringKeyField.java


> > -----Original Message-----
> > From: henning@apache.org [mailto:henning@apache.org]
> > Sent: Thursday, June 19, 2003 9:57 AM
> > To: jakarta-turbine-2-cvs@apache.org
> > Subject: cvs commit:
> > jakarta-turbine-2/src/java/org/apache/turbine/services/intake/
> > model BigDecimalField.java DoubleField.java FloatField.java
> > StringField.java StringKeyField.java
> >
> >
> > henning     2003/06/19 07:56:30
> >
> >   Modified:    src/java/org/apache/turbine/services/intake/model
> >                         BigDecimalField.java DoubleField.java
> >                         FloatField.java StringField.java
> >                         StringKeyField.java
> >   Log:
> >   Adding the new validator classes to the various fields in the model.
> >
> >   Patch donated by Colin Chalmers <co...@maxware.nl>
> >
>
> [snip]
>
> >
> >   Index: StringKeyField.java
> >   ===================================================================
> >   RCS file:
> > /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/servic
> > es/intake/model/StringKeyField.java,v
> >   retrieving revision 1.9
> >   retrieving revision 1.10
> >   diff -u -r1.9 -r1.10
> >   --- StringKeyField.java 7 Apr 2003 15:37:55 -0000 1.9
> >   +++ StringKeyField.java 19 Jun 2003 14:56:30 -0000 1.10
> >   @@ -59,6 +59,7 @@
> >    import org.apache.torque.om.StringKey;
> >
> >    import org.apache.turbine.services.intake.IntakeException;
> >   +import
> > org.apache.turbine.services.intake.validator.StringValidator;
> >    import org.apache.turbine.services.intake.xmlmodel.XmlField;
> >
> >    /**
> >   @@ -66,6 +67,7 @@
> >     * @author <a href="mailto:hps@intermeta.de">Henning P.
> > Schmiedehausen</a>
> >     * @author <a href="mailto:quintonm@bellsouth.net">Quinton
> > McCombs</a>
> >     * @version $Id$
> >   + * @deprecated Use String instead
>
> Don't you mean 'Use StringField instead' ?
>
>
> >     */
> >    public class StringKeyField
> >            extends Field
> >   @@ -85,6 +87,16 @@
> >        }
> >
> >        /**
> >   +     * Produces the fully qualified class name of the
> > default validator.
> >   +     *
> >   +     * @return class name of the default validator
> >   +     */
> >   +    protected String getDefaultValidator()
> >   +    {
> >   +        return StringValidator.class.getName();
> >   +    }
> >   +
> >   +    /**
> >         * Sets the default value for a String field
> >         *
> >         * @param prop Parameter for the default values
> >   @@ -110,14 +122,16 @@
> >                StringKey[] ival = new StringKey[ss.length];
> >                for (int i = 0; i < ss.length; i++)
> >                {
> >   -                ival[i] = (StringUtils.isNotEmpty(ss[i]))
> > ? new StringKey(ss[i]) : null;
> >   +                ival[i] = (StringUtils.isNotEmpty(ss[i]))
> >   +                        ? new StringKey(ss[i]) : null;
> >                }
> >                setTestValue(ival);
> >            }
> >            else
> >            {
> >                String val = parser.getString(getKey());
> >   -            setTestValue((StringUtils.isNotEmpty(val)) ?
> > new StringKey(val) : null);
> >   +            setTestValue((StringUtils.isNotEmpty(val))
> >   +                    ? new StringKey(val) : null);
> >            }
> >        }
> >    }
> >
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: turbine-dev-help@jakarta.apache.org
> >
> >
> >
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: turbine-dev-help@jakarta.apache.org
>
>


---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org


RE: cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model BigDecimalField.java DoubleField.java FloatField.java StringField.java StringKeyField.java

Posted by Quinton McCombs <qm...@nequalsone.com>.
> -----Original Message-----
> From: henning@apache.org [mailto:henning@apache.org] 
> Sent: Thursday, June 19, 2003 9:57 AM
> To: jakarta-turbine-2-cvs@apache.org
> Subject: cvs commit: 
> jakarta-turbine-2/src/java/org/apache/turbine/services/intake/
> model BigDecimalField.java DoubleField.java FloatField.java 
> StringField.java StringKeyField.java
> 
> 
> henning     2003/06/19 07:56:30
> 
>   Modified:    src/java/org/apache/turbine/services/intake/model
>                         BigDecimalField.java DoubleField.java
>                         FloatField.java StringField.java
>                         StringKeyField.java
>   Log:
>   Adding the new validator classes to the various fields in the model.
>   
>   Patch donated by Colin Chalmers <co...@maxware.nl>
>   

[snip]

>   
>   Index: StringKeyField.java
>   ===================================================================
>   RCS file: 
> /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/servic
> es/intake/model/StringKeyField.java,v
>   retrieving revision 1.9
>   retrieving revision 1.10
>   diff -u -r1.9 -r1.10
>   --- StringKeyField.java	7 Apr 2003 15:37:55 -0000	1.9
>   +++ StringKeyField.java	19 Jun 2003 14:56:30 -0000	1.10
>   @@ -59,6 +59,7 @@
>    import org.apache.torque.om.StringKey;
>    
>    import org.apache.turbine.services.intake.IntakeException;
>   +import 
> org.apache.turbine.services.intake.validator.StringValidator;
>    import org.apache.turbine.services.intake.xmlmodel.XmlField;
>    
>    /**
>   @@ -66,6 +67,7 @@
>     * @author <a href="mailto:hps@intermeta.de">Henning P. 
> Schmiedehausen</a>
>     * @author <a href="mailto:quintonm@bellsouth.net">Quinton 
> McCombs</a>
>     * @version $Id$
>   + * @deprecated Use String instead

Don't you mean 'Use StringField instead' ?


>     */
>    public class StringKeyField
>            extends Field
>   @@ -85,6 +87,16 @@
>        }
>    
>        /**
>   +     * Produces the fully qualified class name of the 
> default validator.
>   +     *
>   +     * @return class name of the default validator
>   +     */
>   +    protected String getDefaultValidator()
>   +    {
>   +        return StringValidator.class.getName();
>   +    }
>   +
>   +    /**
>         * Sets the default value for a String field
>         *
>         * @param prop Parameter for the default values
>   @@ -110,14 +122,16 @@
>                StringKey[] ival = new StringKey[ss.length];
>                for (int i = 0; i < ss.length; i++)
>                {
>   -                ival[i] = (StringUtils.isNotEmpty(ss[i])) 
> ? new StringKey(ss[i]) : null;
>   +                ival[i] = (StringUtils.isNotEmpty(ss[i]))
>   +                        ? new StringKey(ss[i]) : null;
>                }
>                setTestValue(ival);
>            }
>            else
>            {
>                String val = parser.getString(getKey());
>   -            setTestValue((StringUtils.isNotEmpty(val)) ? 
> new StringKey(val) : null);
>   +            setTestValue((StringUtils.isNotEmpty(val))
>   +                    ? new StringKey(val) : null);
>            }
>        }
>    }
>   
>   
>   
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: turbine-dev-help@jakarta.apache.org
> 
> 
> 


---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org