Changeset 8236 for trunk/gli/src/org/greenstone/gatherer/file

Timestamp:

2004-10-08T09:46:12+13:00 (20 years ago)

Author:

mdewsnip

Message:

Replaced all Gatherer.print* with DebugStream.print*.

Location:

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

Files:

• FileAssociationManager.java (modified) (6 diffs)
• FileNode.java (modified) (3 diffs)
• FileQueue.java (modified) (11 diffs)
• FileSystem.java (modified) (2 diffs)
• FileSystemModel.java (modified) (6 diffs)
• WorkspaceTreeModel.java (modified) (3 diffs)

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

@@ -30 +30 @@
 import javax.swing.table.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -80 +81 @@
     }
     else {
-        Gatherer.println("Didn't parse anything. About to crash.");
+        DebugStream.println("Didn't parse anything. About to crash.");
     }
     }
@@ -91 +92 @@
 
     public String getBrowserCommand(String url) {
-    Gatherer.println("Get browser command: " + url);
+    DebugStream.println("Get browser command: " + url);
     // First off we try to retrieve one from the configuration
     String command = Configuration.getPreviewCommand();
@@ -97 +98 @@
     if(command != null && command.length() > 0) {
         command = command.replaceAll("%1", url);
-        Gatherer.println("Result = " + command);
+        DebugStream.println("Result = " + command);
         return command;
     }
@@ -134 +135 @@
         Configuration.setPreviewCommand(command);
         command = command.replaceAll(FILENAME_ARG, url);
-        Gatherer.println("Result = " + command);
+        DebugStream.println("Result = " + command);
         return command;
     }
     // if we haven't got a command by now, we'll never get one
-    Gatherer.println("Result = null");
+    DebugStream.println("Result = null");
     return null;
     
