cvs commit: xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp XSPFormValidatorHelper.java

[bloritsch]

bloritsch    01/07/12 12:12:21

  Modified:    src/org/apache/cocoon/components/language/markup/xsp Tag:
                        cocoon_20_branch XSPFormValidatorHelper.java
  Log:
  Clean up cod on XSPFormValidatorHelper code.  You now only have to maintain
  one of each type of validation action.  Also, Null is implicitly Too Small, so I 
reflected
  that in the code.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.6   +19 -21    
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java
  
  Index: XSPFormValidatorHelper.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java,v
  retrieving revision 1.1.2.5
  retrieving revision 1.1.2.6
  diff -u -r1.1.2.5 -r1.1.2.6
  --- XSPFormValidatorHelper.java       2001/07/07 19:07:52     1.1.2.5
  +++ XSPFormValidatorHelper.java       2001/07/12 19:12:16     1.1.2.6
  @@ -37,7 +37,7 @@
    * The <code>ValidatorActionResult</code> object helper
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
  - * @version CVS $Revision: 1.1.2.5 $ $Date: 2001/07/07 19:07:52 $
  + * @version CVS $Revision: 1.1.2.6 $ $Date: 2001/07/12 19:12:16 $
    */
   public class XSPFormValidatorHelper {
     /**
  @@ -204,8 +204,7 @@
                Map objectModel
                )
       {
  -    boolean ok = false;
  -    return getParamResult(objectModel, 
current_parameter).equals(ValidatorActionResult.OK);
  +        return isOK(objectModel, current_parameter);
       }
   
   
  @@ -224,8 +223,8 @@
                String name
                )
       {
  -    boolean ok = false;
  -    return getParamResult(objectModel, name).ge(ValidatorActionResult.ERROR);
  +        boolean ok = false;
  +        return getParamResult(objectModel, name).ge(ValidatorActionResult.ERROR);
       }
   
     /**
  @@ -241,8 +240,7 @@
                Map objectModel
                )
       {
  -    boolean ok = false;
  -    return getParamResult(objectModel, 
current_parameter).ge(ValidatorActionResult.ERROR);
  +        return isError(objectModel, current_parameter);
       }
   
   
  @@ -277,8 +275,7 @@
                Map objectModel
                )
       {
  -    boolean ok = false;
  -    return getParamResult(objectModel, 
current_parameter).equals(ValidatorActionResult.ISNULL);
  +        return isNull(objectModel, current_parameter);
       }
   
   
  @@ -297,8 +294,13 @@
                String name
                )
       {
  -    boolean ok = false;
  -    return getParamResult(objectModel, name).equals(ValidatorActionResult.TOOSMALL);
  +        boolean ok = getParamResult(objectModel, 
name).equals(ValidatorActionResult.TOOSMALL);
  +
  +        if (!ok) {
  +            ok = isNull(objectModel, name);
  +        }
  +
  +        return ok;
       }
   
     /**
  @@ -314,8 +316,7 @@
                Map objectModel
                )
       {
  -    boolean ok = false;
  -    return getParamResult(objectModel, 
current_parameter).equals(ValidatorActionResult.TOOSMALL);
  +        return isTooSmall(objectModel, current_parameter);
       }
   
   
  @@ -351,8 +352,7 @@
                Map objectModel
                )
       {
  -    boolean ok = false;
  -    return getParamResult(objectModel, 
current_parameter).equals(ValidatorActionResult.TOOLARGE);
  +        return isTooLarge(objectModel, current_parameter);
       }
   
   
  @@ -372,8 +372,8 @@
                String name
                )
       {
  -    boolean ok = false;
  -    return getParamResult(objectModel, name).equals(ValidatorActionResult.NOMATCH);
  +        boolean ok = false;
  +        return getParamResult(objectModel, 
name).equals(ValidatorActionResult.NOMATCH);
       }
   
     /**
  @@ -390,8 +390,7 @@
                Map objectModel
                )
       {
  -    boolean ok = false;
  -    return getParamResult(objectModel, 
current_parameter).equals(ValidatorActionResult.NOMATCH);
  +       return isNoMatch(objectModel, current_parameter);
       }
   
   
  @@ -423,8 +422,7 @@
                Map objectModel
                )
       {
  -    boolean ok = false;
  -    return getParamResult(objectModel, 
current_parameter).equals(ValidatorActionResult.NOTPRESENT);
  +        return isNotPresent(objectModel, current_parameter);
       }
   
   
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]