Changeset 8595

Timestamp:

2004-11-18T11:56:29+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed more dead code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

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

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

@@ -68 +68 @@
      */
     public FileManager() {
-    queue = new FileQueue(false);
+    queue = new FileQueue();
     queue.start();
     }

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

@@ -40 +40 @@
 import org.greenstone.gatherer.metadata.MetadataValue;
 import org.greenstone.gatherer.metadata.MetadataXMLFileManager;
-import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.DragComponent;
 import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
@@ -51 +50 @@
 public class FileQueue
     extends Thread
-    implements TreeSelectionListener {
+{
     /** When someone requests the movement queue to be dumped this cancel flag is set to true. */
     private boolean cancel_action = false;
-    /** A temporary mapping from currently existing FileNode folder to their equivelent FileNode folder within the undo managers tree. */
-    private HashMap completed_folder_mappings = new HashMap();
 
     /** The button which controls the stopping of the file queue. */
     private JButton stop_button = null;
 
-    /** true to cause this file queue to return from run() as soon as there are no jobs left on the queue. Useful for undo jobs which must occur before a specific action. */
-    private boolean return_immediately = false;
-    /** We are only allowed to wait under specific circumstances. */
-    /* private boolean wait_allowed = true; */
     /** true if the user has selected yes to all from a file 'clash' dialog. */
     private boolean yes_to_all = false;
-    /** A temporary mapping from currently existing FileNodes to the potential FileNode folder within the undo managers tree. */
-    private HashMap recycle_folder_mappings = new HashMap();
     /** A label explaining the current moving files status. */
     private JLabel file_status = null;
     /** A list containing a queue of waiting movement jobs. */
-    private ArrayList queue;
+    private ArrayList queue = null;
     /** A progress bar which shows how many bytes, out of the total size of bytes, has been moved. */
     private LongProgressBar progress = null;
-    /** The last piece of text shown on the file status label, just incase we are displaying a very temporary message. */
-    private String previous = null;
+
+
     /** Constructor.
-     * @param return_immediately true to cause this file queue to return from run() as soon as there are no jobs left on the queue.
-     * @see org.greenstone.gatherer.Configuration
-     * @see org.greenstone.gatherer.gui.Coloring
-     * @see org.greenstone.gatherer.gui.LongProgressBar
-     */
-    public FileQueue(boolean return_immediately) {
-    this.return_immediately = return_immediately;
+     */
+    public FileQueue() {
     this.queue = new ArrayList();
-    String args[] = new String[2];
-    args[0] = "0";
-    args[1] = "0";
     file_status = new JLabel();
-    Dictionary.setText(file_status, "FileActions.Selected", args);
+    Dictionary.setText(file_status, "FileActions.No_Activity");
     progress = new LongProgressBar();
     progress.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
@@ -95 +78 @@
     progress.setString(Dictionary.get("FileActions.No_Activity"));
     progress.setStringPainted(true);
-    args = null;
     }
 
@@ -381 +363 @@
                     if(job.undoable) {
                         job.undoable = false;
-                        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);
-                        }
-                        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);
-                        }
                     }
                     new_record = null;
@@ -408 +382 @@
                     if(job.undoable) {
                         job.undoable = false;
-                        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!
-                        }
-                        else {
-                        // Movements however do need a source and source parent so the file can be moved back to the correct place.
-                        }
                     }
                     }
@@ -517 +485 @@
             // Else the source is a directory and it has children remaining
             else if(child_list != null && child_list.length > 0) {
-                ///ystem.err.print("Nonempty directory -> ");
-                ///atherer.println("Directory is non-empty. Remove children first.");
                 FileNode recycle_folder_record = null;
                 // Don't worry about all this for true file move actions.
                 if(job.type == FileJob.DELETE) {
                 // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once.
-                ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
-                ///ystem.err.println("Directory actually has " + child_list.length + " children.");
                 origin_node.refresh();
-                ///atherer.println("Directory has " + origin_node.getChildCount() + " children.");
-                ///atherer.println("Directory actually has " + child_list.length + " children.");
                 for(int i = 0; i < origin_node.size(); i++) {
                     FileNode child_record = (FileNode) origin_node.get(i);
                     ///atherer.println("Queuing: " + child_record);
                     addJob(job.ID(), job.source, child_record, job.target, destination_node, FileJob.DELETE, job.undo, false, false, position);
-                    //if(recycle_folder_record != null) {
-                    //  recycle_folder_mappings.put(child_record, recycle_folder_record);
-                    //}
                 }  
                 }
@@ -579 +538 @@
             progress.setString(Dictionary.get("FileActions.No_Activity"));
             yes_to_all = false;
-            completed_folder_mappings.clear();
-            recycle_folder_mappings.clear();
-
-            // Now wait if applicable.
-            if(return_immediately) {
-                return;
-            }
-            ///ystem.err.println("Waiting");
             wait();
             }
