[cvs] expresso commit by ppilgrim: Struts upgrade 1.2.6 remove pending

[JCorporate Ltd]

Log Message:
-----------
Struts upgrade 1.2.6 remove pending deprecations with recommended
replacements for Struts Validator. See also 
http://wiki.apache.org/struts/StrutsUpgradeNotes11to124

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

Revision Data
-------------
Index: ExpressoFieldChecks.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation/ExpressoFieldChecks.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation/ExpressoFieldChecks.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation/ExpressoFieldChecks.java -u -r1.7 -r1.8
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation/ExpressoFieldChecks.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/validation/ExpressoFieldChecks.java
@@ -64,8 +64,14 @@
 
 package com.jcorporate.expresso.core.controller.validation;
 
-import com.jcorporate.expresso.core.controller.ControllerException;
-import com.jcorporate.expresso.core.controller.DefaultForm;
+import java.io.Serializable;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Date;
+import java.util.Locale;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -75,13 +81,10 @@
 import org.apache.commons.validator.ValidatorAction;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.validator.Resources;
+import org.apache.struts.util.RequestUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.Serializable;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Date;
-import java.util.Locale;
+import com.jcorporate.expresso.core.controller.ControllerException;
+import com.jcorporate.expresso.core.controller.DefaultForm;
 
 /**
  * <p>
@@ -536,7 +539,7 @@
         }
         String datePattern = field.getVarValue("datePattern");
         String datePatternStrict = field.getVarValue("datePatternStrict");
-        Locale locale = Resources.getLocale(request);
+        Locale locale = RequestUtils.getUserLocale( request, null );
 
         if (!GenericValidator.isBlankOrNull(value)) {
             try {