[gatein-commits] gatein SVN: r3732 - in portal/trunk: component/web/server/src/main/java/org/exoplatform/web/handler and 1 other directories.

[do-not-reply at jboss.org]

Author: trong.tran
Date: 2010-07-31 15:52:13 -0400 (Sat, 31 Jul 2010)
New Revision: 3732

Modified:
   portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java
   portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java
   portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleDownloadUpload.java
Log:
GTNPORTAL-1380 Keep UploadService transparent from previous version

Modified: portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java
===================================================================
--- portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java	2010-07-31 14:28:22 UTC (rev 3731)
+++ portal/trunk/component/web/server/src/main/java/org/exoplatform/upload/UploadService.java	2010-07-31 19:52:13 UTC (rev 3732)
@@ -160,12 +160,22 @@
    }
 
    /**
-    * Remove UploadResource by uploadId, Delete temp file of UploadResource. If
-    * uploadId is null or UploadResource is null, do nothing
+    * @deprecated use {@link #removeUploadResource(String)} instead
     * 
     * @param uploadId
-    *           uploadId of UploadResource will be removed
     */
+   @Deprecated
+   public void removeUpload(String uploadId)
+   {
+      removeUploadResource(uploadId);
+   }
+   
+   /**
+    * Remove the UploadResource and its temporary file that associated with given <code>uploadId</code>.
+    * <br/>If <code>uploadId</code> is null or UploadResource is null, do nothing
+    * 
+    * @param uploadId uploadId of UploadResource will be removed
+    */
    public void removeUploadResource(String uploadId)
    {
       if (uploadId == null)
@@ -211,7 +221,7 @@
       return uploadLimitsMB_;
    }
 
-   private ServletFileUpload makeServletFileUpload(UploadResource upResource)
+   private ServletFileUpload makeServletFileUpload(final UploadResource upResource)
    {
       // Create a factory for disk-based file items
       DiskFileItemFactory factory = new DiskFileItemFactory();
@@ -222,13 +232,7 @@
 
       // Create a new file upload handler
       ServletFileUpload upload = new ServletFileUpload(factory);
-      upload.setProgressListener(makeProgressListener(upResource));
-      return upload;
-   }
-
-   private ProgressListener makeProgressListener(final UploadResource upResource)
-   {
-      return new ProgressListener()
+      ProgressListener listener = new ProgressListener()
       {
          public void update(long pBytesRead, long pContentLength, int pItems)
          {
@@ -237,6 +241,8 @@
             upResource.addUploadedBytes(pBytesRead - upResource.getUploadedSize());
          }
       };
+      upload.setProgressListener(listener);
+      return upload;
    }
 
    private boolean isLimited(UploadResource upResource, double contentLength)

Modified: portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java
===================================================================
--- portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java	2010-07-31 14:28:22 UTC (rev 3731)
+++ portal/trunk/component/web/server/src/main/java/org/exoplatform/web/handler/UploadHandler.java	2010-07-31 19:52:13 UTC (rev 3732)
@@ -55,7 +55,7 @@
    public void execute(WebAppController controller, HttpServletRequest req, HttpServletResponse res) throws Exception
    {
       String action = req.getParameter("action");
-      String[] uploadId = req.getParameterValues("uploadId");
+      String[] uploadIds = req.getParameterValues("uploadId");
       
       res.setHeader("Cache-Control", "no-cache");
 
@@ -68,20 +68,20 @@
       if (uploadActionService == UploadServiceAction.PROGRESS)
       {
          Writer writer = res.getWriter();
-         if (uploadId == null)
+         if (uploadIds == null)
             return;
          StringBuilder value = new StringBuilder();
          value.append("{\n  upload : {");
-         for (int i = 0; i < uploadId.length; i++)
+         for (int i = 0; i < uploadIds.length; i++)
          {
-            UploadResource upResource = service.getUploadResource(uploadId[i]);
+            UploadResource upResource = service.getUploadResource(uploadIds[i]);
             if (upResource == null)
                continue;
             if (upResource.getStatus() == UploadResource.FAILED_STATUS)
             {
                
-               int limitMB = service.getUploadLimitsMB().get(uploadId[i]).intValue();
-               value.append("\n    \"").append(uploadId[i]).append("\": {");
+               int limitMB = service.getUploadLimitsMB().get(uploadIds[i]).intValue();
+               value.append("\n    \"").append(uploadIds[i]).append("\": {");
                value.append("\n      \"status\":").append('\"').append("failed").append("\",");
                value.append("\n      \"size\":").append('\"').append(limitMB).append("\"");
                value.append("\n    }");
@@ -92,12 +92,12 @@
             {
                percent = (upResource.getUploadedSize() * 100) / upResource.getEstimatedSize();
             }
-            value.append("\n    \"").append(uploadId[i]).append("\": {");
+            value.append("\n    \"").append(uploadIds[i]).append("\": {");
             value.append("\n      \"percent\":").append('\"').append((int)percent).append("\",");
             value.append("\n      \"fileName\":").append('\"').append(encodeName(upResource.getFileName()))
                .append("\"");
             value.append("\n    }");
-            if (i < uploadId.length - 1)
+            if (i < uploadIds.length - 1)
                value.append(',');
          }
          value.append("\n  }\n}");
@@ -109,11 +109,11 @@
       }
       else if (uploadActionService == UploadServiceAction.DELETE)
       {
-         service.removeUploadResource(uploadId[0]);
+         service.removeUploadResource(uploadIds[0]);
       }
       else if (uploadActionService == UploadServiceAction.ABORT)
       {
-         service.removeUploadResource(uploadId[0]);
+         service.removeUploadResource(uploadIds[0]);
       }
    }
 

Modified: portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleDownloadUpload.java
===================================================================
--- portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleDownloadUpload.java	2010-07-31 14:28:22 UTC (rev 3731)
+++ portal/trunk/testsuite/webuibasedsamples/src/main/java/org/exoplatform/sample/webui/component/UISampleDownloadUpload.java	2010-07-31 19:52:13 UTC (rev 3732)
@@ -30,8 +30,8 @@
    public UISampleDownloadUpload() throws Exception
    {
       addUIFormInput(new UIFormUploadInput("name0", "value0"));
-      addUIFormInput(new UIFormUploadInput("name1", "value1"));
-      addUIFormInput(new UIFormUploadInput("name2", "value2"));
+      addUIFormInput(new UIFormUploadInput("name1", "value1", 100));
+      addUIFormInput(new UIFormUploadInput("name2", "value2", 200));
    }
 
    public void setDownloadLink(String[] downloadLink)