Changeset 22605 for main/trunk/gli/src/org/greenstone/gatherer/file

Timestamp:

2010-08-11T21:28:34+12:00 (14 years ago)

Author:

ak19

Message:

Ticket #152: Allowing different paths to collect dir so that GLI can work with collect dirs on pen drives. NONE OF THESE CHANGES ARE FOR Client-GLI AS YET. 1. Preferences (Connection tab), Open and New Collection dialogs allow one to change the current collect directory containing the collections to select from. 2. New Collection dialog allows one to base a new collection on an existing collection in a collect dir other than the current collect dir. 3. Collections in the Documents in Greenstone Collections Workspace Tree Node now have two additional rightclick options: to move and copy these collections to another location.

Location:

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

Files:

• FileManager.java (modified) (3 diffs)
• FileQueue.java (modified) (1 diff)
• WorkspaceTree.java (modified) (4 diffs)

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

@@ -62 +62 @@
     static private FileQueue file_queue = null;
 
-    public static int FILE_TYPE = 0;
-    public static int FOLDER_TYPE = 1;
+    public static final int COPY = 0;
+    public static final int MOVE = 1;
+
+    public static final int FILE_TYPE = 0;
+    public static final int FOLDER_TYPE = 1;
     protected static File startup_directory = null;
 
@@ -129 +132 @@
     }
 
+    /** For moving and copying of folders. */
+    public void action(File sourceFolder, File targetFolder, int operation) {
+    (new SimpleFileTask(sourceFolder, targetFolder, operation)).start();
+    }
+    
 
     /** Retrieves the file queue object. */
@@ -136 +144 @@
     }
 
+    /** Performs the simple file task of moving or copying folders. */
+    private class SimpleFileTask
+    extends Thread
+    {
+    private File sourceFolder;
+    private File targetFolder;
+    int operation; // MOVE or COPY
+
+    public SimpleFileTask(File sourceFolder, File targetFolder, int operation)
+    {
+        this.sourceFolder = sourceFolder;       
+        this.targetFolder = targetFolder;
+        this.operation = operation;
+    }
+
+
+    public void run()
+    {
+        // check if we're moving or overwriting the current collection
+        String currentColPath = Gatherer.getCollectDirectoryPath()+CollectionManager.getLoadedCollectionName();
+        if(currentColPath.equals(sourceFolder.getAbsolutePath()) 
+           || currentColPath.equals(targetFolder.getAbsolutePath())) {
+        Gatherer.g_man.saveThenCloseCurrentCollection();
+        }
+        
+        // if moving, try a simple move operation (if it works, it
+        // shouldn't take long at all and doesn't need a progress bar)
+        if(operation == MOVE && sourceFolder.renameTo(targetFolder)) {
+        //System.err.println("**** A simple renameTo() worked.");
+        WorkspaceTreeModel.refreshGreenstoneCollectionsNode();
+        return;
+        }
+
+        // Reset the progress bar and set it to indeterminate while calculating its size
+        GProgressBar progress_bar = file_queue.getProgressBar();
+        progress_bar.reset();
+        progress_bar.setIndeterminate(true);
+
+        String status = "FileActions.Moving";
+        if(operation == COPY) {
+        status = "FileActions.Copying";     
+        }
+        progress_bar.setString(Dictionary.get(status));
+        file_queue.getFileStatus().setText(Dictionary.get(status,
+                                  file_queue.formatPath(status,
+                                     sourceFolder.getAbsolutePath(), 
+                                     file_queue.getFileStatus().getSize().width)));
+
+        // do the move or copy operation
+        try {
+        //System.err.println("**** Copying " + sourceFolder + " to: " + targetFolder);
+        file_queue.copyDirectoryContents(sourceFolder, targetFolder);       
+        } catch(Exception e) {
+        JOptionPane.showMessageDialog(Gatherer.g_man, e.getMessage(), 
+                          "Can't perform file operation", JOptionPane.ERROR_MESSAGE);
+
+        progress_bar.setIndeterminate(false);
+        progress_bar.clear();
+        return;
+        }
+        
+        // if moving, delete the original source folder and
+        // update the docs in GS collections node in the workspace tree
+        
+        if(operation == MOVE) {
+        Utility.delete(sourceFolder);
+        WorkspaceTreeModel.refreshGreenstoneCollectionsNode();
+        }
+
+
+        progress_bar.setIndeterminate(false);
+        progress_bar.clear();
+        file_queue.getFileStatus().setText(Dictionary.get("FileActions.No_Activity"));
+        progress_bar.setString(Dictionary.get("FileActions.No_Activity"));
+    }
+    }
 
     private class FileTask

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

