Changeset 8236 for trunk/gli/src/org/greenstone/gatherer/util/Utility.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/util/Utility.java (modified) (12 diffs)

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -47 +47 @@
 import org.apache.xml.serialize.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -259 +260 @@
     catch (Exception exception) {
         if(!file.getName().endsWith(METADATA_XML)) {
-        Gatherer.printStackTrace(exception);
+        DebugStream.printStackTrace(exception);
         return false;
         }
@@ -740 +741 @@
         ZipEntry zipentry = (ZipEntry) e.nextElement();
         String zentryname = dst_dir + zipentry.getName();
-        Gatherer.println("    Unzipping: " + zentryname);
+        DebugStream.println("    Unzipping: " + zentryname);
 
         if (zipentry.isDirectory()) {
@@ -774 +775 @@
     catch (ZipException error) {
         System.err.println("Error: Unable to open '"+zip_file.getAbsolutePath()+"'");
-        Gatherer.printStackTrace(error);
+        DebugStream.printStackTrace(error);
     }
 
@@ -977 +978 @@
     }
     
-    Gatherer.println("    Zipping up: " + file_path);
+    DebugStream.println("    Zipping up: " + file_path);
     }
 
@@ -1092 +1093 @@
         ZipEntry zipentry = (ZipEntry) e.nextElement();
         String zentryname = col_dir + zipentry.getName();
-        Gatherer.println("    Unzipping: " + zentryname);
+        DebugStream.println("    Unzipping: " + zentryname);
 
         if (zipentry.isDirectory()) {
@@ -1126 +1127 @@
     catch (ZipException error) {
         System.err.println("Error: Unable to open '"+zip_fname+"'");
-        Gatherer.printStackTrace(error);
+        DebugStream.printStackTrace(error);
     }
 
@@ -1313 +1314 @@
     try {
         if (file.exists()) {
-        Gatherer.println("Parsing XML file: " + file);
+        DebugStream.println("Parsing XML file: " + file);
         FileInputStream fis = new FileInputStream(file);
         document = parse(fis, noisey);
@@ -1321 +1322 @@
         if(noisey) {
         error.printStackTrace();
-        Gatherer.println("Exception in Utility.parse() - Unexpected");
+        DebugStream.println("Exception in Utility.parse() - Unexpected");
         }
         else {
-        Gatherer.println("Exception in Utility.parse() - Expected");
-        Gatherer.printStackTrace(error);
+        DebugStream.println("Exception in Utility.parse() - Expected");
+        DebugStream.printStackTrace(error);
         }
     }
@@ -1345 +1346 @@
         if(noisey) {
         error.printStackTrace();
-        Gatherer.println("Exception in Utility.parse() - Unexpected");
+        DebugStream.println("Exception in Utility.parse() - Unexpected");
         }
         else {
-        Gatherer.println("Exception in Utility.parse() - Expected");
-        Gatherer.printStackTrace(error);
+        DebugStream.println("Exception in Utility.parse() - Expected");
+        DebugStream.printStackTrace(error);
         }
     }
@@ -1382 +1383 @@
         if(noisey) {
         error.printStackTrace();
-        Gatherer.println("Exception in Utility.parse() - Unexpected");
+        DebugStream.println("Exception in Utility.parse() - Unexpected");
         }
         else {
-        Gatherer.println("Exception in Utility.parse() - Expected");
-        }
-        Gatherer.printStackTrace(error);
+        DebugStream.println("Exception in Utility.parse() - Expected");
+        }
+        DebugStream.printStackTrace(error);
     }
     return document;
@@ -1445 +1446 @@
     }
     else {
-        //Gatherer.println("Zero length argument xml detected for: " + form);
+        //DebugStream.println("Zero length argument xml detected for: " + form);
         String[] margs = new String[1];
         margs[0] = form;