Changeset 8596

Timestamp:

2004-11-18T12:06:13+13:00 (19 years ago)

Author:

mdewsnip

Message:

Minor tidy ups.

File:

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

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

@@ -445 +445 @@
             // If we haven't been cancelled, and we've been asked to delete a directory/file, or perhaps as part of a move, we delete the file. This involves removing any existing metadata and then copying the file to the recycled bin (for a delete only), then deleting the file. When deleting a directory record from the tree (or from the filesystem for that matter) we must ensure that all of the descendant records have already been removed. If we fail to do this the delete will fail, or you will be bombarded with hundreds of 'Parent node of null not allowed' error messages. Also be aware that if the user has cancelled just this action, because of say a name clash, then we shouldn't do any deleting of any sort dammit.
             if(!cancel_action && ready && (job.type == FileJob.DELETE || job.type == FileJob.MOVE)) {
-            ///atherer.println("Delete/Move: " + origin_node);
-            ///atherer.println(queue.size() + " jobs remain in queue");
-
+            // Update the progress bar for this job
             if (source_file.isFile()) {
                 progress.addValue(source_file.length());
@@ -455 +453 @@
             File[] child_list = source_file.listFiles();
             if (source_file.isFile() || (child_list != null && child_list.length == 0 && origin_node.getParent() != null)) {
-                // System.err.println("Deleting file: " + source_file.getAbsolutePath());
-
                 // Update status area
                 String args[] = new String[1];
@@ -485 +481 @@
             // Else the source is a directory and it has children remaining
             else if(child_list != null && child_list.length > 0) {
-                FileNode recycle_folder_record = null;
                 // Don't worry about all this for true file move actions.
                 if(job.type == FileJob.DELETE) {
@@ -512 +507 @@
             target_file = null;
             origin_node = null;
-            // We can only break out of the while loop if we are out of files, or if the action was cancelled.
-            if(cancel_action) {
+
+            // We only break out of the while loop if we are out of files or the action was cancelled
+            if (cancel_action) {
             // Empty queue
             clearJobs();
             cancel_action = false;
             }
-            // Debugging pause.
-            ///ystem.err.println("Job complete.");
         }
         else {
             // Disable stop button
-            if(stop_button != null) {
+            if (stop_button != null) {
             stop_button.setEnabled(false);
             }
@@ -547 +541 @@
     }
     }
-    
+
+
     /** Register the button that will be responsible for stopping executing file actions. 
      * @param stop_button a JButton