Changeset 4675

Timestamp:

2003-06-16T10:47:06+12:00 (21 years ago)

Author:

jmt12

Message:

Sunday's work

Location:

trunk/gli

Files:

• Gatherer.bat (modified) (2 diffs)
• classes/dictionary.properties (modified) (5 diffs)
• src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)
• src/org/greenstone/gatherer/cdm/TranslationManager.java (modified) (12 diffs)
• src/org/greenstone/gatherer/collection/CollectionConfiguration.java (modified) (6 diffs)
• src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (14 diffs)
• src/org/greenstone/gatherer/collection/DeleteCollectionPrompt.java (modified) (16 diffs)
• src/org/greenstone/gatherer/file/FileManager.java (modified) (3 diffs)
• src/org/greenstone/gatherer/file/FileQueue.java (modified) (11 diffs)
• src/org/greenstone/gatherer/gui/CollectionPane.java (modified) (8 diffs)
• src/org/greenstone/gatherer/gui/CreatePane.java (modified) (11 diffs)
• src/org/greenstone/gatherer/gui/GComboBox.java (modified) (5 diffs)
• src/org/greenstone/gatherer/gui/GUIManager.java (modified) (18 diffs)
• src/org/greenstone/gatherer/gui/LockFileDialog.java (modified) (1 diff)
• src/org/greenstone/gatherer/gui/MetaEditPane.java (modified) (1 diff)
• src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java (modified) (1 diff)
• src/org/greenstone/gatherer/gui/NewCollectionMetadataPrompt.java (modified) (4 diffs)
• src/org/greenstone/gatherer/gui/OptionsPane.java (modified) (23 diffs)
• src/org/greenstone/gatherer/gui/PreviewPane.java (modified) (1 diff)
• src/org/greenstone/gatherer/undo/UndoManager.java (modified) (9 diffs)

trunk/gli/Gatherer.bat

@@ -12 +12 @@
 :Run
 REM ********************************************
-set GSDLHOME=**GSDLHOME**
-set PERLHOME=**PERLHOME**
-set JAVAHOME=**JAVAHOME**
-set CGIBINHOME=**CGIBINHOME**
+set GSDLHOME=D:\Progra~1\gsdl\
+set PERLHOME=D:\Progra~1\Perl\bin\
+set JAVAHOME=D:\Progra~1\j2sdk1.4.0
+REM set CGIBINHOME=http://vektor/gsdl
+set CGIBINHOME=D:\Progra~1\gsdl\server.exe
 REM ********************************************
 
@@ -22 +23 @@
 if "%OS%" == "" set PATH="%PATH%";"%PERLHOME%";"%JAVAHOME%\bin";"%GSDLHOME%\bin\windows";"%GSDLHOME%\bin\script"
 
-java.exe -cp Gatherer.jar;classes/;lib/apache.jar;lib/calpa.jar;lib/jp.jar;lib/polloxml.jar;lib/qfslib.jar;lib/skinlf.jar org.greenstone.gatherer.Gatherer -gsdl %GSDLHOME% -perl %PERLHOME% -library %CGIBINHOME%
+java.exe -cp classes/;Gatherer.jar;lib/apache.jar;lib/calpa.jar;lib/jp.jar;lib/polloxml.jar;lib/qfslib.jar;lib/skinlf.jar org.greenstone.gatherer.Gatherer -gsdl %GSDLHOME% -perl %PERLHOME% -library %CGIBINHOME%
 echo "Done!"
 
 :End
+
+if "%1" == "SetEnv" goto EndAndExit
+
+echo "Closing initial console."
+
+cls
+
+:EndAndExit
+
+echo "Closing second console."
+
+exit
+cls

trunk/gli/classes/dictionary.properties

@@ -118 +118 @@
 CDM.ClassifierManager.Assigned:Currently Assigned Classifiers
 CDM.ClassifierManager.Classifier:Select classifier to add:
-CDM.ClassifierManager.Classifier_XML_Parse_Failed:Unable to determine the arguments for the {0}\nclassifier.  Please ensure that the classifier in question\nprovides the  -xml flag by running the classinfo.pl script\nsimilar to the  description of the  pluginfo.pl  script in\nsection   2.1  of   the   Greenstone   Developers   Guide.
+CDM.ClassifierManager.Classifier_XML_Parse_Failed:GLI has been unable to determine the arguments for the {0}\nclassifier.  Please ensure that the classifier in question\nprovides the  -xml flag by running the classinfo.pl script\nsimilar to the  description of the  pluginfo.pl  script in\nsection   2.1  of   the   Greenstone   Developers   Guide.
 CDM.ClassifierManager.Configure:Configure Selected Classifier
 CDM.ClassifierManager.Controls:Editing Controls
@@ -210 +210 @@
 CDM.PlugInManager.Move_Up:Move Up
 CDM.PlugInManager.PlugIn:Select plugin to add:
-CDM.PlugInManager.PlugIn_XML_Parse_Failed:Unable to determine the arguments for the {0}\nplugin. Please ensure that the plugin in question provides\nthe  -xml flag by running the pluginfo.pl script described\nin  section  2.1  of  the   Greenstone  Developers  Guide.
+CDM.PlugInManager.PlugIn_XML_Parse_Failed:GLI has been unable to determine the arguments for the {0}\nplugin. Please ensure that the plugin in question provides\nthe  -xml flag by running the pluginfo.pl script described\nin  section  2.1  of  the   Greenstone  Developers  Guide.
 CDM.PlugInManager.Remove:Remove Selected Plugin
 CDM.PlugInManager.Title:{39}{46}Plugin Selection & Configuration{47}{34}
@@ -350 +350 @@
 DeleteCollectionPrompt.Collection_List:Available collections.
 DeleteCollectionPrompt.Confirm_Delete:Please tick the box to confirm collection deletion.
-DeleteCollectionPrompt.Details:Title    - {0}\nFilename - {1}\nEmail    - {2}\nDescription\n{3}
+DeleteCollectionPrompt.Details:Title      - {0}\nFilename   - {1}\nCreator    - {2}\nMaintainer - {3}\nDescription\n{4}
 DeleteCollectionPrompt.Failed_Delete:Collection could not be completely deleted.
 DeleteCollectionPrompt.Failed_Title:Deletion Failed!
@@ -769 +769 @@
 MSMPrompt.Select_Element_Element:Select Element:
 MSMPrompt.Select_Element_Ignore:Ignore
-MSMPrompt.Select_Element_Instructions:The metadata element {0} cannot be automatically imported into the collection. Select a metadata set and either:\n(1) press 'Add' to add the metadata to that set (only available if no element with that name already exists), or\n(2) choose an element and press 'Merge' to import {0} metadata to this element.
+MSMPrompt.Select_Element_Instructions:The metadata element {0} cannot be automatically imported into the collection. Select a metadata set and either:\n(1) press 'Add' to add the metadata to that set, or\n(2) choose an element and press 'Merge' to import {0} metadata to this element.
 MSMPrompt.Select_Element_Merge:Merge
 MSMPrompt.Select_Element_Original:Original element name:
@@ -795 +795 @@
 NewCollectionPrompt.Instructions:To create a new collection fill out the fields below.
 NewCollectionPrompt.Metadata_Elements:Elements within selected set:
-NewCollectionPrompt.Metadata_Instructions:Check the boxes beside the metadata sets to include in your collection. (Note: You can add new ones later).
+NewCollectionPrompt.Metadata_Instructions1:Check the boxes beside the metadata sets to include in your collection.
+NewCollectionPrompt.Metadata_Instructions2:(Note: You can add new ones later).
 NewCollectionPrompt.Name_Error:You have either failed to enter a name for the collection, or the name you have choosen is already in use. Please correct.
 NewCollectionPrompt.NewCollection:-- New Collection --

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

