Author: lukaszlenart
Date: Fri May 17 18:58:39 2013
New Revision: 1483950
URL: http://svn.apache.org/r1483950
Log:
WW-4068 Extracts method to accept parameter names to allow easier overriding
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
Modified:
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java?rev=1483950&r1=1483949&r2=1483950&view=diff
==============================================================================
---
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
(original)
+++
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
Fri May 17 18:58:39 2013
@@ -273,9 +273,6 @@ public class ParametersInterceptor exten
}
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 @@ public class ParametersInterceptor exten
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());
}
}
@@ -347,6 +340,18 @@ public class ParametersInterceptor exten
}
/**
+ * 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
* action.
