struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgra...@apache.org
Subject cvs commit: jakarta-struts/src/share/org/apache/struts/validator Resources.java
Date Sat, 17 Jan 2004 22:18:30 GMT
dgraham     2004/01/17 14:18:30

  Modified:    src/share/org/apache/struts/validator Resources.java
  Log:
  Changed initValidator() to accept an ActionMessages object instead of 
  ActionErrors, changed ACTION_ERRORS_PARAM name to 
  ACTION_MESSAGES_PARAM.
  
  Revision  Changes    Path
  1.27      +10 -10    jakarta-struts/src/share/org/apache/struts/validator/Resources.java
  
  Index: Resources.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/validator/Resources.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- Resources.java	17 Jan 2004 22:11:07 -0000	1.26
  +++ Resources.java	17 Jan 2004 22:18:30 -0000	1.27
  @@ -73,8 +73,8 @@
   import org.apache.commons.validator.ValidatorResources;
   import org.apache.struts.Globals;
   import org.apache.struts.action.ActionError;
  -import org.apache.struts.action.ActionErrors;
   import org.apache.struts.action.ActionMessage;
  +import org.apache.struts.action.ActionMessages;
   import org.apache.struts.util.MessageResources;
   import org.apache.struts.util.ModuleUtils;
   import org.apache.struts.util.RequestUtils;
  @@ -112,16 +112,16 @@
       public static String HTTP_SERVLET_REQUEST_KEY = HTTP_SERVLET_REQUEST_PARAM;
   
       /**
  -     * Resources key the <code>ActionErrors</code> is stored under.
  +     * Resources key the <code>ActionMessages</code> is stored under.
        */
  -    private static String ACTION_ERRORS_PARAM =
  +    private static String ACTION_MESSAGES_PARAM =
           "org.apache.struts.action.ActionMessages";
   
       /**
        * Resources key the <code>ActionErrors</code> is stored under.
        * @deprecated This will be removed after Struts 1.2
        */
  -    public static String ACTION_ERRORS_KEY = ACTION_ERRORS_PARAM;
  +    public static String ACTION_ERRORS_KEY = ACTION_MESSAGES_PARAM;
   
       /**
        * Retrieve <code>ValidatorResources</code> for the current module.
  @@ -329,7 +329,7 @@
           Object bean,
           ServletContext application,
           HttpServletRequest request,
  -        ActionErrors errors,
  +        ActionMessages errors,
           int page) {
   
           ValidatorResources resources =
  @@ -345,7 +345,7 @@
           validator.setParameter(SERVLET_CONTEXT_PARAM, application);
           validator.setParameter(HTTP_SERVLET_REQUEST_PARAM, request);
           validator.setParameter(Validator.LOCALE_PARAM, locale);
  -        validator.setParameter(ACTION_ERRORS_PARAM, errors);
  +        validator.setParameter(ACTION_MESSAGES_PARAM, errors);
           validator.setParameter(Validator.BEAN_PARAM, bean);
   
           return validator;
  
  
  

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


Mime
View raw message