@@ -733 +733 @@
 
     private void stopServerEXE() {
-    if(server != null) {
+    if(server != null && config.exec_address != null) {
         // See if its already exited for some reason.
         gsdlsite_cfg.load();

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

@@ -89 +89 @@
         if(!features_model.contains(bob)) {
         features_model.add(bob);
-        } 
+        }
     }
     Collections.sort(features_model);
     return features_model.toArray();
     }
-    
+
 
     private class BobTheMagicalComparableWrapper
@@ -174 +174 @@
         JPanel fragment_selection_panel = new JPanel();
         JLabel fragment_label = new JLabel(get("Assigned_Fragments"));
+
         fragment_table = new JTable(fragment_table_model);
         fragment_table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
@@ -187 +188 @@
         //fragment_table.sizeColumnsToFit(0);
 
+        JScrollPane table_scroll = new JScrollPane(fragment_table);
+        table_scroll.getViewport().setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        table_scroll.setOpaque(true);
+
         JPanel south_panel = new JPanel();
 
@@ -211 +216 @@
         translation_area.setLineWrap(true);
         translation_area.setWrapStyleWord(true);
-    
+
         // Connection
         language_combobox.addActionListener(new LanguageActionListener());
@@ -229 +234 @@
         fragment_selection_panel.setLayout(new BorderLayout());
         fragment_selection_panel.add(fragment_label, BorderLayout.NORTH);
-        fragment_selection_panel.add(new JScrollPane(fragment_table), BorderLayout.CENTER);
+        fragment_selection_panel.add(table_scroll, BorderLayout.CENTER);
 
         selection_panel.setLayout(new GridLayout(2,1,0,5));
@@ -278 +283 @@
     }
 
-    private class FeaturesListSelectionListener 
+    private class FeaturesListSelectionListener
         implements ListSelectionListener {
         public void valueChanged(ListSelectionEvent event) {
@@ -302 +307 @@
                 String language_name = language_combobox.getSelectedItem().toString();
                 int index = fragment_table_model.getMetadataIndexByLanguage(language_name);
-                if(index != -1) { 
+                if(index != -1) {
                 CollectionMeta metadata = fragment_table_model.getMetadata(index);
                 fragment_table.setRowSelectionInterval(index, index);
@@ -322 +327 @@
                 // Update and disable the text area
                 translation_area.setText("");
-                translation_area.setEnabled(false); 
+                translation_area.setEnabled(false);
                 translation_area.setBackground(Gatherer.config.getColor("coloring.disabled", false));
             }
@@ -364 +369 @@
     private class FragmentTableModel
         extends AbstractTableModel {
-        
+
         private ArrayList metadatum;
 
@@ -409 +414 @@
         return "#Error";
         }
-        
+
         public void remove(int index) {
         metadatum.remove(index);
@@ -453 +458 @@
             String language_name = language_combobox.getSelectedItem().toString();
             int index = fragment_table_model.getMetadataIndexByLanguage(language_name);
-            if(index != -1) { 
+            if(index != -1) {
             CollectionMeta metadata = fragment_table_model.getMetadata(index);
             fragment_table.setRowSelectionInterval(index, index);
@@ -463 +468 @@
             }
             // Ready the text area
-            translation_area.setEnabled(true);  
+            translation_area.setEnabled(true);
             translation_area.setBackground(Gatherer.config.getColor("coloring.editable", false));
             ignore_event = false;
         }
-        }       
+        }
     }
 

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

@@ -14 +14 @@
     private Element maintainer_element;
     private Element name_element;
+    private File file;
     private String creator;
     private String description;
@@ -20 +21 @@
 
     public CollectionConfiguration(File file) {
+    this.file = file;
     try {
         String filename = file.getName().toLowerCase();
         if(filename.endsWith(".xml")) {
-                     
+
         }
         else if(filename.endsWith(".cfg")) {
@@ -56 +58 @@
                     String language = temp.substring(temp.indexOf("=") + 1, temp.length() - 1);
                     if(name == null || language.equalsIgnoreCase(Gatherer.dictionary.getLanguage())) {
-                        name = Utility.decodeGreenstone(tokenizer.nextToken()); 
+                        name = Utility.decodeGreenstone(tokenizer.nextToken());
                     }
                     }
@@ -101 +103 @@
                 ///ystem.err.println("creator     = " + creator);
                 ///ystem.err.println("maintainer  = " + maintainer);
-                ///ystem.err.println("description = " + description); 
+                ///ystem.err.println("description = " + description);
     }
     catch(Exception error) {
@@ -131 +133 @@
     }
 
+    public File getFile() {
+        return file;
+    }
+
     public String getMaintainer() {
     String result = "";
@@ -153 +159 @@
     }
 
+    /** Retrieve the short name for this collection which, given this current file is in <col_name>/etc/collect.cfg, is the name of this file's parent file's parent.
+    * @return the short name of this collection as a String
+    */
+    public String getShortName() {
+        return file.getParentFile().getParentFile().getName();
+    }
+
     public void setName(String name) {
     /** @todo */
     }
+
+    /** Display the title for this collection. */
+    public String toString() {
+        return getName();
+    }
 }

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

@@ -103 +103 @@
 
     private int special_case = -1;
+    /** Holds a reference to the thread responsible for closing the collection. If non-null then only calls from the given thread will see the collection is non-ready. All other threads will have to wait until closing thread, and all of it consequential calls, are completely finished. */
+    private Thread closing_thread = null;
+
     /** The name of the standard lock file. */
     static final public String LOCK_FILE = "gatherer.lck";
@@ -142 +145 @@
       */
     public void buildCollection() {
-    Gatherer.println("Building collection");
+    Gatherer.println("CollectionManager.buildCollection()");
     building = true;
 
@@ -162 +165 @@
     shell.addGShellListener(Gatherer.g_man.create_pane);
     shell.start();
+    Gatherer.println("CollectionManager.buildCollection().return");
     }
     /** Used to determine whether the currently active collection has been built.
@@ -178 +182 @@
      */
     public void closeCollection() {
+    Gatherer.println("Close collection: " + collection.getName());
+    // We set the closing thread, as it should be the only one who can actually see the collection is closed, at least until the closing thread expires.
+    closing_thread = Thread.currentThread();
     // System.err.println("Closing collection...");
     // Remove the lock on this file, then remove the collection.
@@ -190 +197 @@
     Gatherer.g_man.collectionChanged(false);
     // System.err.println("Closed collection.");
+    // All of the consequences of a close should have been processed by now, so others should now see the collection as non-ready.
+    closing_thread = null;
     }
 
@@ -199 +208 @@
     }
 
