Changeset 11599

Timestamp:

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

Author:

mdewsnip

Message:

Moved the RecycleBin object into the Gatherer class so it can be more globally used.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (3 diffs)
• gui/GatherPane.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -44 +44 @@
 import org.greenstone.gatherer.file.FileManager;
 import org.greenstone.gatherer.file.FileAssociationManager;
+import org.greenstone.gatherer.file.RecycleBin;
 import org.greenstone.gatherer.gui.GUIManager;
 import org.greenstone.gatherer.gui.URLField;
@@ -81 +82 @@
     /** A public reference to the CollectionManager. */
     static public CollectionManager c_man;
+    /** A public reference to the RecycleBin. */
+    static public RecycleBin recycle_bin;
     /** a reference to the Servlet Configuration is GS3 */
     static public ServletConfiguration servlet_config;
@@ -394 +397 @@
         // Create Collection Manager
         c_man = new CollectionManager();
+        // Create Recycle Bin
+        recycle_bin = new RecycleBin();
 
         if (GS3) {

trunk/gli/src/org/greenstone/gatherer/gui/GatherPane.java

@@ -110 +110 @@
     /** Ensures that expansion and selection events between collection trees based on the same model are synchronized. */
     private TreeSynchronizer collection_tree_sync = null;
-    /** The button used to delete files, which also doubles as a drop target for files from the Trees. */
-    private RecycleBin bin_button           =  null;
     /** The default size of a special mapping dialog. */
     static final Dimension DIALOG_SIZE = new Dimension(400, 120);
@@ -156 +154 @@
     // If a user has clicked on the bin button directly remove whatever
     // files are selected in the active tree.
-    if(event.getSource() == bin_button) {
-        if(!bin_button.ignore()) {
+    if (event.getSource() == Gatherer.recycle_bin) {
+        if (!Gatherer.recycle_bin.ignore()) {
         // Find the active tree (you've made selections in).
         DragTree tree = (DragTree) group.getActive();
@@ -169 +167 @@
             source_nodes[i] = (FileNode)(paths[i].getLastPathComponent());
             }
-            Gatherer.f_man.action(tree, source_nodes, bin_button, null);
+            Gatherer.f_man.action(tree, source_nodes, Gatherer.recycle_bin, null);
         }
         }
@@ -297 +295 @@
     JPanel button_pane = new JPanel();
 
-    bin_button = new RecycleBin();
-    bin_button.addActionListener(this);
-    bin_button.setMinimumSize(MIN_SIZE);
-    bin_button.setPreferredSize(MIN_SIZE);
-    Dictionary.registerTooltip(bin_button, "Collection.Delete_Tooltip");
-    group.add(bin_button);
+    RecycleBin recycle_bin = Gatherer.recycle_bin;
+    recycle_bin.addActionListener(this);
+    recycle_bin.setMinimumSize(MIN_SIZE);
+    recycle_bin.setPreferredSize(MIN_SIZE);
+    Dictionary.registerTooltip(recycle_bin, "Collection.Delete_Tooltip");
+    group.add(recycle_bin);
 
     // Layout Components.
@@ -334 +332 @@
 
     button_pane.add(new_folder);
-    button_pane.add(bin_button);
+    button_pane.add(recycle_bin);
 
     control_pane.setLayout(new BorderLayout());
@@ -722 +720 @@
 
         // Fire a delete action
-        Gatherer.f_man.action(tree, source_nodes, bin_button, null);
+        Gatherer.f_man.action(tree, source_nodes, Gatherer.recycle_bin, null);
         }
 
@@ -778 +776 @@
             source_nodes[i] = (FileNode) paths[i].getLastPathComponent();
             }
-            Gatherer.f_man.action(tree, source_nodes, bin_button, null);
+            Gatherer.f_man.action(tree, source_nodes, Gatherer.recycle_bin, null);
             source_nodes = null;
         }