Changeset 40 for gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java

Timestamp:

08/29/11 11:44:48 (14 years ago)

Author:

mcichenski

Message:

enable multiple files transfer with one popup window (test 3)

File:

• gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java (modified) (3 diffs)

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java

@@ -1555 +1555 @@
 
             for (int i = 0; i < numOfFiles; i++) {
-                //int index = uploadedFiles.indexOf(filesList.get(i));
-                //if(index > -1){
+                int index = uploadedFiles.indexOf(filesList.get(i));
+                if(index > -1){
                         //String fileName = uploadedFiles.get(i).getName();
                         String fileName = filesList.get(i).getName();
                         String targetPath = tmpDir + "/" + fileName;
-                        boolean tmp = VineFlexUtilClass.moveFileItemToPortalFileSystem(filesList, i, targetPath);
+                        boolean tmp = VineFlexUtilClass.moveFileItemToPortalFileSystem(uploadedFiles, i, targetPath);
                         if (tmp) {
                                 try {
@@ -1588 +1588 @@
                                         log.debug("allFilesUploaded() " + e.getClass().getName());
                                 } finally {
-                                        
+                                        if (i < numOfFiles - 1) continue;
+                                        final FileLocation tmpLocation = portalFileSystemManager.createDirLocation(tmpDir);
+                                        log.debug("!!!!!" + tmpLocation.getUrl());
+                                        FileSet delSet = new FileLocationSet(new ArrayList<FileLocation>() {
+                                                {
+                                                        add(tmpLocation);
+                                                }
+                                        });
+                                        TaskMonitor delMon = portalFileSystemManager.delete(delSet, TaskOptions.block());
+                                        if (delMon.completed()) {
+                                                log.debug("!!!!! tmp dir was deleted");
+                                        } else {
+                                                log.debug("!!!!! tmp dir was NOT deleted");
+                                        }
 
                                 }
@@ -1594 +1607 @@
                         }
                         //log.debug("move to portal file system temp result "+tmp);
-                //}
+                }
             }
-            //transfer more than 1 file with one shot!
-            final FileLocation tmpLocation = portalFileSystemManager.createDirLocation(tmpDir);
-                        log.debug("!!!!!" + tmpLocation.getUrl());
-                        FileSet delSet = new FileLocationSet(new ArrayList<FileLocation>() {
-                                {
-                                        add(tmpLocation);
-                                }
-                        });
-                        TaskMonitor delMon = portalFileSystemManager.delete(delSet, TaskOptions.block());
-                        if (delMon.completed()) {
-                                log.debug("!!!!! tmp dir was deleted");
-                        } else {
-                                log.debug("!!!!! tmp dir was NOT deleted");
-                        }
-            
         }
         ///MOJE