Changeset 11595

Timestamp:

2006-04-06T14:18:42+12:00 (18 years ago)

Author:

mdewsnip

Message:

Fixed a bug preventing files from being deleted from the "Downloaded Files" folder.

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java (modified) (1 diff)

trunk/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);
+        }
     }