Changeset 11241 for trunk/gli

Timestamp:

2006-02-14T14:04:38+13:00 (18 years ago)

Author:

mdewsnip

Message:

Removed the unused folder_level variable from FileJob.

Location:

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

Files:

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

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

@@ -38 +38 @@
     public boolean done = false;
 
-    public boolean folder_level = false;
     /** The type of this movement as an byte. */
     public byte type = 0;

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

@@ -168 +168 @@
         boolean cancelled = file_queue.calculateSize(source_nodes);
         if (!cancelled) {
-        file_queue.addJob(id, source, source_nodes, target, target_node, type, true);
+        file_queue.addJob(id, source, source_nodes, target, target_node, type);
         if (Gatherer.isGsdlRemote) {
             String collection_name = Gatherer.c_man.getCollection().getName();

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[] children, DragComponent target, FileNode parent, byte type, boolean folder_level)
+    public void addJob(long id, DragComponent source, FileNode[] children, DragComponent target, FileNode parent, byte type)
     {
     // 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);
+        addJob(id, source, children[i], target, parent, type, -1);
     }
     }
     
-    synchronized private void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, boolean folder_level, int position) {
+    synchronized private void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, int position) {
     FileJob job = new FileJob(id, source, child, target, parent, type);
-    job.folder_level = folder_level;
     DebugStream.println("Adding job: " + job);
     if(position != -1 && position <= queue.size() + 1) {