Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-31 19:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed local variable to remove underscore

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1492624 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Christian Grobmeier
2013-06-13 11:21:20 +00:00
parent 89cd538a53
commit bbe2a3b81b
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
+13 -13
View File
@@ -125,10 +125,10 @@ public class I18nInterceptor extends AbstractInterceptor {
Map<String, Object> params = invocation.getInvocationContext().getParameters();
boolean storeInSession = true;
Object requested_locale = findLocaleParameter(params, parameterName);
if (requested_locale == null) {
requested_locale = findLocaleParameter(params, requestOnlyParameterName);
if (requested_locale != null) {
Object requestedLocale = findLocaleParameter(params, parameterName);
if (requestedLocale == null) {
requestedLocale = findLocaleParameter(params, requestOnlyParameterName);
if (requestedLocale != null) {
storeInSession = false;
}
}
@@ -137,9 +137,9 @@ public class I18nInterceptor extends AbstractInterceptor {
Map<String, Object> session = invocation.getInvocationContext().getSession();
Locale locale = null;
if (requested_locale != null) {
locale = (requested_locale instanceof Locale) ?
(Locale) requested_locale : LocalizedTextUtil.localeFromString(requested_locale.toString(), null);
if (requestedLocale != null) {
locale = (requestedLocale instanceof Locale) ?
(Locale) requestedLocale : LocalizedTextUtil.localeFromString(requestedLocale.toString(), null);
if (locale != null && LOG.isDebugEnabled()) {
LOG.debug("applied request locale=#0", locale);
}
@@ -184,16 +184,16 @@ public class I18nInterceptor extends AbstractInterceptor {
}
private Object findLocaleParameter(Map<String, Object> params, String parameterName) {
Object requested_locale = params.remove(parameterName);
if (requested_locale != null && requested_locale.getClass().isArray()
&& ((Object[]) requested_locale).length == 1) {
requested_locale = ((Object[]) requested_locale)[0];
Object requestedLocale = params.remove(parameterName);
if (requestedLocale != null && requestedLocale.getClass().isArray()
&& ((Object[]) requestedLocale).length == 1) {
requestedLocale = ((Object[]) requestedLocale)[0];
if (LOG.isDebugEnabled()) {
LOG.debug("requested_locale=#0", requested_locale);
LOG.debug("requested_locale=#0", requestedLocale);
}
}
return requested_locale;
return requestedLocale;
}
/**