Changeset 11700

Timestamp:

2006-04-26T13:12:27+12:00 (18 years ago)

Author:

kjdon

Message:

Michael's changes regarding deleting files form downloaded files, added to the branch

Location:

branches/gsdl-2_70-distribution-branch/gli/src/org/greenstone/gatherer

Files:

• file/FileManager.java (modified) (1 diff)
• file/FileQueue.java (modified) (2 diffs)
• gui/GatherPane.java (modified) (2 diffs)

branches/gsdl-2_70-distribution-branch/gli/src/org/greenstone/gatherer/file/FileManager.java

@@ -111 +111 @@
         // Is this the "Downloaded Files" folder?
         if (source_nodes[i].getFile().getAbsolutePath().startsWith(downloaded_files_folder_path)) {
-            // Can only delete from the "Downloaded Files" folder if a collection is open
-            if (Gatherer.c_man.ready() == false) {
-            return;
-            }
             read_only_source = false;
         }

branches/gsdl-2_70-distribution-branch/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -372 +372 @@
     File source_file = source_node.getFile();
 
-    // If we're deleting a metadata.xml file we must unload it
-    boolean metadata_xml_file = source_file.getName().equals(StaticStrings.METADATA_XML);
-    if (metadata_xml_file) {
-        MetadataXMLFileManager.unloadMetadataXMLFile(source_file);
-    }
-    // Otherwise remove any metadata assigned directly to the file
-    else {
-        ArrayList assigned_metadata = MetadataXMLFileManager.getMetadataAssignedDirectlyToFile(source_file);
-        MetadataXMLFileManager.removeMetadata((CollectionTreeNode) source_node, assigned_metadata);
+    // Almost all files will be deleted from the collection tree (exception: files in "Downloaded Files")
+    if (source_node instanceof CollectionTreeNode) {
+        // If we're deleting a metadata.xml file we must unload it
+        boolean metadata_xml_file = source_file.getName().equals(StaticStrings.METADATA_XML);
+        if (metadata_xml_file) {
+        MetadataXMLFileManager.unloadMetadataXMLFile(source_file);
+        }
+        // Otherwise remove any metadata assigned directly to the file
+        else {
+        ArrayList assigned_metadata = MetadataXMLFileManager.getMetadataAssignedDirectlyToFile(source_file);
+        MetadataXMLFileManager.removeMetadata((CollectionTreeNode) source_node, assigned_metadata);
+        }
     }
 
@@ -698 +701 @@
         synchronized(this) {
             // Force both workspace and collection trees to refresh
-            if (Gatherer.g_man != null) {
+            if (Gatherer.g_man != null && Gatherer.c_man.ready()) {
             Gatherer.g_man.refreshWorkspaceTree(DragTree.COLLECTION_CONTENTS_CHANGED);
             // Gatherer.g_man.refreshCollectionTree(DragTree.COLLECTION_CONTENTS_CHANGED);

branches/gsdl-2_70-distribution-branch/gli/src/org/greenstone/gatherer/gui/GatherPane.java

@@ -299 +299 @@
     bin_button = new RecycleBin();
     bin_button.addActionListener(this);
-    bin_button.setEnabled(false);
     bin_button.setMinimumSize(MIN_SIZE);
     bin_button.setPreferredSize(MIN_SIZE);
@@ -443 +442 @@
     collection_tree.setEnabled(collection_loaded);
     collection_filter.setEnabled(collection_loaded);
-    bin_button.setEnabled(collection_loaded);
     new_folder.setEnabled(collection_loaded);