Changeset 4675 for trunk/gli/src/org/greenstone/gatherer/file

Timestamp:

2003-06-16T10:47:06+12:00 (21 years ago)

Author:

jmt12

Message:

Sunday's work

Location:

trunk/gli/src/org/greenstone/gatherer/file

Files:

• FileManager.java (modified) (3 diffs)
• FileQueue.java (modified) (11 diffs)

trunk/gli/src/org/greenstone/gatherer/file/FileManager.java

@@ -46 +46 @@
 import org.greenstone.gatherer.util.DragComponent;
 import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
-/** Manages the moving of files within a separate thread. 
+/** Manages the moving of files within a separate thread.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
  * @version 2.3
@@ -70 +70 @@
     // If source and target are different
     else {
-                // If target is the UndoManager, we're deleting
+        // If target is the UndoManager, we're deleting
         if(target instanceof UndoManager) {
         // If the source is the workspace then display an error message. Workspace is read only.
@@ -141 +141 @@
     public void run() {
         // Reset, and calculate progress bar size.
-        queue.calculateSize(source_nodes);
+        boolean cancelled = queue.calculateSize(source_nodes);
         // Now we queue the job(s). Note that this may fail if a read only file is encountered and we have been asked to delete.
-        for(int i = 0; source_nodes != null && i < source_nodes.length; i++) {
+        for(int i = 0; !cancelled && source_nodes != null && i < source_nodes.length; i++) {
         queue.addJob(id, source, source_nodes[i], target, target_node, type, true, true, true);
         }

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -140 +140 @@
     }
 
-    public void calculateSize(FileNode[] files) {
+    /** Calculates the total deep file size of the selected file nodes.
+    * @param files a FileNode[] of selected files
+    * @return true if a cancel was signalled, false otherwise
+    * @see org.greenstone.gatherer.file.FileManager.Task#run()
+    */
+    public boolean calculateSize(FileNode[] files) {
     progress.reset();
     progress.setString(get("FileActions.Calculating_Size"));
     progress.setIndeterminate(true);
     Vector remaining = new Vector();
-    for(int i = 0; i < files.length; i++) {
+    for(int i = 0; !cancel_action && i < files.length; i++) {
         remaining.add(files[i]);
     }
-    while(remaining.size() > 0) {
+    while(!cancel_action && remaining.size() > 0) {
         FileNode node = (FileNode)remaining.remove(0);
         if(node.isLeaf()) {
@@ -154 +159 @@
         }
         else {
-        for(int i = 0; i < node.getChildCount(); i++) {
+        for(int i = 0; !cancel_action && i < node.getChildCount(); i++) {
             remaining.add(node.getChildAt(i));
         }
@@ -161 +166 @@
     progress.setString(get("No_Activity"));
     progress.setIndeterminate(false);
+    // Now we return if calculation was cancelled so that the FileManagers Task can skip the addJob phase correctly.
+    if(cancel_action) {
+        cancel_action = false; // reset
+        return true;
+    }
+    else {
+        return false;
+    }
     }
 
@@ -171 +184 @@
     return file_status;
     }
-    /** Access to the job state label. */    
+    /** Access to the job state label. */
 //      public JLabel getJobStatus() {
 //      return job_status;
@@ -203 +216 @@
             ///ystem.err.println("Found job: " + job);
             // The user can cancel this individual action at several places, so keep track if the state is 'ready' for the next step.
-            boolean ready = true; 
+            boolean ready = true;
             FileNode origin_node = job.getOrigin();
             FileNode destination_node = job.getDestination();
@@ -394 +407 @@
                 source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
                 }
-                                     
+
                 // We can't have been cancelled, and we must have created a new FileNode during the above phase, before we can handle metadata.
                 if(!cancel_action && new_node != null) {
@@ -403 +416 @@
                     GDMManager gdm = Gatherer.c_man.getCollection().gdm;
                     // we just retrieve the metadata attached to the origin node...
-                    ArrayList existing_metadata = gdm.getMetadata(source_file);
-                    ///ystem.err.println("Existing metadata for " + origin_node + ": " + gdm.toString(existing_metadata));
+                    ArrayList existing_metadata = gdm.getMetadataOnly(source_file);
+                    //Gatherer.println("Existing metadata for " + origin_node + ": " + gdm.toString(existing_metadata));
                     // then assign this remainder to the new folder.
                     ///ystem.err.println("New metadata: " + gdm.toString(existing_metadata));
@@ -533 +546 @@
                 // We add an entry to the complete mappings to ensure this directory isn't added again
                 completed_folder_mappings.put(origin_node, recycle_folder_record);
-                ///ystem.err.println("Added completed directories mapping " + origin_node); 
-                // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once. 
+                ///ystem.err.println("Added completed directories mapping " + origin_node);
+                // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once.
                 ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
                 ///ystem.err.println("Directory actually has " + child_list.length + " children.");
@@ -586 +599 @@
             progress.reset();
             progress.setString(get("No_Activity"));
-            yes_to_all = false;         
+            yes_to_all = false;
             completed_folder_mappings.clear();
             recycle_folder_mappings.clear();
@@ -599 +612 @@
         }
         catch (Exception error) {
-        Gatherer.printStackTrace(error); 
+        Gatherer.printStackTrace(error);
         }
     }
@@ -655 +668 @@
       * @see org.greenstone.gatherer.Gatherer
       */
-    public void copyFile(File source, File destination, LongProgressBar progress) 
+    public void copyFile(File source, File destination, LongProgressBar progress)
     throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, UnknownFileErrorException {
     if(source.isDirectory()) {