You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2009/05/27 14:05:17 UTC

svn commit: r779130 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java

Author: matzew
Date: Wed May 27 12:05:16 2009
New Revision: 779130

URL: http://svn.apache.org/viewvc?rev=779130&view=rev
Log:
using varargs instead of three times calling one method

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java?rev=779130&r1=779129&r2=779130&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/FileUploadConfiguratorImpl.java Wed May 27 12:05:16 2009
@@ -213,9 +213,12 @@
     final UploadedFile temp = new TempUploadedFile(item);
     Map<String, Object> sessionMap = externalContext.getSessionMap();
     Map<String, Object> requestMap = externalContext.getRequestMap();
-    _copyFromSessionToRequestMap(sessionMap, requestMap, UploadedFileProcessor.MAX_MEMORY_PARAM_NAME);
-    _copyFromSessionToRequestMap(sessionMap, requestMap, UploadedFileProcessor.MAX_DISK_SPACE_PARAM_NAME);
-    _copyFromSessionToRequestMap(sessionMap, requestMap, UploadedFileProcessor.TEMP_DIR_PARAM_NAME);    
+    
+    _copyParamsFromSessionToRequestMap(sessionMap, requestMap,
+      UploadedFileProcessor.MAX_MEMORY_PARAM_NAME,
+      UploadedFileProcessor.MAX_DISK_SPACE_PARAM_NAME,
+      UploadedFileProcessor.TEMP_DIR_PARAM_NAME);
+    
     final UploadedFile file =
       context.getUploadedFileProcessor().processFile(externalContext.getRequest(), temp);
 
@@ -232,9 +235,15 @@
     }
   }
 
-  private void _copyFromSessionToRequestMap(Map<String, Object> sessionMap, Map<String, Object> requestMap, String param)
+  /**
+   * copies some params (varargs) from the session map to the request map 
+   */
+  private void _copyParamsFromSessionToRequestMap(Map<String, Object> sessionMap, Map<String, Object> requestMap, String... params)
   {
-   requestMap.put(param,  sessionMap.get(param));
+    for(String param : params)
+    {
+      requestMap.put(param,  sessionMap.get(param));
+    }
   }
 
   static private ExternalContext _getExternalContextWrapper(ExternalContext externalContext, Map<String, String[]> addedParams)