Changeset 8236 for trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

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

Author:

mdewsnip

Message:

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

File:

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

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

@@ -220 +220 @@
         // Having loaded the configuration (necessary to determine if certain warnings have been disabled) and dictionary, we now check if the necessary path variables have been provided.
         if (Configuration.exec_file == null && Configuration.exec_address == null) {
-        Gatherer.println("config.exec_file is null");
-        Gatherer.println("config.exec_address is null");
+        DebugStream.println("config.exec_file is null");
+        DebugStream.println("config.exec_address is null");
         missingEXEC();
         }
 
         if (Gatherer.isGsdlRemote) {
-        Gatherer.println("Not checking for perl path/exe");
+        DebugStream.println("Not checking for perl path/exe");
         }
         else {
@@ -326 +326 @@
 
     }
-    catch (Exception error) {
-        error.printStackTrace();
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
 
@@ -472 +472 @@
         String raw_url = Configuration.exec_address.toString() + command;
         URL url = new URL(raw_url);
-        Gatherer.println("Action: " + raw_url);
+        DebugStream.println("Action: " + raw_url);
         HttpURLConnection library_connection = (HttpURLConnection) url.openConnection();
         int response_code = library_connection.getResponseCode();
         if(HttpURLConnection.HTTP_OK <= response_code && response_code < HttpURLConnection.HTTP_MULT_CHOICE) {
-        Gatherer.println("200 - Complete.");
+        DebugStream.println("200 - Complete.");
         }
         else {
-        Gatherer.println("404 - Failed.");
+        DebugStream.println("404 - Failed.");
         }
         url = null;
     }
     catch (Exception ex) {
-        ex.printStackTrace();
-        Gatherer.printStackTrace(ex);
+        DebugStream.printStackTrace(ex);
     }
     }
@@ -496 +495 @@
         String raw_url = Configuration.exec_address.toString() + Configuration.getServletPath() + command;
         URL url = new URL(raw_url);
-        Gatherer.println("Action: " + raw_url);
+        DebugStream.println("Action: " + raw_url);
         HttpURLConnection library_connection = (HttpURLConnection) url.openConnection();
         int response_code = library_connection.getResponseCode();
         if(HttpURLConnection.HTTP_OK <= response_code && response_code < HttpURLConnection.HTTP_MULT_CHOICE) {
-        Gatherer.println("200 - Complete.");
+        DebugStream.println("200 - Complete.");
         }
         else {
-        Gatherer.println("404 - Failed.");
+        DebugStream.println("404 - Failed.");
         }
         url = null;
     }
     catch(Exception exception) {
-        Gatherer.printStackTrace(exception);
+        DebugStream.printStackTrace(exception);
         ///ystem.err.println("Bad URL.");
     }
@@ -613 +612 @@
     dialog = null;
     }