@@ -162 +162 @@
      * @return A path <strong>String</strong> no longer than width.
      */
-    private String formatPath(String key, String raw, int width)
+    String formatPath(String key, String raw, int width) // package access
     {
     JLabel label = new JLabel(Dictionary.get(key, raw));

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

@@ -39 +39 @@
 import org.greenstone.gatherer.gui.CreateShortcutPrompt;
 import org.greenstone.gatherer.gui.tree.DragTree;
+import org.greenstone.gatherer.util.Utility;
 
 
@@ -217 +218 @@
     private JMenuItem rename = null;
     private JMenuItem replace = null;
+    private JMenuItem copy_collection = null;
+    private JMenuItem move_collection = null;
 
 
@@ -343 +346 @@
         // Or map any other level directories
         else {
+            // --- Options for Documents In Greenstone Collections (greenstone_collections_node) ---
+            // all subfolder of Documents In Greenstone Collections can be copied and moved
+            WorkspaceTreeNode secondLevelNode = (WorkspaceTreeNode) path.getPathComponent(1);
+
+            if (secondLevelNode.toString().equals(Dictionary.get("Tree.World"))) {
+            // Can move and copy the collection folders across
+            copy_collection = new JMenuItem(Dictionary.get("Menu.Copy_Collection"), KeyEvent.VK_P);
+            copy_collection.addActionListener(this);
+            add(copy_collection);
+            
+            move_collection = new JMenuItem(Dictionary.get("Menu.Move_Collection"), KeyEvent.VK_M);
+            move_collection.addActionListener(this);
+            add(move_collection);           
+            }
+
             create_shortcut = new JMenuItem(Dictionary.get("MappingPrompt.Map"), KeyEvent.VK_S);
             create_shortcut.addActionListener(this);
@@ -386 +404 @@
         Gatherer.f_man.openFileInExternalApplication(node.getFile());
         }
+        
+        // Copy or move a collection from Documents in Greenstone Collections
+        else if (source == move_collection || source == copy_collection) {
+
+        JFileChooser chooser = new JFileChooser(Gatherer.getCollectDirectoryPath());
+        chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);        
+        chooser.setDialogTitle(Dictionary.get("FileActions.ChooseDestinationDirectory"));
+        int returnVal = chooser.showOpenDialog(Gatherer.g_man.gather_pane);
+
+        if(returnVal == JFileChooser.APPROVE_OPTION) {          
+
+            // the node that the user rightclicked on ends up
+            // being the col's import folder
+            File sourceFolder = node.getFile(); 
+            if(sourceFolder.getName().equals("import")) { 
+            sourceFolder = sourceFolder.getParentFile();
+            }
+            String target = chooser.getSelectedFile().getAbsolutePath();
+            File targetFolder = new File(target+File.separator+sourceFolder.getName());
+            
+            // some sanity checks
+            if(targetFolder.equals(sourceFolder)) { // directory has not changed. No copy/move performed
+            JOptionPane.showMessageDialog(Gatherer.g_man, 
+                              "Can't move " + sourceFolder + " " + "to itself\n(" + targetFolder + ").", 
+                              "Source and destination directories are the same", 
+                              JOptionPane.ERROR_MESSAGE);
+            return;
+            } else if(targetFolder.exists()) { // option to overwrite or not
+            if(JOptionPane.showConfirmDialog(Gatherer.g_man, 
+                             "Directory " + targetFolder + " already exists. Overwrite?", 
+                             "Destination directory already exists", 
+                             JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) {
+                return;
+            }
+            // else can overwrite: delete the existing targetfolder before copying/moving
+            Utility.delete(targetFolder);
+            } 
+            
+            int operation = (source == move_collection) ? FileManager.MOVE : FileManager.COPY;
+            Gatherer.f_man.action(sourceFolder, targetFolder, operation);
+        }
+        }
     }
     }