Author: lukaszlenart
Date: Thu Aug 1 13:48:55 2013
New Revision: 1509233
URL: http://svn.apache.org/r1509233
Log:
Partially reverts: WW-3623 some generics fix - to solve WW-4142
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java?rev=1509233&r1=1509232&r2=1509233&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Component.java
Thu Aug 1 13:48:55 2013
@@ -53,7 +53,7 @@ public class Component {
public static final String COMPONENT_STACK = "__component_stack";
protected ValueStack stack;
- protected Map<String, Object> parameters;
+ protected Map parameters;
protected ActionMapper actionMapper;
protected boolean throwExceptionOnELFailure;
private UrlHelper urlHelper;
@@ -449,7 +449,7 @@ public class Component {
* Gets the parameters.
* @return the parameters. Is never <tt>null</tt>.
*/
- public Map<String, Object> getParameters() {
+ public Map getParameters() {
return parameters;
}
@@ -457,7 +457,7 @@ public class Component {
* Adds all the given parameters to this component's own parameters.
* @param params the parameters to add.
*/
- public void addAllParameters(Map<String, Object> params) {
+ public void addAllParameters(Map params) {
parameters.putAll(params);
}
@@ -472,7 +472,7 @@ public class Component {
*/
public void addParameter(String key, Object value) {
if (key != null) {
- Map<String, Object> params = getParameters();
+ Map params = getParameters();
if (value == null) {
params.remove(key);