WW-4068 Extracts method to accept parameter names to allow easier ove…

…rriding git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1483950 13f79535-47bb-0310-9956-ffa450edef68
rt-jar · May 17, 2013 · 294d380 · 294d380
1 parent 7caf810
commit 294d380
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java b/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
@@ -273,9 +273,6 @@ protected void addParametersToContext(ActionContext ac, Map<String, Object> newP
     }
 
     protected void setParameters(Object action, ValueStack stack, final Map<String, Object> parameters) {
-        ParameterNameAware parameterNameAware = (action instanceof ParameterNameAware)
-                ? (ParameterNameAware) action : null;
-
         Map<String, Object> params;
         Map<String, Object> acceptableParameters;
         if (ordered) {
@@ -289,11 +286,7 @@ protected void setParameters(Object action, ValueStack stack, final Map<String,
 
         for (Map.Entry<String, Object> entry : params.entrySet()) {
             String name = entry.getKey();
-
-            boolean acceptableName = acceptableName(name)
-                    || (parameterNameAware != null && parameterNameAware.acceptableParameterName(name));
-
-            if (acceptableName) {
+            if (isAcceptableParameter(name, action)) {
                 acceptableParameters.put(name, entry.getValue());
             }
         }
@@ -346,6 +339,18 @@ protected void setParameters(Object action, ValueStack stack, final Map<String,
         addParametersToContext(ActionContext.getContext(), acceptableParameters);
     }
 
+    /**
+     * Checks if name of parameter can be accepted or thrown away
+     *
+     * @param name parameter name
+     * @param action current action
+     * @return true if parameter is accepted
+     */
+    protected boolean isAcceptableParameter(String name, Object action) {
+        ParameterNameAware parameterNameAware = (action instanceof ParameterNameAware) ? (ParameterNameAware) action : null;
+        return acceptableName(name) || (parameterNameAware != null && parameterNameAware.acceptableParameterName(name));
+    }
+
     /**
      * Gets an instance of the comparator to use for the ordered sorting.  Override this
      * method to customize the ordering of the parameters as they are set to the