Changeset 6387 for trunk

Timestamp:

2004-01-09T14:58:18+13:00 (20 years ago)

Author:

jmt12

Message:

Commenting

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/Collection.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (7 diffs)
• collection/ExportCollectionPrompt.java (modified) (1 diff)
• file/FileOpenActionListener.java (modified) (1 diff)
• util/DragGroup.java (modified) (1 diff)

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

@@ -106 +106 @@
     
     /** Destructor.
-     * @see org.greenstone.gatherer.collection.CollectionModel */
+     * @see org.greenstone.gatherer.Configuration
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.cdm.CollectionDesignManager
+     * @see org.greenstone.gatherer.msm.GDMManager
+     * @see org.greenstone.gatherer.msm.MetadataSetManager
+     */
     public void destroy() {
     cdm.destroy();

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

@@ -147 +147 @@
      * @see org.greenstone.gatherer.Configuration
      * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.Message
      * @see org.greenstone.gatherer.collection.Collection
      * @see org.greenstone.gatherer.gui.BuildOptions
@@ -161 +160 @@
     String args[];
     if(Utility.isWindows()) {
-        args = new String[4];
+        args = new String[5];
         args[0] = Gatherer.config.perl_path;
         args[1] = "-S";
         args[2] = Gatherer.config.getScriptPath() + "buildcol.pl";
-        args[3] = collection.getName();
+        args[3] = "-gli";
+        args[4] = collection.getName();
     }
     else {
-        args = new String[2];
+        args = new String[3];
         args[0] = Gatherer.config.getScriptPath() + "buildcol.pl";
-        args[1] = collection.getName();
+        args[1] = "-gli";
+        args[2] = collection.getName();
     }
     args = ArrayTools.add(args, collection.build_options.getBuildValues());
@@ -695 +696 @@
      * @see org.greenstone.gatherer.Configuration
      * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.Message
      * @see org.greenstone.gatherer.gui.BuildOptions
      * @see org.greenstone.gatherer.shell.GShell
@@ -703 +703 @@
      */
     public void importCollection() {
-    Gatherer.println("CollectionManager.importCollection()");
+    importing = true;
     if(!saved()) {
+        Gatherer.println("CollectionManager.importCollection().forcesave");
         import_monitor.saving();
         // Force save.
@@ -717 +718 @@
     }
     else {
-        importing = true;
+        Gatherer.println("CollectionManager.importCollection()");
         //check that we can remove the old index before starting import
         File index_dir = new File(getCollectionIndex(), "temp.txt");
@@ -767 +768 @@
         shell.addGShellListener(Gatherer.g_man.create_pane);
         shell.start();
-    }
-    Gatherer.println("CollectionManager.importCollection().return");
-    }
+        Gatherer.println("CollectionManager.importCollection().return");
+    }
+    importing = false;
+    }
+
+    /** Determine if we are currently in the middle of importing (and thus, in this case, we can't allow the log writer to exit). Boy was this a mission to track down. The cascade of crap rolls out something like this: Joe Schmo clicks 'Build Collection', which calls the importCollection() method above, which in turn saves the collection with a saveTask, which fires a collectionChanged message once its finished, which drives the list of logs shown on the create pane to update, which fires a itemChanged() event to the OptionsPane who dutifully tells the current log writer thread to finish up writing (all zero lines its been asked to write) and then die. Wereapon Joe Schmo gets a pretty log to look at, but it isn't actually being written to file so the next time he tries to view it faeces hits the air motion cooling device. Joy.
+     * @return true if the gli is currently importing
+     */
+    public boolean isImporting() {
+    return importing;
+    }
+
     /** Attempts to load the given collection. Currently uses simple serialization of the collection class.
      * @param location The path to the collection as a <strong>String</strong>.
      * @see org.greenstone.gatherer.Configuration
      * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.Message
      * @see org.greenstone.gatherer.collection.Collection
      * @see org.greenstone.gatherer.msm.MetadataSetManager
@@ -1187 +1196 @@
      * @param exit_after <i>true</i> to cause the Gatherer to exit once save is complete, <i>false</i> otherwise.
      * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.Message
      * @see org.greenstone.gatherer.gui.GUIManager
      * @see org.greenstone.gatherer.gui.GConfigPane

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

@@ -244 +244 @@
      * @see org.greenstone.gatherer.Configuration
      * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.Message
      * @see org.greenstone.gatherer.collection.Collection
      * @see org.greenstone.gatherer.gui.BuildOptions

trunk/gli/src/org/greenstone/gatherer/file/FileOpenActionListener.java

@@ -60 +60 @@
      * @param event A <strong>MouseEvent</strong> containing further information about the mouse click performed.
      * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.collection.FileRecord
-     * @see org.greenstone.gatherer.tree.GTree
+     * @see org.greenstone.gatherer.file.FileNode
+     * @see org.greenstone.gatherer.gui.tree.DragTree
      */ 
     public void mouseClicked(MouseEvent event) {

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

@@ -68 +68 @@
     /** The component currently in charge of drawing the ghost icon. Note that this isn't necessarily the only component that needs to repaint 'spoilt' screen real-estate as a side effect of the ghost. */
     private DragComponent ghost_owner = null;
-    /** The component where the drag began, so that extra information necessary for the drag can be garnered by the drop target, or so that focus can return to the source component if the drop is rejected. 
-     * @see org.greenstone.gatherer.tree.DragComponent#gainFocus
-     * @see org.greenstone.gatherer.tree.DragComponent#loseFocus
-     */
+    /** The component where the drag began, so that extra information necessary for the drag can be garnered by the drop target, or so that focus can return to the source component if the drop is rejected. */
     private DragTree drag_source = null;
     /** The selected nodes, as determined when the drag begun. */