Changeset 8041

Timestamp:

2004-08-24T16:09:45+12:00 (20 years ago)

Author:

mdewsnip

Message:

Moved undo/UndoManager.java to file/RecycleBin.java.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• file/FileManager.java (modified) (2 diffs)
• file/FileQueue.java (modified) (6 diffs)
• file/RecycleBin.java (added)
• gui/GatherPane.java (modified) (4 diffs)

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

@@ -43 +43 @@
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.file.FileQueue;
+import org.greenstone.gatherer.file.RecycleBin;
 import org.greenstone.gatherer.gui.LongProgressBar;
 import org.greenstone.gatherer.gui.NewFolderPrompt;
 import org.greenstone.gatherer.gui.tree.DragTree;
-import org.greenstone.gatherer.undo.UndoManager;
 import org.greenstone.gatherer.util.DragComponent;
 import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
@@ -87 +87 @@
     // If source and target are different
     else {
-        // If target is the UndoManager, we're deleting
-        if(target instanceof UndoManager) {
-        // If the source is the workspace then display an error message. Workspace is read only.
-
-        // ...except for files from the "Downloaded Files" folder
+        // If target is the RecycleBin, we're deleting
+        if (target instanceof RecycleBin) {
+        // The workspace tree is read only.
+        // ... except for files from the "Downloaded Files" folder
         boolean from_downloaded_files_folder = false;
         if (source_nodes != null) {

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

@@ -39 +39 @@
 import org.greenstone.gatherer.gui.LongProgressBar;
 import org.greenstone.gatherer.gui.tree.DragTree;
-import org.greenstone.gatherer.undo.UndoManager;
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.DragComponent;
@@ -196 +195 @@
      * @see org.greenstone.gatherer.file.FileNode
      * @see org.greenstone.gatherer.gui.LongProgressBar
-     * @see org.greenstone.gatherer.undo.UndoManager
      * @see org.greenstone.gatherer.util.Utility
      */
@@ -373 +371 @@
                         if(job.type == FileJob.COPY) {
                         // A copy is undone with a delete, so it doesn't really matter where the file originally came from (we're not moving it back there, but into the recycle bin). You may also notice we don't make use of the target parent record. This is because no undo action needs this information, and even if it did it could simply ask for records parent!
-                        Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_COPY, null, null, job.target, new_record, job.undo);
+                        // Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_COPY, null, null, job.target, new_record, job.undo);
                         }
                         else {
                         // Movements however do need a source and source parent so the file can be moved back to the correct place.
-                        Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_MOVE, job.source, (FileNode)origin_node.getParent(), job.target, new_record, job.undo);
+                        // Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_MOVE, job.source, (FileNode)origin_node.getParent(), job.target, new_record, job.undo);
                         }
                     }
@@ -400 +398 @@
                         if(job.type == FileJob.COPY) {
                         // A copy is undone with a delete, so it doesn't really matter where the file originally came from (we're not moving it back there, but into the recycle bin). You may also notice we don't make use of the target parent record. This is because no undo action needs this information, and even if it did it could simply ask for records parent!
-                        Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_COPY, null, null, job.target, directory_record, job.undo);
+                        // Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_COPY, null, null, job.target, directory_record, job.undo);
                         }
                         else {
                         // Movements however do need a source and source parent so the file can be moved back to the correct place.
-                        Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_MOVE, job.source, (FileNode)origin_node.getParent(), job.target, directory_record, job.undo);
+                        // Gatherer.c_man.undo.addUndo(job.ID(), UndoManager.FILE_MOVE, job.source, (FileNode)origin_node.getParent(), job.target, directory_record, job.undo);
                         }
                     }
@@ -453 +451 @@
                     }
                 // If it came from the recycle bin retrieve the metadata from there, once again remembering to account for inherited metadata
-                    else if (job.source.toString().equals("Undo")) {
-                    // Retrieve metadata from the recycle bin
-                    ArrayList existing_metadata = Gatherer.c_man.undo.getMetadata(source_file);
-                    // then assign this remainder to the new folder.
-                    Gatherer.c_man.getCollection().gdm.addMetadata(new_node, existing_metadata);
-                    existing_metadata = null;
-                    }
+//                      else if (job.source.toString().equals("Undo")) {
+//                      // Retrieve metadata from the recycle bin
+//                      ArrayList existing_metadata = Gatherer.c_man.undo.getMetadata(source_file);
+//                      // then assign this remainder to the new folder.
+//                      Gatherer.c_man.getCollection().gdm.addMetadata(new_node, existing_metadata);
+//                      existing_metadata = null;
+//                      }
                 // Otherwise if it came from the workspace use the MSMs parsers to search for folder level metadata (such as metadata.xml or marc records).
                     else if (job.source.toString().equals("Workspace")) {
@@ -497 +495 @@
                 // Remove its metadata
                 ArrayList metadatum = null;
-                if(job.source == Gatherer.c_man.undo) {
-                Gatherer.c_man.undo.addMetadata(target_file, metadatum);
-                }
-                else {
-                metadatum = Gatherer.c_man.getCollection().gdm.removeMetadata(origin_node.getFile());
-                }
+//                  if(job.source == Gatherer.c_man.undo) {
+//                  Gatherer.c_man.undo.addMetadata(target_file, metadatum);
+//                  }
+//                  else {
+                metadatum = Gatherer.c_man.getCollection().gdm.removeMetadata(origin_node.getFile());
+                // }
                 // determine its parent node
                 FileNode parent_record = (FileNode)origin_node.getParent();

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

@@ -51 +51 @@
 import org.greenstone.gatherer.file.FileQueue;
 import org.greenstone.gatherer.file.FileSystemModel;
+import org.greenstone.gatherer.file.RecycleBin;
 import org.greenstone.gatherer.gui.Filter;
 import org.greenstone.gatherer.gui.GComboBox;
@@ -56 +57 @@
 import org.greenstone.gatherer.gui.tree.DragTree;
 import org.greenstone.gatherer.gui.tree.WorkspaceTree;
-import org.greenstone.gatherer.undo.UndoManager;
 import org.greenstone.gatherer.util.DragComponent;
 import org.greenstone.gatherer.util.DragGroup;
@@ -110 +110 @@
     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 UndoManager bin_button          =  null;
+    private RecycleBin bin_button           =  null;
     /** The default size of a special mapping dialog. */
     static final Dimension DIALOG_SIZE = new Dimension(400, 120);
@@ -364 +364 @@
     JPanel button_pane = new JPanel();
 
-    bin_button = Gatherer.c_man.undo;
+    bin_button = new RecycleBin();
     bin_button.addActionListener(this);
     bin_button.setEnabled(false);