Changeset 10557 for trunk/gli

Timestamp:

2005-08-24T15:50:05+12:00 (19 years ago)

Author:

mdewsnip

Message:

The RemoteFileQueue instance is now owned by RemoteGreenstoneServer, not FileManager.

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileManager.java (modified) (5 diffs)

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

@@ -45 +45 @@
 import org.greenstone.gatherer.gui.NewFolderOrFilePrompt;
 import org.greenstone.gatherer.gui.tree.DragTree;
-import org.greenstone.gatherer.remote.RemoteFileQueue;
 import org.greenstone.gatherer.remote.RemoteGreenstoneServer;
 import org.greenstone.gatherer.util.DragComponent;
@@ -58 +57 @@
     /** Not only the queue of files to be moved, but also the object that moves them. */
     static private FileQueue file_queue = null;
-    static private RemoteFileQueue remote_file_queue = null;
 
     public static int FILE_TYPE = 0;
@@ -71 +69 @@
     file_queue = new FileQueue();
     file_queue.start();
-
-    if (Gatherer.isGsdlRemote) {
-        remote_file_queue = new RemoteFileQueue();
-        remote_file_queue.start();
-    }
     }
 
@@ -177 +170 @@
         file_queue.addJob(id, source, source_nodes, target, target_node, type, true);
         if (Gatherer.isGsdlRemote) {
-            remote_file_queue.addJob(id, source_nodes, target_node, type);
+            RemoteGreenstoneServer.addJob(id, source_nodes, target_node, type);
         }
         }
@@ -262 +255 @@
                 long id = System.currentTimeMillis();
                 CollectionTreeNode new_folder_node = new CollectionTreeNode(folder_file);
-                remote_file_queue.addJob(id, new FileNode[] { new_folder_node }, null, FileJob.NEW_FOLDER);
+                RemoteGreenstoneServer.addJob(id, new FileNode[] { new_folder_node }, null, FileJob.NEW_FOLDER);
             }
             }