Changeset 11246

Timestamp:

2006-02-14T15:41:46+13:00 (18 years ago)

Author:

mdewsnip

Message:

User interface for the new ability to rename files in the collection tree. Note that extracted metadata will not be displayed for renamed files (until the collection is rebuilt) -- this is fair because some of this metadata (eg. Source) will be incorrect anyway.

Location:

trunk/gli

Files:

• classes/dictionary.properties (modified) (2 diffs)
• src/org/greenstone/gatherer/file/FileManager.java (modified) (2 diffs)
• src/org/greenstone/gatherer/gui/GatherPane.java (modified) (3 diffs)
• src/org/greenstone/gatherer/gui/RenamePrompt.java (added)

trunk/gli/classes/dictionary.properties

@@ -328 +328 @@
 CollectionPopupMenu.New_Dummy_Doc:New dummy document
 CollectionPopupMenu.New_Folder:New folder
+CollectionPopupMenu.Rename:Rename
 #*******************************
 #
@@ -907 +908 @@
 RemoteGreenstoneServer.Progress:Remote Greenstone Server Progress: 
 RemoteGreenstoneServer.Steal_Lock_Message:This collection is currently locked by user '{0-User name}'.\nDo you want to steal control of this lock file (not recommended, as work may be lost)?
+#**********************
+#
+#***** Rename Prompt *****
+RenamePrompt.Name:Name:
+RenamePrompt.Title:Rename file/folder
 #**********************
 #

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

@@ -41 +41 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.collection.CollectionTree;
 import org.greenstone.gatherer.collection.CollectionTreeNode;
 import org.greenstone.gatherer.gui.GProgressBar;
 import org.greenstone.gatherer.gui.NewFolderOrFilePrompt;
+import org.greenstone.gatherer.gui.RenamePrompt;
 import org.greenstone.gatherer.gui.tree.DragTree;
 import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
@@ -330 +332 @@
     }
     }
+
+
+    public void renameCollectionFile(CollectionTree collection_tree, CollectionTreeNode collection_tree_node)
+    {
+    // This must go in a separate thread because we need the progress bar to work (remote Greenstone server)
+    new RenameTask(collection_tree, collection_tree_node).start();
+    }
+
+
+    private class RenameTask
+    extends Thread
+    {
+    private CollectionTree collection_tree = null;
+    private CollectionTreeNode collection_tree_node = null;
+
+    public RenameTask(CollectionTree collection_tree, CollectionTreeNode collection_tree_node)
+    {
+        this.collection_tree = collection_tree;
+        this.collection_tree_node = collection_tree_node;
+    }
+
+    public void run()
+    {
+        RenamePrompt rename_prompt = new RenamePrompt(collection_tree_node);
+        String new_collection_file_name = rename_prompt.display();
+        rename_prompt.dispose();
+        rename_prompt = null;
+
+        if (new_collection_file_name != null) {
+        File collection_file = collection_tree_node.getFile();
+        File new_collection_file = new File(collection_file.getParentFile(), new_collection_file_name);
+        CollectionTreeNode new_collection_tree_node = new CollectionTreeNode(new_collection_file);
+        file_queue.addJob(System.currentTimeMillis(), collection_tree, new FileNode[] { collection_tree_node }, collection_tree, new_collection_tree_node, FileJob.RENAME);
+        }
+    }
+    }
 }

trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java

@@ -484 +484 @@
     private JMenuItem new_dummy_doc = null;
     private JMenuItem open_externally = null;
+    private JMenuItem rename = null;
 
 
@@ -586 +587 @@
         delete.addActionListener(this);
         add(delete);
+
+        // Rename option (single selections only)
+        if (selection_paths.length == 1) {
+            rename = new JMenuItem(Dictionary.get("CollectionPopupMenu.Rename"), KeyEvent.VK_R);
+            rename.addActionListener(this);
+            add(rename);
+        }
         }
 
@@ -714 +722 @@
         Gatherer.f_man.newFolder(tree, (CollectionTreeNode) node);
         }
+
         // New dummy doc
         else if (source == new_dummy_doc) {
         Gatherer.f_man.newDummyDoc(tree, (CollectionTreeNode) node);
         }
+
         // Open in external program
         else if (source == open_externally) {
         Gatherer.f_man.openFileInExternalApplication(node.getFile());
+        }
+
+        // Rename
+        else if (source == rename) {
+        Gatherer.f_man.renameCollectionFile(collection_tree, (CollectionTreeNode) node);
         }
     }