@@ -280 +281 @@
 
     public void setCommand(String extension, String command) {
-    Gatherer.println("Set Launch: " + extension + " with " + command);
+    DebugStream.println("Set Launch: " + extension + " with " + command);
     // Retrieve any existing entry for this extension
     Element entry = getCommand(extension);

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

@@ -8 +8 @@
 import javax.swing.tree.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -215 +216 @@
     /** Adds child to the receiver at index. */
     public void insert(MutableTreeNode child, int index) {
-    Gatherer.println("Insert " + child + " in " + this + " at index " + index + " [Model: " + model + "]");
+    DebugStream.println("Insert " + child + " in " + this + " at index " + index + " [Model: " + model + "]");
     if (child == null) {
         return;
@@ -339 +340 @@
         if(files != null && files.length > 0) {
             // Sort the remaining files.
-            Gatherer.println("Number of files to sort: " + files.length);
+            DebugStream.println("Number of files to sort: " + files.length);
             ArrayTools.sort(files);
-            Gatherer.println("Files sorted.");
+            DebugStream.println("Files sorted.");
             // Now add them to children.
             raw_children = new ArrayList();

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

@@ -33 +33 @@
 import javax.swing.tree.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -123 +124 @@
     FileJob job = new FileJob(id, source, child, target, parent, type, undo, undoable);
     job.folder_level = folder_level;
-        Gatherer.println("Adding job: " + job);
+        DebugStream.println("Adding job: " + job);
     if(position != -1 && position <= queue.size() + 1) {
         queue.add(position, job);
@@ -320 +321 @@
                     // If we can't find the source file, then the most likely reason is that the file system has changed since the last time it was mapped. Warn the user that the requested file can't be found, then force a refresh of the source folder involved.
                     catch(FileNotFoundException fnf_exception) {
-                    Gatherer.printStackTrace(fnf_exception);
+                    DebugStream.printStackTrace(fnf_exception);
                     cancel_action = true;
                     // Show warning.
@@ -328 +329 @@
                     }
                     catch(FileAlreadyExistsException fae_exception) {
-                    Gatherer.printStackTrace(fae_exception);
+                    DebugStream.printStackTrace(fae_exception);
                     cancel_action = true;
                     // Show warning.
@@ -335 +336 @@
                     }
                     catch(InsufficientSpaceException is_exception) {
-                    Gatherer.printStackTrace(is_exception);
+                    DebugStream.printStackTrace(is_exception);
                     cancel_action = true;
                     // Show warning. The message body of the expection explains how much more space is required for this file copy.
@@ -342 +343 @@
                     }
                     catch(UnknownFileErrorException ufe_exception) {
-                    Gatherer.printStackTrace(ufe_exception);
+                    DebugStream.printStackTrace(ufe_exception);
                     cancel_action = true;
                     // Show warning
@@ -349 +350 @@
                     }
                     catch(WriteNotPermittedException wnp_exception) {
-                    Gatherer.printStackTrace(wnp_exception);
+                    DebugStream.printStackTrace(wnp_exception);
                     cancel_action = true;
                     // Show warning
@@ -357 +358 @@
                     catch(IOException exception) {
                     // Can't really do much about this.
-                    Gatherer.printStackTrace(exception);
+                    DebugStream.printStackTrace(exception);
                     }
                  // If not cancelled
@@ -543 +544 @@
                 }
                 else {
-                Gatherer.println("I've already done this job twice. I refuse to requeue it again!!");
+                DebugStream.println("I've already done this job twice. I refuse to requeue it again!!");
                 }
             }
@@ -595 +596 @@
         }
         catch (Exception error) {
-        Gatherer.printStackTrace(error);
+        DebugStream.printStackTrace(error);
         }
     }
@@ -675 +676 @@
         // Check if the origin file exists.
         if(!source.exists()) {
-        Gatherer.println("Couldn't find the source file.");
+        DebugStream.println("Couldn't find the source file.");
         throw(new FileNotFoundException());
         }

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

@@ -3 +3 @@
 import java.io.File;
 import javax.swing.filechooser.FileSystemView;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
-import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.util.ArrayTools;
@@ -55 +55 @@
 
     // Make sure we're running on a multiuser OS where the idea of a "user home" is valid
-    Gatherer.println("Property os.name: " + os_name);
+    DebugStream.println("Property os.name: " + os_name);
     String os_name_lc = os_name.toLowerCase();
     if (os_name_lc.equals("windows 95") || os_name_lc.equals("windows 98") || os_name_lc.equals("windows me")) {

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

@@ -6 +6 @@
 import javax.swing.event.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -59 +60 @@
     FileNode first_node = (FileNode)path.getPathComponent(0);
     if(current.equals(first_node)) {
-        Gatherer.println("First path component matches root node.");
+        DebugStream.println("First path component matches root node.");
         // For each path with this tree path
         for(int i = 1; current != null && i < path.getPathCount(); i++) {
@@ -68 +69 @@
             stale_node = (FileNode) stale_object;
         }
-        Gatherer.print("Searching for '" + stale_object + "': ");
+        DebugStream.print("Searching for '" + stale_object + "': ");
         // Locate the fresh node by searching current's children. Remember to ensure that current is mapped.
         //current.unmap();
@@ -76 +77 @@
         for(int j = 0; !found && j < current.getChildCount(); j++) {
             FileNode child_node = (FileNode) current.getChildAt(j);
-            Gatherer.print(child_node + " ");
+            DebugStream.print(child_node + " ");
             if((stale_node != null && stale_node.equals(child_node)) || stale_object.toString().equals(child_node.toString())) {
             found = true;
             current = child_node;
-            Gatherer.println("Found!");
+            DebugStream.println("Found!");
             }
             child_node = null;
@@ -87 +88 @@
         for(int j = 0; !found && j < current.size(); j++) {
             FileNode child_node = (FileNode) current.get(j);
-            Gatherer.print(child_node + " ");
+            DebugStream.print(child_node + " ");
             if((stale_node != null && stale_node.equals(child_node)) || stale_object.toString().equals(child_node.toString())) {
             found = true;
             current = child_node;
-            Gatherer.println("Found!");
+            DebugStream.println("Found!");
             }
             child_node = null;
@@ -98 +99 @@
         if(!found) {
             current = null;
-            Gatherer.println("Not Found!");
+            DebugStream.println("Not Found!");
         }
         else {
-            Gatherer.println("Returning node: " + new TreePath(current.getPath()));
+            DebugStream.println("Returning node: " + new TreePath(current.getPath()));
         }
         // Repeat as necessary

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

@@ -2 +2 @@
 
 import javax.swing.tree.TreePath;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.CollectionManager;
@@ -79 +80 @@
         for (int i = 0; i < old_folder_shortcuts.length; i++) {
         if (!doesArrayContain(folder_shortcuts, old_folder_shortcuts[i])) {
-            Gatherer.println("Deleted shortcut: " + old_folder_shortcuts[i]);
+            DebugStream.println("Deleted shortcut: " + old_folder_shortcuts[i]);
             SynchronizedTreeModelTools.removeNodeFromParent(workspace_tree_model,
                                     old_folder_shortcuts[i]);
@@ -90 +91 @@
         for (int i = 0; i < folder_shortcuts.length; i++) {
         if (!doesArrayContain(old_folder_shortcuts, folder_shortcuts[i])) {
-            Gatherer.println("Added shortcut: " + folder_shortcuts[i]);
+            DebugStream.println("Added shortcut: " + folder_shortcuts[i]);
             SynchronizedTreeModelTools.insertNodeInto(workspace_tree_model, workspace_tree_root, folder_shortcuts[i], false);
         }