Changeset 5833

Timestamp:

2003-11-13T13:57:27+13:00 (21 years ago)

Author:

mdewsnip

Message:

Fixed file copying bug where only the first file was copied because the action was being cancelled after the first file.

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java (modified) (6 diffs)

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

@@ -59 +59 @@
     private boolean return_immediately = false;
     /** We are only allowed to wait under specific circumstances. */
-    private boolean wait_allowed = true;
+    /* private boolean wait_allowed = true; */
     /** true if the user has selected yes to all from a file 'clash' dialog. */
     private boolean yes_to_all = false;
@@ -175 +175 @@
     return file_status;
     }
-    /** Access to the job state label. */
-//      public JLabel getJobStatus() {
-//      return job_status;
-//      }
+
     /** Access to the progress bar. */
     public LongProgressBar getProgress() {
     return progress;
     }
-    /** Prevent the progress bar updating momentarily, while the progress bar size is re-adjusted. */
+    /** Prevent the progress bar updating momentarily, while its size is re-adjusted. */
     public void pause() {
     progress.setIndeterminate(true);
@@ -204 +201 @@
         int position = queue.size() - 1;
         FileJob job = removeJob(position);
-        if(job != null) {
+        if (job != null) {
             ///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.
@@ -259 +256 @@
                     break;
                 case 3: // No To All
-                   cancel_action = true;
+                    cancel_action = true;
                 case 2: // No
                 default:
-                   ready = false;
-                   // Increment progress by size of potentially copied file
-                   progress.addValue(origin_node.getFile().length());
+                    ready = false;
+                    // Increment progress by size of potentially copied file
+                    progress.addValue(origin_node.getFile().length());
                 }
                 }
@@ -435 +432 @@
                 // Otherwise if it came from the workspace use the MSMs parsers to search for folder level metadata (such as metadata.xml or marc records).
                 else if (job.source.toString().equals("Workspace")) {
-                    cancel_action = Gatherer.c_man.getCollection().msm.searchForMetadata(new_node, origin_node, job.folder_level);
+                    cancel_action = !Gatherer.c_man.getCollection().msm.searchForMetadata(new_node, origin_node, job.folder_level);
                 }
                 }
@@ -639 +636 @@
     }
     } */
+
     /** Called when the user makes some selection in one of the trees we are listening to. From this we update the status details. */
     public void valueChanged(TreeSelectionEvent event) {