Changeset 8599

Timestamp:

2004-11-18T15:16:13+13:00 (19 years ago)

Author:

mdewsnip

Message:

Extracted the last of the undo functionality.

Location:

trunk/gli/src/org/greenstone/gatherer/file

Files:

• FileJob.java (modified) (2 diffs)
• FileManager.java (modified) (1 diff)
• FileQueue.java (modified) (8 diffs)

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

@@ -39 +39 @@
 
     public boolean folder_level = false;
-    /** true if this should generate an undo event, false for a redo one. */
-    public boolean undo = true;
-    /** true if this job should generate an undo event of any kind. */
-    public boolean undoable = false;
     /** The type of this movement as an byte. */
     public byte type = 0;
@@ -69 +65 @@
      * @param dest The files new FileNode parent within the target.
      * @param type The type of this movement as an int, either COPY or DELETE.
-     * @param undo true if this job some create an undo job when actioned, false for a redo job.
-     * @param undoable true if this job can generate undo or redo jobs, false otherwise.
      */
-    public FileJob(long id, DragComponent source, FileNode orig, DragComponent target, FileNode dest, byte type, boolean undo, boolean undoable) {
+    public FileJob(long id, DragComponent source, FileNode orig, DragComponent target, FileNode dest, byte type) {
     this.id = id;
     this.source = source;
     this.target = target;
     this.type = type;
-    this.undo = undo;
-    this.undoable = undoable;
     ///ystem.err.println("New Job: " + type + ", " + source + ", " + target);
     // Dont store FileNodes which can go stale. Store paths instead, which are used to locate current 'fresh' versions of nodes.

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

@@ -190 +190 @@
         // Queue the job(s) (this may fail if we are asked to delete a read only file)
         for (int i = 0; i < source_nodes.length; i++) {
-            queue.addJob(id, source, source_nodes[i], target, target_node, type, true, true, true);
+            queue.addJob(id, source, source_nodes[i], target, target_node, type, true);
         }
         }

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

@@ -94 +94 @@
      * @param parent The files new FileNode parent within the target.
      * @param type The type of this movement as an int, either COPY or DELETE.
-     * @param undo true if this job should generate undo jobs, false for redo ones.
-     * @param undoable true if this job can generate undo or redo jobs at all, false otherwise.
-     */
-    public void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, boolean undo, boolean undoable, boolean folder_level) {
-    addJob(id, source, child, target, parent, type, undo, undoable, folder_level, -1);
-    }
-
-    synchronized private void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, boolean undo, boolean undoable, boolean folder_level, int position) {
-    FileJob job = new FileJob(id, source, child, target, parent, type, undo, undoable);
+     */
+    public void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, boolean folder_level) {
+    addJob(id, source, child, target, parent, type, folder_level, -1);
+    }
+
+    synchronized private void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, boolean folder_level, int position) {
+    FileJob job = new FileJob(id, source, child, target, parent, type);
     job.folder_level = folder_level;
         DebugStream.println("Adding job: " + job);
@@ -186 +184 @@
         // Retrieve the next job
         int position = queue.size() - 1;
-        FileJob job = removeJob(position);
+        FileJob job = null;
+        if (position >= 0) {
+            job = (FileJob) queue.remove(position);
+        }
+
         if (job != null) {
             ///ystem.err.println("Found job: " + job);
@@ -357 +359 @@
                     SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, new_record);
                     new_node = new_record;
-                    
-                    // create undo job
-                    if(job.undoable) {
-                        job.undoable = false;
-                    }
                     new_record = null;
                     }
@@ -369 +366 @@
                     // create new record
                     FileNode directory_record = new FileNode(target_file);
-                    ///ystem.err.println("Directory record = " + directory_record + " (" + target_file.getAbsolutePath() + ")");
                     SynchronizedTreeModelTools.insertNodeInto(target_model, destination_node, directory_record);
                     // Why is this not happening eh?
@@ -377 +373 @@
                     target_file.mkdirs();
                     new_node = directory_record;
-                    // create undo job
-                    if(job.undoable) {
-                        job.undoable = false;
-                    }
                     }
                     // Else inform the users that a directory already exists and files will be copied into it
@@ -398 +390 @@
                     for(int i = 0; i < origin_node.getChildCount(); i++) {
                     child_record = (FileNode) origin_node.getChildAt(i);
-                    addJob(job.ID(), job.source, child_record, job.target, directory_record, job.type, job.undo, false, false, position);
+                    addJob(job.ID(), job.source, child_record, job.target, directory_record, job.type, false, position);
                     }
                     child_record = null;
@@ -486 +478 @@
                     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);
+                    addJob(job.ID(), job.source, child_record, job.target, destination_node, FileJob.DELETE, false, position);
                 }  
                 }
@@ -666 +658 @@
     }
     }
-
-
-    private FileJob removeJob(int position) {
-    FileJob job = null;
-    if(queue.size() > 0) {
-        job = (FileJob) queue.remove(position);
-    }
-    return job;
-    }
 }