Changeset 4595

Timestamp:

2003-06-12T12:07:19+12:00 (21 years ago)

Author:

kjdon

Message:

tidied up gatherer.debug - > gatherer.println

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ClassifierManager.java (modified) (1 diff)
• cdm/CollectionDesignManager.java (modified) (3 diffs)
• collection/SaveCollectionTask.java (modified) (2 diffs)
• gui/GEditorPane.java (modified) (2 diffs)
• gui/MetaEditPane.java (modified) (1 diff)
• gui/SaveProgressDialog.java (modified) (1 diff)
• gui/browser/GHTMLPane.java (modified) (1 diff)
• msm/GDMManager.java (modified) (1 diff)
• msm/MSMProfiler.java (modified) (1 diff)
• msm/MetadataSetManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -879 +879 @@
             }
             catch (Exception error) {
-            gatherer.debug(error, "Error in ClassifierManager.AddListener.actionPerformed(): " + error);
+            Gatherer.println("Error in ClassifierManager.AddListener.actionPerformed(): " + error);
+            Gatherer.printStackTrace(error);
+            
             }
             // And if all else fails create a new classifier.

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

@@ -343 +343 @@
         }
         in.close();
-                // Now attempt to finalize any commands that were not immediately parsed as they were waiting for unresolved references.
+        // Now attempt to finalize any commands that were not immediately parsed as they were waiting for unresolved references.
         subcollections.reparseUnresolved();
         classifiers.reparseUnresolved();
@@ -366 +366 @@
     public void save() {
     try {
-                // If the file already exists (it should) rename it.
+        // If the file already exists (it should) rename it.
         if(in_file.exists()) {
         String filename = in_file.getAbsolutePath();
@@ -372 +372 @@
         backup.deleteOnExit();
         if(!in_file.renameTo(backup)) {
-            gatherer.debug("Error in CollectionDesignManager.parse(): FileRenamedException");
+            Gatherer.println("Error in CollectionDesignManager.parse(): FileRenamedException");
         }
         in_file = new File(filename); // Just in case we moved it.

trunk/gli/src/org/greenstone/gatherer/collection/SaveCollectionTask.java

@@ -133 +133 @@
         backup.deleteOnExit();
         if(!file.renameTo(backup)) {
-            Gatherer.println("Error in CollectionManager.load(): FileNotRenamedException");
+            Gatherer.println("Error in CollectionManager.load(): FileRenamedException");
         }
         }
@@ -156 +156 @@
     // Now we check whether we've finished, or is this a Save As action, in which case we've got miles to go.
     if(name != null) {
-                // 2. Call CollectionManager.makeCollection() to create the collection structure to save into (copied collection).
-                ///ystem.err.println("2. Make copy.");
+        // 2. Call CollectionManager.makeCollection() to create the collection structure to save into (copied collection).
+        ///ystem.err.println("2. Make copy.");
         Gatherer.c_man.createCollection(null, null, name, null, null, null);
         // spd.setProgress(getValue(MAKE_COLLECTION));
-                // 3. Copy files from the origin to the copied collections (except special collection files ending with ~).
-                // As part of this we must rename origin.col to copy.col
-                ///ystem.err.println("3. Copy origin.");
+        // 3. Copy files from the origin to the copied collections (except special collection files ending with ~).
+        // As part of this we must rename origin.col to copy.col
+        ///ystem.err.println("3. Copy origin.");
         ArrayList files = new ArrayList();
         File collection_file = new File(Gatherer.c_man.getCollectionFilename());

trunk/gli/src/org/greenstone/gatherer/gui/GEditorPane.java

@@ -259 +259 @@
     public void loadFile(File file) {
     // Load the file.
-    gatherer.debug("Opening config file " + file.getAbsolutePath());
+    Gatherer.println("GEditorPane.loadFile():Opening config file " + file.getAbsolutePath());
     try {
         FileInputStream in = new FileInputStream(file);
@@ -273 +273 @@
     catch (Exception error) {
         //error.printStackTrace();
-        gatherer.debug("Error: No Such File.");
+        Gatherer.println("GEditorPane.loadFile():Error: No Such File.");
     }
     }

trunk/gli/src/org/greenstone/gatherer/gui/MetaEditPane.java

@@ -436 +436 @@
       thumbnail_pane = new JPanel(new BorderLayout());
 
-      gatherer.debug("\tCreating thumbnail_label");
+      Gatherer.println("\tCreating thumbnail_label");
       thumbnail_label = new JLabel(get("Thumbnail"));
       thumbnail_label.setHorizontalAlignment(JLabel.CENTER);
 
-      gatherer.debug("\tCreating thumbnail_view_pane");
+      Gatherer.println("\tCreating thumbnail_view_pane");
       thumbnail_view_pane = new JPanel(new FlowLayout(FlowLayout.CENTER));
       thumbnail_scroll = new JScrollPane(thumbnail_view_pane);

trunk/gli/src/org/greenstone/gatherer/gui/SaveProgressDialog.java

@@ -113 +113 @@
     }
     catch (Exception e) {
-        gatherer.debug(e, "Error in SaveProgressDialog.update(): " + e);
+        Gatherer.println("Error in SaveProgressDialog.update(): " + e);
+        Gatherer.printStackTrace(e);
     }
     }

trunk/gli/src/org/greenstone/gatherer/gui/browser/GHTMLPane.java

@@ -109 +109 @@
     forward_pages = new Vector(); 
 
-    gatherer.debug("\t\tCreating GHTMLPane");
+    Gatherer.println("\t\tCreating GHTMLPane");
     view = new JEditorPane();
     view.setEditable(false);

trunk/gli/src/org/greenstone/gatherer/msm/GDMManager.java

@@ -147 +147 @@
         }
         put(metadata_file, metadata_xml);
-                //gatherer.debug(null, "[0ms]\tCached " + metadata_file);
+        //Gatherer.println("[0ms]\tCached " + metadata_file);
     }
     return metadata_xml;

trunk/gli/src/org/greenstone/gatherer/msm/MSMProfiler.java

@@ -215 +215 @@
         backup.deleteOnExit();
         if(!profile_file.renameTo(backup)) {
-            Gatherer.println("Error in MSMProfiler.save(): FileRenameException");
+            Gatherer.println("Error in MSMProfiler.save(): FileRenamedException");
         }
         backup = null;

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java

@@ -914 +914 @@
         backup.deleteOnExit();
         if(!temp[i].renameTo(backup)) {
-            Gatherer.println("Error in MetadataSetManager.save(): FileRenameException");
+            Gatherer.println("Error in MetadataSetManager.save(): FileRenamedException");
         }
         }