-    /** Used to set the current collection to the given collection. Note that this call should -always- be proceeded by a ready call, and if the colection is ready and the saved flag is unset then the user should be prompted to save. Also note that this method creates yet another GShell to run buildcol.pl. 
+    /** Used to set the current collection to the given collection. Note that this call should -always- be proceeded by a ready call, and if the colection is ready and the saved flag is unset then the user should be prompted to save. Also note that this method creates yet another GShell to run buildcol.pl.
      * @param description a description of the collection as a String
      * @param email the email address of the author/maintainer as a String
@@ -243 +252 @@
         progress.setNote(get("Log_Created"));
         }
-                
+
         progress.setProgress(2);
 
@@ -707 +716 @@
       */
     public void importCollection() {
+    Gatherer.println("CollectionManager.importCollection()");
     if(!saved()) {
         // Force save.
@@ -742 +752 @@
         shell.start();
     }
+    Gatherer.println("CollectionManager.importCollection().return");
     }
     /** Attempts to load the given collection. Currently uses simple serialization of the collection class.
@@ -890 +901 @@
       */
     public synchronized void processBegun(GShellEvent event) {
+    Gatherer.println("CollectionManager.processBegun(" + event.getType() + ")");
     ///ystem.err.println("ProcessBegun " + event.getType());
     // If this is one of the types where we wish to lock user control
@@ -901 +913 @@
       */
     public synchronized void processComplete(GShellEvent event) {
+    Gatherer.println("CollectionManager.processComplete(" + event.getType() + ")");
     ///ystem.err.println("ProcessComplete " + event.getType());
     Gatherer.g_man.lockCollection((event.getType() == GShell.IMPORT), false);
@@ -936 +949 @@
       * @return A <i>boolean</i> which is <i>true</i> to indicate a collection has been loaded and thus the collection is ready for editing, <i>false</i> otherwise.
       */
-    public boolean ready() {
-    if(collection != null) {
-        return true;
-    }
-    return false;
-    }
+
+    public synchronized boolean ready() {
+        if(collection != null) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+
+    public synchronized boolean reallyReady() {
+    if(collection == null) {
+        Gatherer.println("Called reallyReady() when collection was null.");
+        Gatherer.println("Closing thread = " + closing_thread);
+        Gatherer.println("This thread = " + Thread.currentThread());
+        Gatherer.println("Thus we return: " + (closing_thread == null || closing_thread == Thread.currentThread() ? "not ready" : "ready"));
+    }
+    // If the closing thread is non-null we should only allow that thread to see the collection as closed.
+    if(closing_thread != null) {
+        // Only the closing thread sees the truth
+        if(Thread.currentThread() == closing_thread) {
+            return (collection == null);
+        }
+        // All other threads are told a lie.
+        else {
+            return true;
+        }
+    }
+    else {
+        if(collection != null) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    }
     /** Called to refresh the models upon which the trees are based.
       * @see org.greenstone.gatherer.collection.Collection
@@ -1001 +1045 @@
       */
     public void saveCollection(boolean close_after, boolean exit_after) {
+        Gatherer.println("Save collection: " + collection.getName());
     try {
         SaveCollectionTask save_task = new SaveCollectionTask(collection, close_after, exit_after);
+        save_task.start();
         // Run this in the same thread
-        save_task.run();
+        //save_task.run();
     }
     catch(Exception error) {
@@ -1088 +1134 @@
 
     try {
-                // We have to ensure that the local library 
+                // We have to ensure that the local library
         if(Gatherer.config.exec_file != null) {
         ///ystem.err.println("Local Library Found!");

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

@@ -43 +43 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Collection;
-import org.greenstone.gatherer.gui.ModalDialog;
-import org.greenstone.gatherer.gui.SimpleMenuBar;
 import org.greenstone.gatherer.util.ArrayTools;
-import org.greenstone.gatherer.util.GSDLSiteConfig;
 import org.greenstone.gatherer.util.Utility;
 /** This class provides the functionality to delete current collections from the GSDLHOME/collect/ directory. The user chooses the collection from a list, where each entry also displays details about itself, confirms the delete of a collection by checking a checkbox then presses the ok button to actually delete the collection.
@@ -53 +50 @@
  */
 public class DeleteCollectionPrompt
-    extends ModalDialog {
+    extends JDialog {
     /** The currently selected collection for deletion. */
-    private CollectionEntry collection = null;
+    private CollectionConfiguration collection = null;
     /** The model behind the list. */
     private DefaultListModel list_model = null;
@@ -76 +73 @@
     /** A string array used to pass arguments to the phrase retrieval method. */
     private String args[] = null;
-
-    private boolean current_coll_deleted = false;
     /** The size of the delete prompt screen. */
     public static final Dimension SIZE = new Dimension(500, 500);
@@ -87 +82 @@
      */
     public DeleteCollectionPrompt() {
-    super(Gatherer.g_man);
+    super();
     this.close_button = new JButton(get("General.Close", null));
     this.confirmation = new JCheckBox(get("Confirm_Delete", null));
@@ -100 +95 @@
     this.setSize(SIZE);
     this.setTitle(get("Title", null));
-    this.setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
     close_button.addActionListener(new CloseButtonListener());
     confirmation.addActionListener(new ConfirmationCheckBoxListener());
@@ -127 +121 @@
     prompt = null;
     }
-    /** This method causes the modal prompt to be displayed. 
-     * returns true if it has deleted the collection that is currently open*/
-    public boolean display() {
+    /** This method causes the modal prompt to be displayed. */
+    public void display() {
     // Central pane
     JPanel list_pane = new JPanel(new BorderLayout());
@@ -170 +163 @@
     Dimension screen_size = Gatherer.config.screen_size;
     this.setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
-    this.setVisible(true); // blocks until the dialog is killed
-    return current_coll_deleted;
-    
-    }
-    /** Shows a delete complete prompt. 
+    this.show();
+    }
+
+    /** Shows a delete complete prompt.
       * @param success A <strong>boolean</strong> indicating if the collection was successfully deleted.
       * @see org.greenstone.gatherer.collection.Collection
@@ -188 +180 @@
     }
     }
+
     /** Retrieves a phrase from the <strong>Dictionary</strong> in <strong>Gatherer</strong>.
       * @param key A <strong>String</strong> used to match against a specific phrase in the dictionary.
@@ -199 +192 @@
     return Gatherer.dictionary.get(key, args);
     }
-    /** Attempts to load the given collection. Currently uses simple
-      * serialization of the collection class.
-      * @param location The path to the serialized collection.
-      */
-//      public Collection loadCollection(File file) {
-//      Collection col = null;
-//      try {
-//          FileInputStream fis = new FileInputStream(file);
-//          BufferedInputStream bin = new BufferedInputStream(fis);
-//          ObjectInputStream input = new ObjectInputStream(bin);
-//          col = (Collection) input.readObject();
-//          input.close();
-//          input = null;
-//          bin.close();
-//          bin = null;
-//          fis.close();
-//          fis = null;
-//      } 
-//      catch (Exception error) {
-//          error.printStackTrace();
-//      }
-//      return col;
-//      }
+
     /** Method to scan the collect directory retrieving and reloading each collection it finds, while building the list of known collections.
       * @see org.greenstone.gatherer.Configuration
@@ -233 +204 @@
     File collect_directory = new File(collect_directory_name);
     if(collect_directory.exists()) {
-        // Now for each child directory see if it contains a .col file and
-        // if so try to load it..
+        // Now for each child directory see if it contains a .col file and if so try to load it..
         File collections[] = collect_directory.listFiles();
         ArrayTools.sort(collections);
         for(int i = 0; collections != null && i < collections.length; i++) {
-        File config_file = Utility.findConfigFile(collections[i]);
-        if (config_file != null) {
-            CollectionConfiguration config = new CollectionConfiguration(config_file);
-            if (config != null) {
-            CollectionEntry col = new CollectionEntry(collections[i].getName(), config);
-            list_model.addElement(col);
+        File children[] = collections[i].listFiles();
+        for(int j = 0; children != null && j < children.length; j++) {
+            if(children[j].getAbsolutePath().endsWith(".col")) {
+            list_model.addElement(new CollectionConfiguration(children[j]));
             }
-            
-            //File children[] = collections[i].listFiles();
-            //for(int j = 0; children != null && j < children.length; j++) {
-            //if(children[j].getAbsolutePath().endsWith(".col")) {
-            //Collection col = loadCollection(children[j]);
-            // If we've actually loaded 
-            //if(col != null) {
-            //   list_model.addElement(col);
-            //}
-            //}
         }
         }
@@ -261 +219 @@
     }
     /** A button listener implementation, which listens for actions on the close button and disposes of the dialog when detected. */
-    private class CloseButtonListener 
+    private class CloseButtonListener
     implements ActionListener {
     /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
@@ -272 +230 @@
     /** This private class listens for selection events in from the list and then displays the appropriate details for that collection.
       */
-    private class CollectionListListener 
+    private class CollectionListListener
     implements ListSelectionListener {
     /** Any implementation of ListSelectionListener must include this method so we can be informed when the list selection changes.
@@ -280 +238 @@
         if(!list.isSelectionEmpty()) {
         confirmation.setEnabled(true);
-        collection = (CollectionEntry) list.getSelectedValue();
-        args = new String[4];
-        args[0] = collection.getTitle();
-        args[1] = collection.getName();
+        collection = (CollectionConfiguration) list.getSelectedValue();
+        args = new String[5];
+        args[0] = collection.getName();
+        args[1] = collection.getShortName();
         args[2] = collection.getCreator();
-        args[3] = collection.getDescription();
+        args[3] = collection.getMaintainer();
+        args[4] = collection.getDescription();
         details.setText(get("Details", args));
-        details.setCaretPosition(0);
         }
         else {
@@ -309 +267 @@
         }
     }
-    }         
+    }
     /** The OK button listener implementation. */
-    private class OKButtonListener 
+    private class OKButtonListener
     implements ActionListener {
     /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
@@ -320 +278 @@
      */
     public void actionPerformed(ActionEvent event) {
-        // Delete the selected collection.
-
-        // first of all we must release it from the local library
-        if(Gatherer.config.exec_file != null) {
-        ///ystem.err.println("Local Library Found!");
-        Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
-        }
-
-        File delete_me = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
+                // Delete the selected collection.
+        File delete_me = collection.getFile().getParentFile().getParentFile();
         if(Utility.delete(delete_me)) {
-        if (collection.getName().equals(Gatherer.c_man.getCollection().getName())) {
-            current_coll_deleted = true;
-        }
-
         resultPrompt(true);
         list_model.removeElement(collection);
@@ -347 +294 @@
     }
     }
-
-    private class CollectionEntry {
-
-    private String name = null;
-    private CollectionConfiguration config = null;
-
-    public CollectionEntry(String name, CollectionConfiguration config) {
-        this.name = name;
-        this.config = config;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getTitle() {
-        return config.getName();
-    }
-
-    public String getCreator() {
-        return config.getCreator();
-    }
-
-    public String getDescription() {
-        return config.getDescription();
-    }
-    
-    public String toString() {
-        return config.getName();
-        
-    }
-    }
 }
 

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

@@ -46 +46 @@
 import org.greenstone.gatherer.util.DragComponent;
 import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
-/** Manages the moving of files within a separate thread. 
+/** Manages the moving of files within a separate thread.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
  * @version 2.3
@@ -70 +70 @@
     // If source and target are different
     else {
-                // If target is the UndoManager, we're deleting
+        // If target is the UndoManager, we're deleting
         if(target instanceof UndoManager) {
         // If the source is the workspace then display an error message. Workspace is read only.
@@ -141 +141 @@
     public void run() {
         // Reset, and calculate progress bar size.
-        queue.calculateSize(source_nodes);
+        boolean cancelled = queue.calculateSize(source_nodes);
         // Now we queue the job(s). Note that this may fail if a read only file is encountered and we have been asked to delete.
-        for(int i = 0; source_nodes != null && i < source_nodes.length; i++) {
+        for(int i = 0; !cancelled && source_nodes != null && i < source_nodes.length; i++) {
         queue.addJob(id, source, source_nodes[i], target, target_node, type, true, true, true);
         }

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

@@ -140 +140 @@
     }
 
-    public void calculateSize(FileNode[] files) {
+    /** Calculates the total deep file size of the selected file nodes.
+    * @param files a FileNode[] of selected files
+    * @return true if a cancel was signalled, false otherwise
+    * @see org.greenstone.gatherer.file.FileManager.Task#run()
+    */
+    public boolean calculateSize(FileNode[] files) {
     progress.reset();
     progress.setString(get("FileActions.Calculating_Size"));
     progress.setIndeterminate(true);
     Vector remaining = new Vector();
-    for(int i = 0; i < files.length; i++) {
+    for(int i = 0; !cancel_action && i < files.length; i++) {
         remaining.add(files[i]);
     }
-    while(remaining.size() > 0) {
+    while(!cancel_action && remaining.size() > 0) {
         FileNode node = (FileNode)remaining.remove(0);
         if(node.isLeaf()) {
@@ -154 +159 @@
         }
         else {
-        for(int i = 0; i < node.getChildCount(); i++) {
+        for(int i = 0; !cancel_action && i < node.getChildCount(); i++) {
             remaining.add(node.getChildAt(i));
         }
@@ -161 +166 @@
     progress.setString(get("No_Activity"));
     progress.setIndeterminate(false);
+    // Now we return if calculation was cancelled so that the FileManagers Task can skip the addJob phase correctly.
+    if(cancel_action) {
+        cancel_action = false; // reset
+        return true;
+    }
+    else {
+        return false;
+    }
     }
 
@@ -171 +184 @@
     return file_status;
     }
-    /** Access to the job state label. */    
+    /** Access to the job state label. */
 //      public JLabel getJobStatus() {
 //      return job_status;
@@ -203 +216 @@
             ///ystem.err.println("Found job: " + job);
             // The user can cancel this individual action at several places, so keep track if the state is 'ready' for the next step.
-            boolean ready = true; 
+            boolean ready = true;
             FileNode origin_node = job.getOrigin();
             FileNode destination_node = job.getDestination();
@@ -394 +407 @@
                 source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
                 }
-                                     
+
                 // We can't have been cancelled, and we must have created a new FileNode during the above phase, before we can handle metadata.
                 if(!cancel_action && new_node != null) {
@@ -403 +416 @@
                     GDMManager gdm = Gatherer.c_man.getCollection().gdm;
                     // we just retrieve the metadata attached to the origin node...
-                    ArrayList existing_metadata = gdm.getMetadata(source_file);
-                    ///ystem.err.println("Existing metadata for " + origin_node + ": " + gdm.toString(existing_metadata));
+                    ArrayList existing_metadata = gdm.getMetadataOnly(source_file);
+                    //Gatherer.println("Existing metadata for " + origin_node + ": " + gdm.toString(existing_metadata));
                     // then assign this remainder to the new folder.
                     ///ystem.err.println("New metadata: " + gdm.toString(existing_metadata));
@@ -533 +546 @@
                 // We add an entry to the complete mappings to ensure this directory isn't added again
                 completed_folder_mappings.put(origin_node, recycle_folder_record);
-                ///ystem.err.println("Added completed directories mapping " + origin_node); 
-                // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once. 
+                ///ystem.err.println("Added completed directories mapping " + origin_node);
+                // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once.
                 ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
                 ///ystem.err.println("Directory actually has " + child_list.length + " children.");
@@ -586 +599 @@
             progress.reset();
             progress.setString(get("No_Activity"));
-            yes_to_all = false;         
+            yes_to_all = false;
             completed_folder_mappings.clear();
             recycle_folder_mappings.clear();
@@ -599 +612 @@
         }
         catch (Exception error) {
-        Gatherer.printStackTrace(error); 
+        Gatherer.printStackTrace(error);
         }
     }
@@ -655 +668 @@
       * @see org.greenstone.gatherer.Gatherer
       */
-    public void copyFile(File source, File destination, LongProgressBar progress) 
+    public void copyFile(File source, File destination, LongProgressBar progress)
     throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, UnknownFileErrorException {
     if(source.isDirectory()) {

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

@@ -230 +230 @@
         collection_filter.setBackground(Color.lightGray);
     }
-          
+
     collection_tree.setEnabled(ready);
     collection_filter.setEnabled(ready);
@@ -242 +242 @@
     workspace_tree.setModel(workspace);
     workspace_tree_sync.add(workspace_tree);
-          
+
     // Enable or disable the control buttons
     bin_button.setEnabled(ready);
@@ -290 +290 @@
     fcb.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable", false));
     fcb.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
-    fcb.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.workspace_selection_background", false));
-    fcb.setTextSelectionColor(Gatherer.config.getColor("coloring.workspace_selection_foreground", false));
+    fcb.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
+    fcb.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
     fcb = null;
 
@@ -354 +354 @@
 
     JPanel file_pane = new JPanel();
-    file_pane.setBackground(Color.white);
+    //file_pane.setBackground(Color.white);
     //JPanel job_pane = new JPanel();
     //job_pane.setBackground(Color.white);
     JPanel progress_pane = new JPanel();
-    progress_pane.setBackground(Color.white);
+    //progress_pane.setBackground(Color.white);
     JLabel file_status = file_queue.getFileStatus();
     //JLabel job_status = job_queue.getJobStatus();
@@ -372 +372 @@
     bin_button.setPreferredSize(MIN_SIZE);
     group.add(bin_button);
-          
+
     // Layout Components.
     workspace_pane.setLayout(new BorderLayout());
@@ -689 +689 @@
     /** This provides a small prompt for gathering addition details about a special directory mapping such as its symbolic name. */
     private class MappingPrompt
-    extends JDialog 
+    extends JDialog
     implements ActionListener, KeyListener {
     private boolean cancelled = false;
@@ -723 +723 @@
         file_pane.add(file_label, BorderLayout.WEST);
         file_pane.add(file_field, BorderLayout.CENTER);
-                
+
         name_pane.setLayout(new BorderLayout());
         name_pane.add(name_label, BorderLayout.WEST);
@@ -773 +773 @@
     private class MouseListenerImpl
     extends MouseAdapter {
-    /** Any subclass of MouseAdapter can override this method to respond to mouse click events. In this case we want to open a pop-up menu if we detect a right mouse click over one of our registered components, and start an external application if someone double clicks on a certain file record. */ 
+    /** Any subclass of MouseAdapter can override this method to respond to mouse click events. In this case we want to open a pop-up menu if we detect a right mouse click over one of our registered components, and start an external application if someone double clicks on a certain file record. */
     public void mouseClicked(MouseEvent event) {
         if(SwingUtilities.isRightMouseButton(event)) {

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

@@ -54 +54 @@
 /** This class provides a GUI view showing some statistics on your current collection, and options for building it. As the collection is built this initial view is replaced with one showing progress bars and a message log of the creation process. This log can be later accessed via the options tree located in the center of the initial pane. This class is also responsible for creating the GShellProgressMonitors that are then attatched to external shell processes, and calling the methods in the CollectionManager for actually importing and building the collection. <br><BR>
  * <center><table width=80% border=2 cellspacing=0 cellpadding=2><tr><td align=center colspan=4>
- * The (i)mport and/or (b)uild options supported:</td></tr> 
+ * The (i)mport and/or (b)uild options supported:</td></tr>
  * <tr background=black><font color=white><td>Script</td><td>Associated Argument</td><td>Control</td><td>Comments</td></font></tr>
  * <tr><td>b</td><td>-allclassifications</td><td>JCheckBox</td><td>&nbsp;</td></tr>
@@ -80 +80 @@
  */
 public class CreatePane
-    extends JPanel 
+    extends JPanel
     implements GShellListener {
     /** Determines the current view that should be shown for this pane. */
@@ -101 +101 @@
     private JButton cancel_button = null;
     /** The label displaying the number of documents in this collection. */
-    private JLabel document_count = null; 
+    private JLabel document_count = null;
     /** The label alongside the build progress bar gets some special treatment so... */
     private JLabel progress_build_label = null;
@@ -216 +216 @@
     ///ystem.err.println("Collection changed... ");
     if(Gatherer.c_man != null && Gatherer.c_man.ready()) {
-              
+
         if (!processing &&this.options_pane!=null) {
         // we only do this if we are not processing - if we are processing, then we haven't added the new entry yet, and it will be added by another method
         this.options_pane.resetLogList(); // saves any residual message
-        } 
+        }
         Collection current_collection = Gatherer.c_man.getCollection();
         if (current_collection != previous_collection) {
@@ -239 +239 @@
     stats_area.setLayout(new GridLayout(1,1));
     stats_area.add(document_count);
-         
+
     JPanel left = new JPanel();
     left.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
@@ -275 +275 @@
     build_pane.setLayout(new BorderLayout());
     build_pane.add(progress_build_label, BorderLayout.WEST);
-    build_pane.add(build_monitor.getProgress(), BorderLayout.CENTER);     
+    build_pane.add(build_monitor.getProgress(), BorderLayout.CENTER);
 
     JPanel bar_area = new JPanel();
@@ -463 +463 @@
         options_pane.addNewLog(OptionsPane.CANCELLED);
         card_layout.show(main_pane, CONTROL);
-                // Set the stop flag in all the process monitor.
+        // Set the stop flag in all the process monitor.
         build_monitor.setStop(true);
         copy_monitor.setStop(true);
         import_monitor.setStop(true);
-                // Set removeold automatically.
-        if(Gatherer.c_man.ready()) { // and it should be.
-        Gatherer.c_man.getCollection().build_options.setImportValue("removeold", true, null);
-        }
-                // Remove the collection lock.
-        Gatherer.g_man.lockCollection(false, false);
+        // Set removeold automatically.
+        Gatherer.c_man.getCollection().build_options.setImportValue("removeold", true, null);
+        // Remove the collection lock.
+        //Gatherer.g_man.lockCollection(false, false);
     }
     }
     /** The OptionTree is simply a tree structure that has a root node labelled "Options" and then has a child node for each available options screen. These screens are either combinations of the available import and build arguments, or a message log detailing the shell processes progress. */
     private class OptionTree
-    extends JTree 
+    extends JTree
     implements TreeSelectionListener {
     /** The model behind the tree. */
@@ -491 +489 @@
     /** The root node of the options tree, which has no associated options view. */
     private OptionTreeNode options   = null;
-    /** Constructor. 
+    /** Constructor.
      * @see org.greenstone.gatherer.gui.CreatePane.OptionTreeNode
      */
@@ -505 +503 @@
         log = new OptionTreeNode(get("Log"));
         options = new OptionTreeNode(get("Options"));
-                
+
         model = new DefaultTreeModel(options);
         setModel(model);
@@ -520 +518 @@
     public void valueChanged(TreeSelectionEvent event) {
         TreePath path = null;
-        OptionTreeNode node = null; 
+        OptionTreeNode node = null;
                 //if(event != null) {
         //path = event.getPath();
@@ -565 +563 @@
     /** The <strong>OptionTree</strong> is built from these nodes, each of which has several methods used in creating the option panes.
       */
-    private class OptionTreeNode 
-    extends DefaultMutableTreeNode 
+    private class OptionTreeNode
+    extends DefaultMutableTreeNode
     implements Comparable {
     /** The text label given to this node in the tree. */

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

@@ -147 +147 @@
     UI ui = new UI();
     setUI(ui);
-    ui.setBackground(Color.white);
+    ui.setButtonBackground();
     // Initialization
     this.background = Gatherer.config.getColor("coloring.collection_tree_background", false);
@@ -163 +163 @@
         setBackground(background);
         setForeground(foreground);
-        setSelectionColor(selection_background); 
+        setSelectionColor(selection_background);
         setSelectedTextColor(selection_foreground);
     }
@@ -224 +224 @@
     }
 
-    private class Renderer 
-    extends JLabel 
+    private class Renderer
+    extends JLabel
     implements ListCellRenderer {
     public Renderer() {
@@ -258 +258 @@
                 scroller.setPreferredSize( popupBounds.getSize() );
                 scroller.setMinimumSize( popupBounds.getSize() );
-                list.invalidate();            
+                list.invalidate();
                 int selectedIndex = comboBox.getSelectedIndex();
                 if ( selectedIndex == -1 ) {
                 list.clearSelection();
-                } 
+                }
                 else {
                 list.setSelectedIndex( selectedIndex );
-                }            
+                }
                 list.ensureIndexIsVisible( list.getSelectedIndex() );
                 setLightWeightPopupEnabled( comboBox.isLightWeightPopupEnabled() );
@@ -276 +276 @@
     }
 
-    public void setBackground(Color background) {
-        arrowButton.setBackground(background);
+    public void setButtonBackground() {
+        arrowButton.setBackground(Gatherer.config.getColor("coloring.button_background", false));
     }
     }

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

@@ -99 +99 @@
     /** The message pane is optional and contains the log of messages sent. */
     public MessagePane message_pane = null;
-     
+
     public MetaAuditFrame meta_audit;
     /** The metaedit pane is used to assign, edit and remove metadata from files within the collection. */
@@ -177 +177 @@
     else if(esrc == menu_bar.file_delete) {
         DeleteCollectionPrompt dcp = new DeleteCollectionPrompt();
-        boolean current_deleted = dcp.display();
+        dcp.display();
         dcp.destroy();
         dcp = null;
-        // need to close the current collection?
-        if (current_deleted) {
-        Gatherer.c_man.closeCollection();
-        tab_pane.setSelectedComponent(collection_pane); 
-        }
         System.gc();
     }
@@ -283 +278 @@
 
             int SIZE = 5000;
-            Object[] array = new Object[SIZE];  
-            Runtime.getRuntime().gc();  
+            Object[] array = new Object[SIZE];
+            Runtime.getRuntime().gc();
             long start = Runtime.getRuntime().freeMemory();
             for (int i = 0; i < SIZE; i++) {
@@ -292 +287 @@
             long end = Runtime.getRuntime().freeMemory();
             long difference = (( start -  end ) / SIZE);
-            ///ystem.out.println(difference + " bytes used." );                           
+            ///ystem.out.println(difference + " bytes used." );
         }
         }
@@ -309 +304 @@
     }
     else if(esrc == menu_bar.help_collect) {
-        help.setView("5.0"); 
+        help.setView("5.0");
     }
     else if(esrc == menu_bar.help_design) {
-        help.setView("7.0"); 
+        help.setView("7.0");
     }
     else if(esrc == menu_bar.help_general) {
-        help.setView(""); 
+        help.setView("");
     }
     else if(esrc == menu_bar.help_metaedit) {
@@ -321 +316 @@
     }
     else if(esrc == menu_bar.help_mirror) {
-        help.setView("4.0"); 
+        help.setView("4.0");
     }
     else if(esrc == menu_bar.help_preview) {
@@ -411 +406 @@
                 // Create the menu-bar and stick it up the top.
         menu_bar = new MenuBar(new MenuListenerImpl());
-        content_pane.add(menu_bar, BorderLayout.NORTH); 
-                // Create the tabbed pane and plop it in the center where it will 
+        content_pane.add(menu_bar, BorderLayout.NORTH);
+                // Create the tabbed pane and plop it in the center where it will
                 // expand to consume all available space like any good gas would.
         tab_pane = new JTabbedPane();
@@ -424 +419 @@
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(browser_pane), Gatherer.config.get("workflow.browse", false));
         }
-                
+
         if(Gatherer.config.get("workflow.mirror", true)) {
         mirror_pane = new MirrorPane(workspace_tree_sync);
@@ -430 +425 @@
         tab_pane.addTab(get("Mirroring"), Utility.getImage("mirroring.gif"), mirror_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(mirror_pane), Gatherer.config.get("workflow.mirror", false));
-        }               
+        }
 
         if(Gatherer.config.get("workflow.gather", true)) {
@@ -445 +440 @@
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(metaedit_pane), false);
         }
-                
+
         if(Gatherer.config.get("workflow.design", true)) {
         config_pane = new GConfigPane();
@@ -452 +447 @@
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(config_pane), false);
         }
-                
+
         if(Gatherer.config.get("workflow.export", true)) {
         tab_pane.addTab(get("Export"), Utility.getImage("export.gif"), export_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(export_pane), false);
         }
-                
+
         if(Gatherer.config.get("workflow.create", true)) {
         create_pane = new CreatePane();
@@ -464 +459 @@
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(create_pane), false);
         }
-                
+
         if(Gatherer.config.get("workflow.preview", true)) {
         preview_pane = new PreviewPane();
@@ -542 +537 @@
     }
 
-    /** Allows the system to programatically set the selected tab. 
+    /** Allows the system to programatically set the selected tab.
       * @param component The view you wish to make visable in the tab pane as a <strong>Component</strong>.
       */
@@ -609 +604 @@
         // If there is already a collection open, save and close it.
         if(Gatherer.c_man.ready()) {
-        showSaveCollectionBox(true, false);     
+        showSaveCollectionBox(true, false);
         // Wait until it is closed.
-//          try {
-//              while(Gatherer.c_man.ready()) {
-//              wait(10);
-//              }
-//          }
-//          catch(Exception error) {
-//              System.err.println("Exception: " + error);
-//              error.printStackTrace();
-//          }
+        try {
+            synchronized(this) {
+                while(Gatherer.c_man.reallyReady()) {
+                wait(10);
+                }
+            }
+        }
+        catch(Exception error) {
+                Gatherer.println("Exception: " + error);
+                Gatherer.printStackTrace(error);
+        }
         }
         result = Gatherer.c_man.loadCollection(filename);
@@ -653 +650 @@
         showSaveCollectionBox(true, false);
         // Wait until it is closed.
-//          try {
-//              synchronized(this) {
-//              while(Gatherer.c_man.ready()) {
-//                  wait(10);
-//              }
-//              }
-//          }
-//          catch(Exception error) {
-//              System.err.println("Exception: " + error);
-//              error.printStackTrace();
-//          }
+        try {
+            synchronized(this) {
+            while(Gatherer.c_man.reallyReady()) {
+                wait(10);
+            }
+            }
+        }
+        catch(Exception error) {
+            Gatherer.println("Exception: " + error);
+            Gatherer.printStackTrace(error);
+        }
         }
 
@@ -679 +676 @@
         extends Thread {
     private NewCollectionDetailsPrompt ncd_prompt = null;
-    private NewCollectionMetadataPrompt ncm_prompt = null; 
+    private NewCollectionMetadataPrompt ncm_prompt = null;
     public CreationTask(NewCollectionDetailsPrompt ncd_prompt, NewCollectionMetadataPrompt ncm_prompt) {
         this.ncd_prompt = ncd_prompt;
@@ -717 +714 @@
     //case SaveCollectionBox.SAVE_YES:
     Gatherer.c_man.saveCollection(close_after, exit_after);
+    // Wait until it is closed.
+    try {
+        synchronized(this) {
+            while(Gatherer.c_man.reallyReady()) {
+            wait(10);
+            }
+        }
+    }
+    catch(Exception error) {
+        Gatherer.println("Exception: " + error);
+        Gatherer.printStackTrace(error);
+    }
+
     //content_pane.paintImmediately(bounds);
-    return true;  
+    return true;
     //case SaveCollectionBox.SAVE_NO:
     // Close collection.
@@ -862 +872 @@
     }
     }
-    private class TabUpdater 
+    private class TabUpdater
     implements Runnable {
     private boolean ready = false;

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

@@ -52 +52 @@
     name_label.setPreferredSize(LABEL_SIZE);
     TextFieldLabel name_field = new TextFieldLabel(name);
+    name_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JPanel person_pane = new JPanel();
     JLabel person_label = new JLabel(get("User"));
     person_label.setPreferredSize(LABEL_SIZE);
     TextFieldLabel person_field = new TextFieldLabel(getValue("User"));
+    person_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JPanel machine_pane = new JPanel();
     JLabel machine_label = new JLabel(get("Machine"));
     machine_label.setPreferredSize(LABEL_SIZE);
     TextFieldLabel machine_field = new TextFieldLabel(getValue("Machine"));
+    machine_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JPanel created_pane = new JPanel();
     JLabel created_label = new JLabel(get("Date"));
     created_label.setPreferredSize(LABEL_SIZE);
     TextFieldLabel created_field = new TextFieldLabel(getValue("Date"));
+    created_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JLabel central_label = new JLabel(get("Lockfile_Message_Two"));
     JPanel button_pane = new JPanel();

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

@@ -406 +406 @@
     // Change the default colours of this filters combobox.
     GComboBox fcb = filter.getComboBox();
-    fcb.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable", false));
+    fcb.setBackgroundNonSelectionColor(Color.white);
     fcb.setTextNonSelectionColor(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
     fcb.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));

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

@@ -112 +112 @@
     description_label.setOpaque(false);
     description = new JTextArea();
-    description.setBackground(Gatherer.config.getColor("coloring.editable", false));
     description.setRows(5);
 

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

@@ -19 +19 @@
 import org.w3c.dom.*;
 
-public class NewCollectionMetadataPrompt 
+public class NewCollectionMetadataPrompt
     extends ModalDialog {
 
@@ -45 +45 @@
         if(name.endsWith(".mds")) {
         sets.add(new MetadataSet(possible_mdses[i]));
-        }               
-    }         
+        }
+    }
 
     // Creation
     JPanel content_pane = (JPanel) getContentPane();
 
-    JLabel instructions_label = new JLabel(get("Metadata_Instructions"));
+    JPanel instructions_panel = new JPanel();
+    JLabel instructions_label1 = new JLabel(get("Metadata_Instructions1"));
+    JLabel instructions_label2 = new JLabel(get("Metadata_Instructions2"));
 
     JPanel center_pane = new JPanel();
@@ -76 +78 @@
     sets_list.addListSelectionListener(new MetadataListSelectionListener());
     // Display
+    instructions_panel.setLayout(new GridLayout(2,1));
+    instructions_panel.add(instructions_label1);
+    instructions_panel.add(instructions_label2);
+
     sets_list_pane.setLayout(new BorderLayout());
     sets_list_pane.add(sets_list_label, BorderLayout.NORTH);
@@ -96 +102 @@
     content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     content_pane.setLayout(new BorderLayout());
-    content_pane.add(instructions_label, BorderLayout.NORTH);
+    content_pane.add(instructions_panel, BorderLayout.NORTH);
     content_pane.add(center_pane, BorderLayout.CENTER);
     content_pane.add(button_pane, BorderLayout.SOUTH);

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

@@ -51 +51 @@
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
-/** This class serves as the data holder for all subclasses of option panes, such as Import options or All options. It also contains methods for creating each of the option lines as they would appear in the subpane. Futhermore it has a method for considering all the arguments and generating a <strong>String[]</strong> to allow you to pass them to the <strong>GShell</strong>. 
+/** This class serves as the data holder for all subclasses of option panes, such as Import options or All options. It also contains methods for creating each of the option lines as they would appear in the subpane. Futhermore it has a method for considering all the arguments and generating a <strong>String[]</strong> to allow you to pass them to the <strong>GShell</strong>.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
  * @version 2.2
@@ -75 +75 @@
     static final public char UNSUCCESSFUL = 'u';
     static final public char CANCELLED = 'c';
-    
+
     static private int BUILD = 0;
     static private int IMPORT = 1;
@@ -85 +85 @@
     static private Dimension SPINNER_SIZE = new Dimension(100, 25);
     static private String DESCRIPTION_SEP = " + ";
-    
-    
+
+
      /** The default constructor creates the few session length options, but either retrieves the rest from the current collection, or creates a default set of options. */
     public OptionsPane(JTextArea log, BuildOptions build_options) {
@@ -95 +95 @@
     }
 
-    /** creates a new log from the text in log. The new file is named 
+    /** creates a new log from the text in log. The new file is named
      * build_log.<current time>.txt. A new FileEntry is added to teh log list
      * and made selected. A fresh listener is added to teh document */
     public void addNewLog(char success) {
     ///ystem.out.println("add new log");
-        
+
     // create the file name
     long time = System.currentTimeMillis();
@@ -153 +153 @@
     }
     return pane;
-    }  
+    }
     /** This method creates the panel with all the import only options on it.
       * @return A <strong>JPanel</strong> which can be used to display all the import only options.
@@ -189 +189 @@
     if (log_pane == null) {
         log_pane = new JPanel(new BorderLayout());
-          
+
         // Build a list of the log files available, ordering by last modified. Log files are like build_log.date.txt
         DefaultListModel contents = new DefaultListModel();
@@ -213 +213 @@
         }
         }
-          
-        log_list = new JList(contents); 
+
+        log_list = new JList(contents);
         log_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         log_list.setLayoutOrientation(JList.VERTICAL);
         log_list.setVisibleRowCount(3);
         log_list.addListSelectionListener(new LogListListener());
-          
+
         JScrollPane list_scroller = new JScrollPane(log_list);
-          
+
         // If log is not empty and we have something in displayed_log - make that element selected
         if (log_display.getText().length()>0 && displayed_log != null) {
@@ -228 +228 @@
             log_list.setSelectedIndex(index);
         }
-              
+
         }
         log_pane.add(new JScrollPane(log_display), BorderLayout.CENTER);
@@ -261 +261 @@
     return Gatherer.dictionary.get(key, args);
     }
-    /** Attempts to discover the latest document count. 
+    /** Attempts to discover the latest document count.
       * @return An <strong>int</strong> detailing the number of documents in this collection.
      */
@@ -273 +273 @@
     return 1;
     }
-    
+
     /** Loads a new log into the log text - saves the currently showing one,
      * and loads the new one, adding a fresh listener to the document
-     * Note, we need to remove any listener before making the changes, then 
-     * add a listener back in 
+     * Note, we need to remove any listener before making the changes, then
+     * add a listener back in
      */
     public void loadSelectedLog(FileEntry fe) {
@@ -286 +286 @@
         log_display.getDocument().removeDocumentListener(log_change_listener);
     }
-    
+
     displayed_log = fe;
     if (fe != null) {
@@ -295 +295 @@
     is_log_changed=false;
     log_display.getDocument().addDocumentListener(log_change_listener);
-    
+
     }
 
     /** Neutralizes the log list - saves any unsaved changes to the current log
-     * clears the log text, unselects the log list, and adds a fresh listener 
-     * to the log's document 
-     * Note, we need to remove any listener before making the changes, then 
+     * clears the log text, unselects the log list, and adds a fresh listener
+     * to the log's document
+     * Note, we need to remove any listener before making the changes, then
      * add a listener back in */
     public void resetLogList() {
@@ -317 +317 @@
     is_log_changed=false;
     log_display.getDocument().addDocumentListener(log_change_listener);
-    
+
     }
 
     /** saves the current text in log to the File specified */
     public void saveLogFile(File file) {
-    
+
     try {
         BufferedWriter out = new BufferedWriter(new FileWriter(file)); // uses the default encoding
@@ -331 +331 @@
         String token = t.nextToken();
         if (token.equals("\n")) {
-            out.newLine(); 
+            out.newLine();
         } else {
             out.write(token, 0, token.length());
         }
-        
+
         }
         out.close();
-        
+
     } catch(Exception e) {
         System.out.println("Error in saving log file: "+file.toString());
         e.printStackTrace();
     }
-    
-    
+
+
     }
 
@@ -550 +550 @@
     /** Constructor. */
     public EnabledListener(JComponent target) {
-        this.target = target;   
+        this.target = target;
     }
     /** Any implementation of ActionListener must include this method so that we can be informed when an action has been performed on or registered check box, prompting us to change the state of the other controls as per the users request.
@@ -587 +587 @@
 
     /** holds a File which has a particular naming convention
-     * build_log.date.txt 
+     * build_log.date.txt
      * also keeps a Date corresponding to the date in its name*/
     private class FileEntry {
-    
+
     private Date date=null;
     private File file=null;
@@ -598 +598 @@
         this.date = getDateFromFileName();
         this.display = createDisplayText();
-        
+
     }
 
@@ -606 +606 @@
         return date.compareTo(d);
     }
-    
+
     public Date getDate() {
         return this.date;
@@ -622 +622 @@
         BufferedReader in = new BufferedReader(new FileReader(this.file));
         String line;
-        
+
         while ((line = in.readLine()) != null) {
             contents.append(line);
@@ -632 +632 @@
         } catch (IOException ioe) {
         System.err.println("Error: exception occurred when trying to read in file "+this.file.toString()+", "+ioe.getMessage());
-        
-        }
-        
+
+        }
+
         return contents.toString();
     }
     /** we only want the date out of the file name, not the whole path */
     public String toString() {
-        return this.display; 
+        return this.display;
     }
     /** creates the display text for the list */
@@ -645 +645 @@
         StringBuffer d = new StringBuffer();
         d.append(date.toString());
-        char success= this.file.getName().charAt(23);
-        switch (success) {
-        case OptionsPane.SUCCESSFUL:
-        d.append(get("Successful"));
-        break;
-        case OptionsPane.UNSUCCESSFUL:
-        d.append(get("Unsuccessful"));
-        break;
-        case OptionsPane.CANCELLED:
-        d.append(get("Cancelled"));
-        break;
-        }
+        //char success= this.file.getName().charAt(23);
+        String filename = this.file.getName();
+        int index = filename.lastIndexOf(".") - 1;
+        if(index >= 0) {
+            char success = filename.charAt(index);
+            switch (success) {
+            case OptionsPane.SUCCESSFUL:
+            d.append(get("Successful"));
+            break;
+            case OptionsPane.UNSUCCESSFUL:
+            d.append(get("Unsuccessful"));
+            break;
+            case OptionsPane.CANCELLED:
+            d.append(get("Cancelled"));
+            break;
+            }
+        }
         return d.toString();
     }
@@ -675 +680 @@
     }
 
-    
+
     }
 
     /** A DocumentListener that listens for changes in the log_display document
      * if a change is registered, the flag is_log_changed is set to true,
-     * and the listener removes itself from log_display 
+     * and the listener removes itself from log_display
      * Because we only want to register user's changes, the listener must be removed before the system makes any changes, and then put back. For example, each time we switchlogs to display, a remove event and an insert event are sent. We dont want to register these as changes to the document, so the listener must be removed before the switch, and added back afterwards */
     private class LogChangeListener implements DocumentListener {
@@ -703 +708 @@
     }
     }
-    
-    /** a ListSelectionListener that triggers the load of a newly selected 
+
+    /** a ListSelectionListener that triggers the load of a newly selected
     log */
     private class LogListListener implements ListSelectionListener {
 
     public void valueChanged(ListSelectionEvent e) {
-        if (!e.getValueIsAdjusting()) { // we get two events for one change in list selection - use the false one ( the second one) 
+        if (!e.getValueIsAdjusting()) { // we get two events for one change in list selection - use the false one ( the second one)
         JList source  = (JList)e.getSource();
         FileEntry fe = (FileEntry) source.getSelectedValue();

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

@@ -172 +172 @@
         view.setLoadSynchronously(false);
         ///ystem.err.println("Complete.");
-        url = null;       
-    }
-    catch(MalformedURLException error) {
+        url = null;
+    }
+    catch(Exception error) {
         ///ystem.err.println("Bad URL.");
     }

trunk/gli/src/org/greenstone/gatherer/undo/UndoManager.java

@@ -58 +58 @@
 import org.greenstone.gatherer.util.DragGroup;
 import org.greenstone.gatherer.util.Utility;
-/** Manages the rather complex task of undoing and redoing actions. It does this by storing two queues, undo and redo, containing undo jobs which encapsulate all the information needed to undo or redo an action. It is also important to note that the manage creates a temporary directory, and then places any deleted files in this directory, and saves their associated metadata with them, for the life of the session. This is to facilitate the restoring of deleted files. 
- * @author John Thompson, Greenstone Digital Library, University of Waikato 
+/** Manages the rather complex task of undoing and redoing actions. It does this by storing two queues, undo and redo, containing undo jobs which encapsulate all the information needed to undo or redo an action. It is also important to note that the manage creates a temporary directory, and then places any deleted files in this directory, and saves their associated metadata with them, for the life of the session. This is to facilitate the restoring of deleted files.
+ * @author John Thompson, Greenstone Digital Library, University of Waikato
  * @version 2.3c
  */
@@ -270 +270 @@
         redo.push(job);
     }
-    } 
+    }
 
     public void fileMoved(long id, DragComponent source_model, FileNode source_parent, DragComponent target_model, FileNode target_parent, FileNode record, boolean undo_event) {
@@ -291 +291 @@
     public ArrayList getMetadata(File file) {
     ///ystem.err.println("UndoMetadata: " + file.getAbsolutePath());
-    return obsolete_metadata.getMetadata(file.getAbsolutePath(), true, new ArrayList(), file);
+    return obsolete_metadata.getMetadata(file.getAbsolutePath(), true, new ArrayList(), file, false);
     }
 
@@ -392 +392 @@
         this.type = type;
     }
-          
+
     public void action(boolean is_undo, FileQueue file_queue) {
                 // Retrieve the lastest version of each file record
@@ -414 +414 @@
         latest_source_parent = source_parent;
         }
-                // Heres the fraction, too much friction. 
+                // Heres the fraction, too much friction.
         switch(type) {
-        case FILE_COPY:                  
+        case FILE_COPY:
         // To undo a file copy we issue a delete file action on the destination file record.
         file_queue.addJob(id, target_model, latest_record, source_model, latest_source_parent, FileJob.DELETE, !is_undo, true, false);
@@ -424 +424 @@
         file_queue.addJob(id, target_model, latest_record, source_model, latest_source_parent, FileJob.MOVE, !is_undo, true, false);
         break;
-        case FILE_MOVE:          
+        case FILE_MOVE:
         // This may be a legitimate move, or may be a side effect of an undelete. If the formed source model and parent will be non-null.
         if(source_model != null && source_parent != null) {
@@ -449 +449 @@
     }
 
-    private class UndoJobAdder 
+    private class UndoJobAdder
     implements Runnable {
     private boolean undo_event;
@@ -478 +478 @@
     }
 
-    private class UndoStack 
+    private class UndoStack
     extends LinkedList {
     private boolean enabled = false;
@@ -491 +491 @@
         if(enabled) {
         setEnabled(false);
-        }               
+        }
     }
     public UndoJob getJob(long id) {