svn commit: r728521 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/interceptor/ test/java/org/apache/struts2/interceptor/

[nilsga]

Author: nilsga
Date: Sun Dec 21 13:51:53 2008
New Revision: 728521

URL: http://svn.apache.org/viewvc?rev=728521&view=rev
Log:
WW-2932 Change setParameters back to String, String[]

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
    
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java?rev=728521&r1=728520&r2=728521&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ParameterAware.java
 Sun Dec 21 13:51:53 2008
@@ -42,5 +42,5 @@
      *
      * @param parameters a Map of parameters (name/value Strings).
      */
-    public void setParameters(Map<String, Object> parameters);
+    public void setParameters(Map<String, String[]> parameters);
 }

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java?rev=728521&r1=728520&r2=728521&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java
 Sun Dec 21 13:51:53 2008
@@ -135,7 +135,7 @@
         }
 
         if (action instanceof ParameterAware) {
-            ((ParameterAware) action).setParameters(context.getParameters());
+            ((ParameterAware) 
action).setParameters((Map)context.getParameters());
         }
 
         if (action instanceof ApplicationAware) {

Modified: 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java?rev=728521&r1=728520&r2=728521&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
 (original)
+++ 
struts/struts2/trunk/core/src/test/java/org/apache/struts2/interceptor/ServletConfigInterceptorTest.java
 Sun Dec 21 13:51:53 2008
@@ -91,7 +91,7 @@
         Map<String, Object> param = new HashMap<String, Object>();
         mai.getInvocationContext().setParameters(param);
 
-        mock.setParameters(param);
+        mock.setParameters((Map)param);
         control.setVoidCallable();
 
         control.replay();