Changeset 37191

Timestamp:

2023-01-28T15:43:52+13:00 (15 months ago)

Author:

kjdon

Message:

added 'new file' into the right click menu in the collection tree. Its handled using replacefile task, but instead of replacing the current file, its using the specified node as the parent, and adding the new file into that folder

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionTree.java (modified) (4 diffs)
• file/FileManager.java (modified) (6 diffs)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionTree.java

@@ -151 +151 @@
     private JMenuItem metaaudit = null;
     private JMenuItem new_folder = null;
+    private JMenuItem new_file = null;
     private JMenuItem new_dummy_doc = null;
     private JMenuItem refresh = null; // for refreshing folder view
@@ -267 +268 @@
         add(new_folder);
 
+        new_file = new JMenuItem(Dictionary.get("CollectionPopupMenu.New_File"));
+        new_file.addActionListener(this);
+        add(new_file);
+
         new_dummy_doc = new JMenuItem(Dictionary.get("CollectionPopupMenu.New_Dummy_Doc"));
         new_dummy_doc.addActionListener(this);
@@ -358 +363 @@
         add(new_folder);
 
+        
+        new_file = new JMenuItem(Dictionary.get("CollectionPopupMenu.New_File"));
+        new_file.addActionListener(this);
+        add(new_file);
+
         new_dummy_doc = new JMenuItem(Dictionary.get("CollectionPopupMenu.New_Dummy_Doc"));
         new_dummy_doc.addActionListener(this);
@@ -415 +425 @@
         Gatherer.f_man.newFolder(collection_tree, node);
         }
-
+        else if (source == new_file) {
+        Gatherer.f_man.newCollectionFile(collection_tree, node);
+        }
         // New dummy doc
         else if (source == new_dummy_doc) {

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

@@ -68 +68 @@
     public static final int FILE_TYPE = 0;
     public static final int FOLDER_TYPE = 1;
+
     protected static File startup_directory = null;
 
@@ -509 +510 @@
     }
 
+    public void newCollectionFile(CollectionTree collection_tree, CollectionTreeNode parent_node)
+    {
+    new ReplaceOrNewTask(collection_tree, parent_node, false ).start();
+    }
+
     public void replaceCollectionFile(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 ReplaceTask(collection_tree, collection_tree_node).start();
-    }
-
-
-    private class ReplaceTask
+    new ReplaceOrNewTask(collection_tree, collection_tree_node, true).start();
+    }
+
+
+    private class ReplaceOrNewTask
     extends Thread implements FileCopiedSuccessListener
     {
     private CollectionTree collection_tree = null;
     private CollectionTreeNode collection_tree_node = null;
-
-    public ReplaceTask(CollectionTree collection_tree, CollectionTreeNode collection_tree_node)
+    private boolean replacing = false;
+
+    public ReplaceOrNewTask(CollectionTree collection_tree, CollectionTreeNode collection_tree_node, boolean replacing)
     {
         this.collection_tree = collection_tree;
-        this.collection_tree_node = collection_tree_node;
+        this.collection_tree_node = collection_tree_node; // either the file to replace, or the folder to go into
+        this.replacing = replacing;
     }
 
@@ -531 +539 @@
     {
         JFileChooser file_chooser = new JFileChooser(startup_directory);
-        file_chooser.setDialogTitle(Dictionary.get("ReplacePrompt.Title"));
+        if (replacing) {
+        file_chooser.setDialogTitle(Dictionary.get("ReplacePrompt.Title"));
+        } else {
+        file_chooser.setDialogTitle(Dictionary.get("NewPrompt.Title"));
+        }
         File new_file = null;
         int return_val = file_chooser.showOpenDialog(null);
@@ -554 +566 @@
         // or remote file gets updated but file gone missing in client-GLI view until collection reopened.
         boolean isSameLeafName = false;
-        if(collection_tree_node.getFile().getName().equals(new_file.getName())) {
+        if(replacing && collection_tree_node.getFile().getName().equals(new_file.getName())) {
         DebugStream.println(" @@@ File Replace: New file has the same name as existing.");
         isSameLeafName = true;
         }
         
-        File target_directory = collection_tree_node.getFile().getParentFile();
+        File target_directory;
+        FileNode parent; // store the original source's parent, need it several times after changing source
+        if (replacing) {
+        target_directory = collection_tree_node.getFile().getParentFile();
+        parent = (FileNode)collection_tree_node.getParent();
+        } else {
+        target_directory = collection_tree_node.getFile();
+        parent = collection_tree_node;
+        }
         CollectionTreeNode new_collection_tree_node = new CollectionTreeNode(new File(target_directory, new_file.getName()));
         
-        FileNode parent = (FileNode)collection_tree_node.getParent(); // store the original source's parent, need it several times after changing source
+        //FileNode parent = (FileNode)collection_tree_node.getParent(); // store the original source's parent, need it several times after changing source
 
         if(isSameLeafName) {
@@ -585 +605 @@
         // (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);
-        
-        // (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);
-        }
+    
+        if (replacing) {
+            // (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);
+        }
+        }
+
 
 
@@ -605 +628 @@
         
         if (Gatherer.isGsdlRemote) {
-        File target_directory = this.collection_tree_node.getFile().getParentFile();
+        File target_directory;
+        if (this.replacing) {
+            target_directory = this.collection_tree_node.getFile().getParentFile();
+        } else {
+            target_directory = this.collection_tree_node.getFile();
+        }
         File collection_tree_node_file = this.collection_tree_node.getFile();
         
         String collection_name = CollectionManager.getLoadedCollectionName();
+        if (this.replacing) {
         Gatherer.remoteGreenstoneServer.deleteCollectionFile(collection_name, collection_tree_node_file);
+        }
         Gatherer.remoteGreenstoneServer.uploadFilesIntoCollection(collection_name, new File[] { new_file }, target_directory);
         }