Changeset 11242 for trunk

Timestamp:

2006-02-14T14:58:24+13:00 (18 years ago)

Author:

mdewsnip

Message:

Added the back-end code for supporting file/folder renames in the collection tree (Gather pane). Renaming is done almost exactly the same as moving.

Location:

trunk/gli/src/org/greenstone/gatherer/file

Files:

• FileJob.java (modified) (1 diff)
• FileQueue.java (modified) (3 diffs)

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

@@ -60 +60 @@
     /** An element of the job type enumeration indicating an empty folder delete action. */
     static final public byte DELETE_EMPTY_DIRECTORY = 5;
+    /** An element of the job type enumeration indicating a rename action. */
+    static final public byte RENAME = 6;
 
     /** Constructor.

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

@@ -312 +312 @@
     File source_directory = source_node.getFile();
     File target_directory = new File(target_node.getFile(), source_directory.getName());
+    if (file_job.type == FileJob.RENAME) {
+        // This is the only difference between moves and renames
+        target_directory = target_node.getFile();
+        target_node = (FileNode) source_node.getParent();
+    }
 
     // Check the target directory isn't the source directory
@@ -486 +491 @@
     File source_file = source_node.getFile();
     File target_file = new File(target_node.getFile(), source_file.getName());
+    if (file_job.type == FileJob.RENAME) {
+        // This is the only difference between moves and renames
+        target_file = target_node.getFile();
+        target_node = (FileNode) source_node.getParent();
+    }
 
     // Check the target file isn't the source file
@@ -580 +590 @@
     }
 
-    // Move job
-    if (file_job.type == FileJob.MOVE) {
+    // Move (or rename) job
+    if (file_job.type == FileJob.MOVE || file_job.type == FileJob.RENAME) {
         file_status.setText(Dictionary.get("FileActions.Moving", formatPath("FileActions.Moving", source_file.getAbsolutePath(), file_status.getSize().width)));
         if (source_file.isFile()) {