Changeset 8598

Timestamp:

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

Author:

mdewsnip

Message:

Minor tidy ups.

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java (modified) (4 diffs)

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

@@ -53 +53 @@
     /** When someone requests the movement queue to be dumped this cancel flag is set to true. */
     private boolean cancel_action = false;
-
     /** The button which controls the stopping of the file queue. */
     private JButton stop_button = null;
-
     /** true if the user has selected yes to all from a file 'clash' dialog. */
     private boolean yes_to_all = false;
@@ -83 +81 @@
      * @param job A previously created FileJob.
      */
-    synchronized public void addJob(FileJob job, int position) {
+    synchronized private void addJob(FileJob job, int position) {
     job.done = true; // Ensure that the requeued job is marked as done.
     queue.add(position, job);
@@ -103 +101 @@
     }
 
-    synchronized public void addJob(long id, DragComponent source, FileNode child, DragComponent target, FileNode parent, byte type, boolean undo, boolean undoable, boolean folder_level, int position) {
+    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);
     job.folder_level = folder_level;
@@ -203 +201 @@
             destination_node = (FileNode) target_model.getRoot();
             }
+
             // Extract common job details.
             File source_file = origin_node.getFile();
             File target_file = null;
             // Determine the target file for a copy or move.
-            if(job.type == FileJob.COPY || job.type == FileJob.MOVE) {
-            //target_file = new File(destination_node.getFile(), source_file.getName());
+            if (job.type == FileJob.COPY || job.type == FileJob.MOVE) {
             // use the name of the filenode instead of the name of the file - these should be the same except for the collection directories where we want the collection name to be used, not 'import' which is the underlying name
             target_file = new File(destination_node.getFile(), origin_node.toString());