Changeset 5571 for trunk/gli/src/org/greenstone/gatherer/collection

Timestamp:

2003-10-03T17:09:38+12:00 (21 years ago)

Author:

mdewsnip

Message:

More small updates and tooltips added.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (13 diffs)

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

@@ -45 +45 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.Message;
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
@@ -75 +74 @@
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
+
 /** This class manages many aspects of the collection, from its creation via scripts, data access via methods and its importing and building into the final collection. It is also resposible for firing appropriate event when significant changes have occured within the collection, and for creating a new metadata set manager as necessary.
  * @author John Thompson
@@ -112 +112 @@
     static final public int NO_SPECIAL_CASE = -1;
     static final public int SPECIAL_DLS = 0;
+
+    /** Used to indicate the source of the message is the file collection methods. */
+    static final public int COLLECT   = 3;
+    /** Used to indicate the source of the message is the building methods. */
+    static final public int BUILDING  = 5;
+
     /** Constructor. */
     public CollectionManager() {
@@ -164 +170 @@
     }
     args = ArrayTools.add(args, collection.build_options.getBuildValues());
-    GShell shell = new GShell(args, GShell.BUILD, Message.BUILDING, this, build_monitor, GShell.GSHELL_BUILD);
+    GShell shell = new GShell(args, GShell.BUILD, BUILDING, this, build_monitor, GShell.GSHELL_BUILD);
     shell.addGShellListener(Gatherer.g_man.create_pane);
     shell.start();
@@ -726 +732 @@
         collection_import = null;
         args = ArrayTools.add(args, collection.build_options.getImportValues());
-        GShell shell = new GShell(args, GShell.IMPORT, Message.BUILDING, this, import_monitor, GShell.GSHELL_IMPORT);
+        GShell shell = new GShell(args, GShell.IMPORT, BUILDING, this, import_monitor, GShell.GSHELL_IMPORT);
         shell.addGShellListener(Gatherer.g_man.create_pane);
         shell.start();
@@ -871 +877 @@
         }
     }
-    GShell process = new GShell(command, GShell.NEW, Message.COLLECT, this, null, GShell.GSHELL_NEW);
+    GShell process = new GShell(command, GShell.NEW, COLLECT, this, null, GShell.GSHELL_NEW);
     process.addGShellListener(this);
     process.run(); // Don't bother threading this... yet
@@ -877 +883 @@
 
     /** Any implementation of GShellListener must include this method to allow the GShell to send messages to listeners. However in this case the CollectionManager is in no way interested in what the messages are, just the import events which have a specific type and are handled elsewhere. Thus we can safely ignore this event.
-      * @param event A <strong>GShellEvent</strong> which contains a the message.
-      */
+     * @param event A <strong>GShellEvent</strong> which contains a the message.
+     */
     public synchronized void message(GShellEvent event) {
     }
     /** Called whenever the metadata value changes in some way, such as the addition of a new value. We want to mark the collection so that it needs saving again.
-      * @param event A <strong>MSMEvent</strong> containing details of the event that caused this message to be fired.
-      * @see org.greenstone.gatherer.collection.Collection
-      */
+     * @param event A <strong>MSMEvent</strong> containing details of the event that caused this message to be fired.
+     * @see org.greenstone.gatherer.collection.Collection
+     */
     public void metadataChanged(MSMEvent event) {
     // Again this change means we need to save the collection again.
@@ -890 +896 @@
     }
     /** This call is fired whenever a process within a GShell created by this class begins.
-      * @param event A <strong>GShellEvent</strong> containing information about the GShell process.
-      * @see org.greenstone.gatherer.Gatherer
-      * @see org.greenstone.gatherer.gui.GUIManager
-      * @see org.greenstone.gatherer.shell.GShell
-      */
+     * @param event A <strong>GShellEvent</strong> containing information about the GShell process.
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.gui.GUIManager
+     * @see org.greenstone.gatherer.shell.GShell
+     */
     public synchronized void processBegun(GShellEvent event) {
     Gatherer.println("CollectionManager.processBegun(" + event.getType() + ")");
@@ -1186 +1192 @@
     catch (Exception exception) {
         JOptionPane.showMessageDialog(Gatherer.g_man, "Exception detected during collection install.\nMost likely caused by Windows or Local Library holding locks on files:\n" + exception.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
-    }
-    }
-
-    /** Creates and dispatches a message given the initial details.
-     * @param level An <i>int</i> indicating the message level for this message.
-     * @param message A <strong>String</strong> which contains the payload of this message.
-     * @see org.greenstone.gatherer.Log
-     * @see org.greenstone.gatherer.Message
-     */
-    private void message(int level, String message) {
-    Message msg = new Message(Message.COLLECT, level, message);
-    if(Gatherer.g_man != null) {
-        Gatherer.log.add(msg);
-    } else {
-        Gatherer.println(msg.toString());
     }
     }
@@ -1404 +1395 @@
     /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
      * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
-            */
+     */
     public void treeNodesChanged(TreeModelEvent event) {
         if(collection != null) {
@@ -1411 +1402 @@
     }
     /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
-            * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
-            */
+     * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
+     */
     public void treeNodesInserted(TreeModelEvent event) {
         if(collection != null) {
@@ -1419 +1410 @@
     }
     /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
-            * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
-            */
+     * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
+     */
     public void treeNodesRemoved(TreeModelEvent event) {
         if(collection != null) {
@@ -1427 +1418 @@
     }
     /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
-            * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
-            */
+     * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
+     */
     public void treeStructureChanged(TreeModelEvent event) {
         if(collection != null) {