Changeset 8235

Timestamp:

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

Author:

mdewsnip

Message:

Removed debug static variable. All debugging output should go to the new DebugStream class.

File:

• trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -110 +110 @@
     /** A static reference to ourselves. */
     static public Gatherer self;
-    /** The debug print stream. */
-    static public PrintStream debug;
     /** We are using the GLI for GS3 */
     static public boolean GS3 = false;
@@ -176 +174 @@
     }
     // Create the debug stream only if required.
-    if(debug_enabled) {
-        try {
-        Calendar now = Calendar.getInstance();
-        StringBuffer name = new StringBuffer("debug");
-        name.append(now.get(Calendar.DATE));
-        name.append("-");
-        name.append(now.get(Calendar.MONTH));
-        name.append("-");
-        name.append(now.get(Calendar.YEAR));
-        name.append(".txt");
-
-        // Debug file is created in the GLI directory, unless the GLI is running as an applet
-        String debug_file_path = name.toString();
-        if (isGsdlRemote) {
-            debug_file_path = Utility.getGLIUserFolder().toString() + File.separator + debug_file_path;
-        }
-        Gatherer.println("Debug file path: " + debug_file_path);
-        this.debug = new PrintStream(new FileOutputStream(debug_file_path));
-
-        Properties props = System.getProperties();
-        props.list(debug);
-        }
-        catch(Exception error) {
-        ///ystem.err.println("Error in Gatherer.init(): " + error);
-        error.printStackTrace();
-        System.exit(1);
-        }
+    if (debug_enabled) {
+        DebugStream.enableDebugging();
+
+        Calendar now = Calendar.getInstance();
+        StringBuffer name = new StringBuffer("debug");
+        name.append(now.get(Calendar.DATE));
+        name.append("-");
+        name.append(now.get(Calendar.MONTH));
+        name.append("-");
+        name.append(now.get(Calendar.YEAR));
+        name.append(".txt");
+
+        // Debug file is created in the GLI directory, unless the GLI is running as an applet
+        String debug_file_path = name.toString();
+        if (isGsdlRemote) {
+        debug_file_path = Utility.getGLIUserFolder().toString() + File.separator + debug_file_path;
+        }
+        DebugStream.println("Debug file path: " + debug_file_path);
+        DebugStream.setDebugFile(debug_file_path);
+        DebugStream.print(System.getProperties());
     }
     try {
@@ -454 +445 @@
 
     // Flush debug
-    if(debug != null) {
-        try {
-        debug.flush();
-        debug.close();
-        }
-        catch (Exception error) {
-        error.printStackTrace();
-        }
-    }
+    DebugStream.closeDebugStream();
 
     // If we started a server, we should try to stop it.
@@ -632 +615 @@
     /** Print a message to the debug stream. */
     static synchronized public void print(String message) {
-    if(debug != null) {
-        debug.print(message);
-        System.err.print(message);
-    }
+    DebugStream.print(message);
     }
     /** Print a message to the debug stream. */
     static synchronized public void println(String message) {
-    if(debug != null) {
-        debug.println(message);
-        System.err.println(message);
-    }
+    DebugStream.println(message);
     }
 
     /** Print a stack trace to the debug stream. */
     static synchronized public void printStackTrace(Exception exception) {
-    if (debug != null) {
-        exception.printStackTrace(debug);
-    }
-    exception.printStackTrace();
+    DebugStream.printStackTrace(exception);
     }
 
@@ -985 +959 @@
             // mozilla and netscape, try using a remote command to get things in the same window
             String [] new_commands = new String[] {prog_name, "-raise", "-remote", "openURL("+url+",new-tab)"};
-            if(debug != null) {
-            printArray(new_commands);
-            }
+            printArray(new_commands);
+
             Runtime rt = Runtime.getRuntime();
             process = rt.exec(new_commands);
@@ -993 +966 @@
             if (exitCode != 0) { // if Netscape or mozilla was not open
             Gatherer.println("couldn't do remote, trying original command");
-            if(debug != null) {
-                printArray(commands);
-            }
+            printArray(commands);
             process = rt.exec(commands); // try the original command
             }
@@ -1026 +997 @@
     public void printArray(String [] array) {
         for(int i = 0; i < array.length; i++) {
-        debug.print(array[i]+" ");
+        DebugStream.print(array[i]+" ");
         System.err.println(array[i]+" ");
         }