[cvs] expresso commit by mtraum: fix deprecated

[JCorporate Ltd]

Log Message:
-----------
fix deprecated

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
        DefaultForm.java

Revision Data
-------------
Index: DefaultForm.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java -u -r1.19 -r1.20
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/DefaultForm.java
@@ -64,6 +64,7 @@
 
 package com.jcorporate.expresso.core.controller;
 
+import com.jcorporate.expresso.core.i18n.Messages;
 import com.jcorporate.expresso.core.misc.StringUtil;
 import com.jcorporate.expresso.core.misc.URLUTF8Encoder;
 import org.apache.commons.logging.Log;
@@ -75,6 +76,7 @@
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.util.RequestUtils;
 import org.apache.struts.validator.Resources;
 
 import javax.servlet.ServletContext;
@@ -399,21 +401,21 @@
         ValidatorResources resources = Resources.getValidatorResources(application,
                 request);
 
-        Locale locale = Resources.getLocale(request);
+        Locale locale = RequestUtils.getUserLocale(request, Messages.LOCALE_KEY);
 
         Validator validator = new Validator(resources, key);
         validator.setUseContextClassLoader(true);
 
         validator.setPage(page);
 
-        validator.addResource(Resources.
+        validator.setParameter(Resources.
                 SERVLET_CONTEXT_KEY, application);
-        validator.addResource(Resources.
+        validator.setParameter(Resources.
                 HTTP_SERVLET_REQUEST_KEY, request);
-        validator.addResource(Validator.LOCALE_KEY, locale);
-        validator.addResource(Resources.
+        validator.setParameter(Validator.LOCALE_PARAM, locale);
+        validator.setParameter(Resources.
                 ACTION_ERRORS_KEY, errors);
-        validator.addResource(Validator.BEAN_KEY, bean);
+        validator.setParameter(Validator.BEAN_PARAM, bean);
 
         return validator;
     }