Changeset 36237

Timestamp:

2022-06-03T17:30:55+12:00 (23 months ago)

Author:

davidb

Message:

Bugfix: Fixing my own bug (Anu). When replacing a file with another file in the Gather Pane through the Replace task in the popup menu, I missed handling the remote case for if the new file has a different name from the old file. The solution was simple, in that in this case too, the ReplaceTask instance must listen out for the File Copied Success event getting fired, so that it can then upload the new file to the remote machine.

File:

• main/trunk/gli/src/org/greenstone/gatherer/file/FileManager.java (modified) (1 diff)

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

@@ -577 +577 @@
         file_queue.addJob(System.currentTimeMillis(), Gatherer.g_man.gather_pane.workspace_tree, new FileNode[] { source_node }, collection_tree, parent, FileJob.COPY);
         
-        } else {
-        // If the file name of the replacing file is NOT the same as the one being replaced
-        // (a) copy the new file in - but don't bring metadata
+        } else {        
+        // If the file name of the replacing file is NOT the same as the one being replaced:
+        // (a) Again, this ReplaceTask instance needs to listen for the file copy event fired,
+        // so that the source file will also get uploaded to the remote GS3 on FileCopiedSuccess
+        file_queue.addFileCopiedSuccessListener(this);
+
+        // (b) copy the new file in - but don't bring metadata
         file_queue.addJob(System.currentTimeMillis(), Gatherer.g_man.gather_pane.workspace_tree, new FileNode[] { source_node }, collection_tree, parent, FileJob.COPY_FILE_ONLY);
         
-        // (b) final step to finish off: do a replace of old file with new file
+        // (c) final step to finish off: do a replace of old file with new file
         file_queue.addJob(System.currentTimeMillis(), collection_tree, new FileNode[] { collection_tree_node }, collection_tree, new_collection_tree_node, FileJob.REPLACE);
         }