Changeset 11387 for trunk/gli

Timestamp:

2006-03-17T13:25:25+13:00 (18 years ago)

Author:

mdewsnip

Message:

Fixed a minor bug where an extra file icon was added to the tree if you overwrote an existing file with the same name.

File:

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

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

@@ -405 +405 @@
     File target_file = new File(target_node.getFile(), source_file.getName());
 
-    // The target file shouldn't already exist
+    // The target file shouldn't already exist -- if it does ask the user whether they want to overwrite
+    boolean overwrite_file = false;
     if (target_file.exists()) {
         int result = showOverwriteDialog(target_file.getName());
@@ -416 +417 @@
         return;
         }
+
+        overwrite_file = true;
     }
 
@@ -475 +478 @@
     CollectionTreeNode new_target_node = new CollectionTreeNode(target_file);
     FileSystemModel target_model = file_job.target.getTreeModel();
-    SynchronizedTreeModelTools.insertNodeInto(target_model, target_node, new_target_node);
+    if (overwrite_file == false) {
+        SynchronizedTreeModelTools.insertNodeInto(target_model, target_node, new_target_node);
+    }
     Gatherer.c_man.fireFileAddedToCollection(target_file);