-    /** Print a message to the debug stream. */
-    static synchronized public void print(String message) {
-    DebugStream.print(message);
-    }
-    /** Print a message to the debug stream. */
-    static synchronized public void println(String message) {
-    DebugStream.println(message);
-    }
-
-    /** Print a stack trace to the debug stream. */
-    static synchronized public void printStackTrace(Exception exception) {
-    DebugStream.printStackTrace(exception);
-    }
-
-    /** Prints a usage message to screen.
-     */
-    static public void printUsage(Dictionary dictionary) {
-    System.out.println(Dictionary.get("General.Usage"));
-    }
+
 
     /** Sets up the proxy connection by setting JVM Environment flags and creating a new Authenticator.
@@ -651 +632 @@
         }
     } catch (Exception error) {
-        Gatherer.println("Error in Gatherer.initProxy(): " + error);
-        Gatherer.printStackTrace(error);
+        DebugStream.println("Error in Gatherer.initProxy(): " + error);
+        DebugStream.printStackTrace(error);
     }
     }
@@ -695 +676 @@
     }
     catch (Exception error) {
-        Gatherer.println(Configuration.CONFIG_XML+" is not a well formed XML document.");
-        Gatherer.printStackTrace(error);
+        DebugStream.println(Configuration.CONFIG_XML+" is not a well formed XML document.");
+        DebugStream.printStackTrace(error);
     }
     if (GS3) {
         try {
         servlet_config = new ServletConfiguration(gsdl3_path);
-        } catch (Exception error) {
-        error.printStackTrace();
+        } catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
         }
     }
@@ -711 +692 @@
     try {
         Configuration.save();
-    } catch (Exception error) {
-        Gatherer.printStackTrace(error);
+    } catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     }
@@ -766 +747 @@
             // A quick test involves opening a connection to get the home page  for this collection. If this fails then we try changing the url to be localhost.
             try {
-                Gatherer.println("Try connecting to server on config url: '" + Configuration.exec_address + "'");
+                DebugStream.println("Try connecting to server on config url: '" + Configuration.exec_address + "'");
                 URLConnection connection = Configuration.exec_address.openConnection();
                 connection.getContent();
@@ -772 +753 @@
             catch(IOException bad_url_connection) {
                 try {
-                Gatherer.println("Try connecting to server on local host: '" + gsdlsite_cfg.getLocalHostURL() + "'");
+                DebugStream.println("Try connecting to server on local host: '" + gsdlsite_cfg.getLocalHostURL() + "'");
                 Configuration.exec_address = new URL(gsdlsite_cfg.getLocalHostURL   ());
                 URLConnection connection = Configuration.exec_address.openConnection();
@@ -778 +759 @@
                 }
                 catch(IOException worse_url_connection) {
-                Gatherer.println("Can't connect to server on either address.");
+                DebugStream.println("Can't connect to server on either address.");
                 Configuration.exec_address = null;
                 Configuration.exec_file = null;
@@ -789 +770 @@
             }
         }
-        catch (Exception error) {
-            error.printStackTrace();
+        catch (Exception exception) {
+            DebugStream.printStackTrace(exception);
         }
         }
         // Can't do a damb thing.
     }
-    Gatherer.println("Having started server.exe, exec_address is: " + Configuration.exec_address);
+    DebugStream.println("Having started server.exe, exec_address is: " + Configuration.exec_address);
     }
 
@@ -827 +808 @@
             //}
         }
-        catch (Exception error) {
-            error.printStackTrace();
+        catch (Exception exception) {
+            DebugStream.printStackTrace(exception);
         }
         }
@@ -882 +863 @@
             whole_command.append(" ");
             }
-            println("Running " + whole_command.toString());
+            DebugStream.println("Running " + whole_command.toString());
             Runtime rt = Runtime.getRuntime();
             process = rt.exec(commands);
@@ -888 +869 @@
         }
         else {
-            println("Running " + command);
+            DebugStream.println("Running " + command);
             Runtime rt = Runtime.getRuntime();
             process = rt.exec(command);
@@ -894 +875 @@
         }
         }
-        catch (Exception error) {
-        println("Error in ExternalApplication.run(): " + error);
-        printStackTrace(error);
+        catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
         }
         // Remove ourself from Gatherer list of threads.
@@ -956 +936 @@
         String lower_name = prog_name.toLowerCase();
         if (lower_name.indexOf("mozilla") != -1 || lower_name.indexOf("netscape") != -1) { 
-            Gatherer.println("found mozilla or netscape, trying remote it");
+            DebugStream.println("found mozilla or netscape, trying remote it");
             // 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)"};
@@ -965 +945 @@
             int exitCode = process.waitFor();
             if (exitCode != 0) { // if Netscape or mozilla was not open
-            Gatherer.println("couldn't do remote, trying original command");
+            DebugStream.println("couldn't do remote, trying original command");
             printArray(commands);
             process = rt.exec(commands); // try the original command
@@ -976 +956 @@
             whole_command.append(" ");
             }
-            println("Running " + whole_command.toString());
+            DebugStream.println("Running " + whole_command.toString());
             Runtime rt = Runtime.getRuntime();
             process = rt.exec(commands);
@@ -983 +963 @@
         }
         
-        catch (Exception error) {
-        println("Error in BrowserApplication.run(): " + error);
-        printStackTrace(error);
+        catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
         }
         // Remove ourself from Gatherer list of threads.