Revision: 978
          http://stripes.svn.sourceforge.net/stripes/?rev=978&view=rev
Author:   bengunter
Date:     2008-10-20 18:47:47 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
While working toward a fix for STS-616, I found that these three methods were 
declared static when they should not have been. Since they belong to a class 
with package visibility, I think it's safe to fix them.

Modified Paths:
--------------
    
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java

Modified: 
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
===================================================================
--- 
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
    2008-10-17 03:33:31 UTC (rev 977)
+++ 
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/StripesRequestWrapper.java
    2008-10-20 18:47:47 UTC (rev 978)
@@ -450,7 +450,7 @@
      * Extract any parameters embedded in the URI of the given [EMAIL 
PROTECTED] request} and return them in a
      * [EMAIL PROTECTED] Map}. If no parameters are present in the URI, then 
return null.
      */
-    public static Map<String, String[]> getUriParameters(HttpServletRequest 
request) {
+    public Map<String, String[]> getUriParameters(HttpServletRequest request) {
         Map<String, String[]> params = null;
         UrlBinding binding = 
UrlBindingFactory.getInstance().getBinding(request);
         if (binding != null && binding.getParameters().size() > 0) {
@@ -497,7 +497,7 @@
     }
 
     /** Merge the values from [EMAIL PROTECTED] source} into [EMAIL PROTECTED] 
target}. */
-    public static Map<String, String[]> mergeParameters(Map<String, String[]> 
target,
+    public Map<String, String[]> mergeParameters(Map<String, String[]> target,
             Map<String, String[]> source) {
         // target must not be null and we must not modify source
         if (target == null)
@@ -530,7 +530,7 @@
      * @param uriParams parameters extracted from the URI
      * @return the merged parameter values
      */
-    public static String[] mergeParameters(String[] requestParams, String[] 
uriParams) {
+    public String[] mergeParameters(String[] requestParams, String[] 
uriParams) {
         if (requestParams == null || requestParams.length == 0) {
             if (uriParams == null || uriParams.length == 0)
                 return null;


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development

Reply via email to