Changeset 10247

Timestamp:

2005-07-14T10:38:28+12:00 (19 years ago)

Author:

mdewsnip

Message:

Changed FileQueue.addJob to take an array of source_nodes, and deal with them itself, in preparation for adding a RemoteFileQueue.java class.

Location:

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

Files:

• FileManager.java (modified) (1 diff)
• FileQueue.java (modified) (1 diff)

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

@@ -167 +167 @@
         boolean cancelled = file_queue.calculateSize(source_nodes);
         if (!cancelled) {
-        // 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++) {
-            file_queue.addJob(id, source, source_nodes[i], target, target_node, type, true);
-        }
+        file_queue.addJob(id, source, source_nodes, target, target_node, type, true);
         }
 

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

@@ -98 +98 @@
      * @param type The type of this movement as an int, either COPY or DELETE.
      */
-    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);
-    }
-
+    public void addJob(long id, DragComponent source, FileNode[] children, DragComponent target, FileNode parent, byte type, boolean folder_level)
+    {
+    // Queue the sub-job(s) (this may fail if we are asked to delete a read only file)
+    for (int i = 0; i < children.length; i++) {
+        addJob(id, source, children[i], 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);