Changeset 11598

Timestamp:

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

Author:

mdewsnip

Message:

You can now delete files from the "Downloaded Files" folder when no collection is open.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

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

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

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

@@ -701 +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);

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