Changeset 11086

Timestamp:

2006-01-23T16:19:48+13:00 (18 years ago)

Author:

mdewsnip

Message:

Added cyclic loop checking and made the Stop button work.

File:

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

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

@@ -159 +159 @@
     public void cancelAction() {
     cancel_action = true;
+    clearJobs();
     }
 
@@ -267 +268 @@
     File target_directory = new File(target_node.getFile(), source_directory.getName());
 
+    // Check that the source directory doesn't contain the target directory (will create a cyclic loop)
+    if (target_directory.getAbsolutePath().startsWith(source_directory.getAbsolutePath())) {
+        if (showErrorDialog(Dictionary.get("FileActions.Cyclic_Path", source_directory.getName())) == JOptionPane.CANCEL_OPTION) {
+        clearJobs();  // Aborting action
+        }
+        return;
+    }
+
     // The target directory shouldn't already exist
     if (target_directory.exists()) {
@@ -650 +659 @@
             progress.setString(Dictionary.get("FileActions.No_Activity"));
 
-            // Reset "yes to all"
+            // Reset "yes to all" and "cancel" flags
             yes_to_all = false;
+            cancel_action = false;
 
             // Wait for a new file job