@@ -604 +555 @@
     }
 
-    /** Called when the user makes some selection in one of the trees we are listening to. From this we update the status details. */
-    public void valueChanged(TreeSelectionEvent event) {
-    JTree tree = (JTree) event.getSource();
-    if(tree.getSelectionCount() > 0) {
-        TreePath selection[] = tree.getSelectionPaths();
-        int file_count = 0;
-        int dir_count = 0;
-        for(int i = 0; i < selection.length; i++) {
-        TreeNode record = (TreeNode) selection[i].getLastPathComponent();
-        if(record.isLeaf()) {
-            file_count++;
-        }
-        else {
-            dir_count++;
-        }
-        record = null;
-        }
-        selection = null;
-    }
-    tree = null;
-    }
 
     synchronized private void clearJobs() {

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

@@ -199 +199 @@
         FileNode node = (FileNode) collection_tree.getModel().getRoot();
         Gatherer.f_man.newFolder(collection_tree, node);
-        //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.No_Parent_For_New_Folder"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
     }
@@ -234 +233 @@
     workspace_tree.addMouseListener(Gatherer.g_man.foa_listener);
     workspace_tree.addTreeExpansionListener(Gatherer.g_man.foa_listener);
-    workspace_tree.addTreeSelectionListener(file_queue);
     workspace_tree.putClientProperty("JTree.lineStyle", "Angled");
     workspace_tree.setBackgroundNonSelectionColor(Configuration.getColor("coloring.workspace_tree_background", false));
@@ -255 +253 @@
     collection_pane.setSize(TREE_SIZE);
 
-    //args = new String[1];
-    //args[0] = Dictionary.get("Collection.No_Collection");
     collection_label = new JLabel();
     collection_label.setOpaque(true);
@@ -262 +258 @@
 
     collection = Gatherer.c_man.getRecordSet();
-    if(collection != null) {
+    if (collection != null) {
         collection_tree = new DragTree(Utility.COLLECTION_TREE, collection, null, true);
         collection_tree.setEnabled(true);
@@ -275 +271 @@
     collection_tree.addMouseListener(mouse_listener);
     collection_tree.addMouseListener(Gatherer.g_man.foa_listener);
-    collection_tree.addTreeSelectionListener(file_queue);
     collection_tree.addTreeExpansionListener(Gatherer.g_man.foa_listener);
     collection_tree.putClientProperty("JTree.lineStyle", "Angled");
@@ -283 +278 @@
     collection_tree.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
     collection_tree.setRootVisible(false);
-    //collection_tree.setRootVisible(true);
 
     collection_scroll = new JScrollPane(collection_tree);
 
     collection_filter = Gatherer.g_man.getFilter(collection_tree);
-    if(collection != null) {
+    if (collection != null) {
         collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
     }
@@ -306 +300 @@
 
     JPanel file_pane = new JPanel();
-    //file_pane.setBackground(Color.white);
-    //JPanel job_pane = new JPanel();
-    //job_pane.setBackground(Color.white);
     JPanel progress_pane = new JPanel();
-    //progress_pane.setBackground(Color.white);
     JLabel file_status = file_queue.getFileStatus();
-    //JLabel job_status = job_queue.getJobStatus();
 
     JProgressBar progress_bar = file_queue.getProgressBar();
@@ -341 +330 @@
     tree_pane.setDividerLocation(TREE_SIZE.width - 10);
 
-    //job_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
-    //job_pane.setLayout(new BorderLayout());
-    //job_pane.add(job_status, BorderLayout.CENTER);
-
     file_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
     file_pane.setLayout(new BorderLayout());
@@ -356 +341 @@
     inner_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10,10,10,10), BorderFactory.createLoweredBevelBorder()));
     inner_pane.setLayout(new GridLayout(2,1));
-    //inner_pane.add(job_pane);
     inner_pane.add(file_pane);
     inner_pane.add(progress_pane);
@@ -364 +348 @@
 
     control_pane.setLayout(new BorderLayout());
-    //control_pane.add(new_folder, BorderLayout.WEST);
     control_pane.add(inner_pane, BorderLayout.CENTER);
     control_pane.add(button_pane, BorderLayout.EAST);