struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject struts git commit: WW-4686 Cleans up code and uses Enum
Date Mon, 12 Sep 2016 06:43:06 GMT
Repository: struts
Updated Branches:
  refs/heads/master 07bb62ba8 -> 41c97636e


WW-4686 Cleans up code and uses Enum


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/41c97636
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/41c97636
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/41c97636

Branch: refs/heads/master
Commit: 41c97636e5de0dc09d258f27404a25d737fbbe23
Parents: 07bb62b
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Mon Sep 12 08:42:40 2016 +0200
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Mon Sep 12 08:42:40 2016 +0200

----------------------------------------------------------------------
 .../struts2/interceptor/I18nInterceptor.java    | 41 +++++++++-----------
 1 file changed, 19 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/41c97636/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
index 15c6e78..eb17996 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/I18nInterceptor.java
@@ -95,19 +95,16 @@ public class I18nInterceptor extends AbstractInterceptor {
     public static final String DEFAULT_SESSION_ATTRIBUTE = "WW_TRANS_I18N_LOCALE";
     public static final String DEFAULT_PARAMETER = "request_locale";
     public static final String DEFAULT_REQUESTONLY_PARAMETER = "request_only_locale";
+    public static final String DEFAULT_COOKIE_ATTRIBUTE = DEFAULT_SESSION_ATTRIBUTE;
+    public static final String DEFAULT_COOKIE_PARAMETER = "request_cookie_locale";
 
     protected String parameterName = DEFAULT_PARAMETER;
     protected String requestOnlyParameterName = DEFAULT_REQUESTONLY_PARAMETER;
     protected String attributeName = DEFAULT_SESSION_ATTRIBUTE;
 
     // Request-Only = None
-    protected enum Storage { SESSION, NONE }
-
-    public static final String DEFAULT_COOKIE_ATTRIBUTE = DEFAULT_SESSION_ATTRIBUTE;
+    protected enum Storage { COOKIE, SESSION, NONE }
 
-    public static final String COOKIE_STORAGE = "cookie";
-
-    public static final String DEFAULT_COOKIE_PARAMETER = "request_cookie_locale";
     protected String requestCookieParameterName = DEFAULT_COOKIE_PARAMETER;
 
     public void setParameterName(String parameterName) {
@@ -118,6 +115,10 @@ public class I18nInterceptor extends AbstractInterceptor {
         this.requestOnlyParameterName = requestOnlyParameterName;
     }
 
+    public void setRequestCookieParameterName(String requestCookieParameterName) {
+        this.requestCookieParameterName = requestCookieParameterName;
+    }
+
     public void setAttributeName(String attributeName) {
         this.attributeName = attributeName;
     }
@@ -157,8 +158,8 @@ public class I18nInterceptor extends AbstractInterceptor {
      *
      * @return the locale
      */
-    protected Locale storeLocale(ActionInvocation invocation, Locale locale, String storage)
{
-        if (COOKIE_STORAGE.equals(storage)) {
+    protected Locale storeLocale(ActionInvocation invocation, Locale locale, Storage storage)
{
+        if (storage == Storage.COOKIE) {
             ActionContext ac = invocation.getInvocationContext();
             HttpServletResponse response = (HttpServletResponse) ac.get(StrutsStatics.HTTP_RESPONSE);
 
@@ -166,7 +167,7 @@ public class I18nInterceptor extends AbstractInterceptor {
             cookie.setMaxAge(1209600); // two weeks
             response.addCookie(cookie);
 
-            storage = Storage.SESSION.toString();
+            storage = Storage.SESSION;
         }
 
         //save it in session
@@ -175,11 +176,11 @@ public class I18nInterceptor extends AbstractInterceptor {
         if (session != null) {
             synchronized (session) {
                 if (locale == null) {
-                    storage = Storage.NONE.toString();
+                    storage = Storage.NONE;
                     locale = readStoredLocale(invocation, session);
                 }
 
-                if (Storage.SESSION.toString().equals(storage)) {
+                if (Storage.SESSION == storage) {
                     session.put(attributeName, locale);
                 }
             }
@@ -277,12 +278,8 @@ public class I18nInterceptor extends AbstractInterceptor {
         invocation.getInvocationContext().setLocale(locale);
     }
 
-    public void setRequestCookieParameterName(String requestCookieParameterName) {
-        this.requestCookieParameterName = requestCookieParameterName;
-    }
-
     protected class LocaleFinder {
-        protected String storage = Storage.SESSION.toString();
+        protected Storage storage = Storage.SESSION;
         protected Parameter requestedLocale = null;
 
         protected ActionInvocation actionInvocation = null;
@@ -296,7 +293,7 @@ public class I18nInterceptor extends AbstractInterceptor {
             //get requested locale
             HttpParameters params = actionInvocation.getInvocationContext().getParameters();
 
-            storage = Storage.SESSION.toString();
+            storage = Storage.SESSION;
 
             requestedLocale = findLocaleParameter(params, parameterName);
             if (requestedLocale.isDefined()) {
@@ -305,11 +302,11 @@ public class I18nInterceptor extends AbstractInterceptor {
 
             requestedLocale = findLocaleParameter(params, requestOnlyParameterName);
             if (requestedLocale.isDefined()) {
-                storage = Storage.NONE.toString();
+                storage = Storage.NONE;
             }
         }
 
-        public String getStorage() {
+        public Storage getStorage() {
             return storage;
         }
 
@@ -327,7 +324,7 @@ public class I18nInterceptor extends AbstractInterceptor {
         protected void find() {
             //get requested locale
             HttpParameters params = actionInvocation.getInvocationContext().getParameters();
-            storage = Storage.SESSION.toString();
+            storage = Storage.SESSION;
 
             requestedLocale = findLocaleParameter(params, parameterName);
 
@@ -337,13 +334,13 @@ public class I18nInterceptor extends AbstractInterceptor {
 
             requestedLocale = findLocaleParameter(params, requestCookieParameterName);
             if (requestedLocale.isDefined()) {
-                storage = COOKIE_STORAGE;
+                storage = Storage.COOKIE;
                 return;
             }
 
             requestedLocale = findLocaleParameter(params, requestOnlyParameterName);
             if (requestedLocale.isDefined()) {
-                storage = Storage.NONE.toString();
+                storage = Storage.NONE;
             }
 
         }


Mime
View raw message