You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2008/04/08 17:12:39 UTC
svn commit: r645969 -
/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/Field.java
Author: tv
Date: Tue Apr 8 08:12:38 2008
New Revision: 645969
URL: http://svn.apache.org/viewvc?rev=645969&view=rev
Log:
Use the locale from the parser
Modified:
turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/Field.java
Modified: turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/Field.java
URL: http://svn.apache.org/viewvc/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/Field.java?rev=645969&r1=645968&r2=645969&view=diff
==============================================================================
--- turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/Field.java (original)
+++ turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/intake/model/Field.java Tue Apr 8 08:12:38 2008
@@ -21,16 +21,12 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
import java.util.Locale;
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.turbine.om.Retrievable;
-import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.TurbineIntake;
import org.apache.turbine.services.intake.validator.DefaultValidator;
@@ -39,10 +35,7 @@
import org.apache.turbine.services.intake.validator.Validator;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-import org.apache.turbine.services.localization.Localization;
-import org.apache.turbine.services.localization.LocalizationService;
import org.apache.turbine.util.SystemError;
-import org.apache.turbine.util.parser.ParameterParser;
import org.apache.turbine.util.parser.ValueParser;
/**
@@ -329,21 +322,7 @@
validFlag = true;
validated = false;
- // If the parser is for a HTTP request, use the request it's
- // associated with to grok the locale.
- if (TurbineServices.getInstance()
- .isRegistered(LocalizationService.SERVICE_NAME))
- {
- if (pp instanceof ParameterParser)
- {
- this.locale = Localization.getLocale
- (((ParameterParser) pp).getRequest());
- }
- else
- {
- this.locale = Localization.getLocale((String) null);
- }
- }
+ this.locale = pp.getLocale();
if (pp.containsKey(getKey()))
{