Changeset 5164

Timestamp:

2003-08-18T14:10:31+12:00 (21 years ago)

Author:

jmt12

Message:

I can't remember what has changed, but I bet it was for the better

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (8 diffs)
• Dictionary.java (modified) (1 diff)
• Gatherer.java (modified) (4 diffs)
• cdm/Argument.java (modified) (1 diff)
• cdm/ArgumentConfiguration.java (modified) (1 diff)
• cdm/CollectionConfiguration.java (modified) (11 diffs)
• cdm/CollectionMetaManager.java (modified) (2 diffs)
• cdm/FormatManager.java (modified) (1 diff)
• collection/Collection.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (10 diffs)
• file/FileNode.java (modified) (4 diffs)
• file/FileSystemModel.java (modified) (3 diffs)
• gui/CreatePane.java (modified) (10 diffs)
• gui/NewCollectionDetailsPrompt.java (modified) (8 diffs)
• gui/OpenCollectionDialog.java (modified) (2 diffs)
• gui/OptionsPane.java (modified) (15 diffs)
• gui/Preferences.java (modified) (17 diffs)
• gui/WarningDialog.java (modified) (6 diffs)
• msm/GDMDocument.java (modified) (5 diffs)
• msm/GDMManager.java (modified) (1 diff)
• msm/GreenstoneArchiveParser.java (modified) (1 diff)
• msm/Metadata.java (modified) (2 diffs)

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

@@ -56 +56 @@
 public class Configuration
     extends Hashtable {
+
+    static final public boolean COLLECTION_SPECIFIC = true;
+    static final public boolean GENERAL_SETTING = true;
+
+    /** The string identifying an argument's name attribute. */
+    static final private String ARGUMENT_NAME = "name";
+    /** The name of the general Gatherer configuration file. */
+    static final private String CONFIG_XML = "config.xml";
+    /** The name of the root element of the subtree containing gatherer configuration options. This is required as the document itself may contain several other subtrees of settings (such as in the case of a '.col' file). */
+    static final private String GATHERER_CONFIG = "GathererConfig";
+    /** The string identifying an argument element. */
+    static final private String GATHERER_CONFIG_ARGUMENT = "Argument";
+    /** The name of a Name Element. */
+    static final private String NAME = "Name";
+    /** The name of the other arguments element. */
+    static final private String OTHER = "Other";
+    /** The name of an information Element within the Other subtree. */
+    static final private String OTHER_INFO = "Info";
+    /** The name of the general Gatherer configuration template. */
+    static final private String TEMPLATE_CONFIG_XML = "xml/config.xml";
+    /** The first of two patterns used during tokenization, this pattern handles a comma separated list. */
+    static final private String TOKENIZER_PATTERN1 = " ,\n\t";
+    /** The second of two patterns used during tokenization, this pattern handles an underscore separated list. */
+    static final private String TOKENIZER_PATTERN2 = "_\n\t";
+
     public File exec_file;
     /** The path (or url) to the webserver which is serving the Greenstone collection. */
@@ -78 +103 @@
     private int cache_miss = 0;
     public URL exec_address = null;
-    /** The string identifying an argument's name attribute. */
-    static final private String ARGUMENT_NAME = "name";
-    /** The name of the general Gatherer configuration file. */
-    static final private String CONFIG_XML = "config.xml";
-    /** The name of the root element of the subtree containing gatherer configuration options. This is required as the document itself may contain several other subtrees of settings (such as in the case of a '.col' file). */
-    static final private String GATHERER_CONFIG = "GathererConfig";
-    /** The string identifying an argument element. */
-    static final private String GATHERER_CONFIG_ARGUMENT = "Argument";
-    /** The name of a Name Element. */
-    static final private String NAME = "Name";
-    /** The name of the other arguments element. */
-    static final private String OTHER = "Other";
-    /** The name of an information Element within the Other subtree. */
-    static final private String OTHER_INFO = "Info";
-    /** The name of the general Gatherer configuration template. */
-    static final private String TEMPLATE_CONFIG_XML = "xml/config.xml";
-    /** The first of two patterns used during tokenization, this pattern handles a comma separated list. */
-    static final private String TOKENIZER_PATTERN1 = " ,\n\t";
-    /** The second of two patterns used during tokenization, this pattern handles an underscore separated list. */
-    static final private String TOKENIZER_PATTERN2 = "_\n\t";
+
     /** Constructor.
      * @param gsdl_path The path to the Greenstone directory as a <strong>String</strong>.
@@ -356 +362 @@
     try {
         String raw = getString(property, general);
-                // Locale is a underscore separated code.
+        // Locale is a underscore separated code.
         StringTokenizer tokenizer = new StringTokenizer(raw, TOKENIZER_PATTERN2);
         String language = tokenizer.nextToken();
-        String country = tokenizer.nextToken();
-        result = new Locale(language, country);
+        if(tokenizer.hasMoreTokens()) {
+        String country = tokenizer.nextToken();
+        result = new Locale(language, country);
+        }
+        else {
+        result = new Locale(language);
+        }
     }
     catch(Exception error) {
@@ -433 +444 @@
     /** Set the named property, from the specified configuration, using the given boolean value. */
     public void set(String property, boolean general, boolean value) {
+    if(property.startsWith("workflow")) {
+        System.err.println("Set property: " + property + ", general=" + general + ", value=" + value);
+    }
     setString(property, general, (value ? "true" : "false"));
     }
@@ -537 +551 @@
     StringBuffer text = new StringBuffer("");
     text.append(value.getLanguage());
-    text.append("_");
-    text.append(value.getCountry());
+    String country = value.getCountry();
+    if(country != null && country.length() > 0) {
+        text.append("_");
+        text.append(country);
+    }
+    country = null;
     setString(property, general, text.toString());
     }
@@ -544 +562 @@
     /** Sets the value of the named property argument using the given string. */
     public void setString(String property, boolean general, String value) {
-    ///atherer.println("Set configuration property: " + property + " = " + value + (general ? "" : " [Collection]"));
+    Gatherer.println("Set configuration property: " + property + " = " + value + (general ? "" : " [Collection]"));
     try {
         Document document = null;
@@ -615 +633 @@
     UIManager.put("CheckBox.background", new ColorUIResource(getColor("coloring.collection_heading_background", false)));
 
+
     // Editable coloring
     UIManager.put("ComboBox.background", new ColorUIResource(getColor("coloring.collection_tree_background", false))); // Indicate clickable
@@ -624 +643 @@
     UIManager.put("Table.background", new ColorUIResource(getColor("coloring.collection_tree_background", false)));
     UIManager.put("List.background", new ColorUIResource(getColor("coloring.collection_tree_background", false)));
+    UIManager.put("RadioButton.background", new ColorUIResource(getColor("coloring.collection_tree_background", false)));
+
     // Selection color
     UIManager.put("TabbedPane.selected", new ColorUIResource(getColor("coloring.collection_selection_background", false)));

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

@@ -103 +103 @@
     // Load new dictionary
     dictionary = ResourceBundle.getBundle(Utility.DICTIONARY, locale);
+    language = dictionary.getString("Language");
+    System.err.println("Having loaded new dictionary: " + language);
     // Refresh all registered component
+    System.err.println("Updating components");
     for(Iterator keys = keySet().iterator(); keys.hasNext(); ) {
         Object component = keys.next();

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

@@ -54 +54 @@
 import org.greenstone.gatherer.gui.GUIManager;
 import org.greenstone.gatherer.gui.Splash;
+import org.greenstone.gatherer.gui.URLField;
 import org.greenstone.gatherer.gui.WarningDialog;
 import org.greenstone.gatherer.msm.MetadataSetManager;
@@ -81 +82 @@
 public class Gatherer {
 
-    static final private String SKIN_DEFINITION_FILE = "lib/greenaqua/greenaqua.xml";
+    static final private String SKIN_DEFINITION_FILE = "lib/greenaqua/greenaqua.xml";
 
     /** Has the exit flag been set? <i>true</i> if so, <i>false</i> otherwise. */
@@ -128 +129 @@
       map.removeKeyStrokeBinding(enter);
     }
-
-
 
     /** Constructor. Make the three main modules, c_man, f_man and g_man, and any other necessary classes such as Dictionary.
@@ -597 +596 @@
     WarningDialog dialog = new WarningDialog("warning.MissingEXEC", "general.exec_address", dictionary);
     //NoSettingDialog dialog = new NoSettingDialog("warning.MissingEXEC", "NoSettingEXEC.Message", false, dictionary);
+    dialog.setValueField(new URLField(Gatherer.config.getColor("coloring.editable_foreground", false), Gatherer.config.getColor("coloring.editable_background", false), Gatherer.config.getColor("coloring.error_foreground", false), Gatherer.config.getColor("coloring.error_background", false)));
     dialog.display();
     dialog.dispose();

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

@@ -205 +205 @@
         ElementWrapper element_wrapper = Gatherer.c_man.getCollection().msm.getElement(value);
         if(element_wrapper != null) {
-            value = element_wrapper.toString();
+            value = element_wrapper.getName();
         }
         }

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

@@ -587 +587 @@
             return true;
         case Argument.METADATUM:
+            argument.setValue(((ElementWrapper)((JComboBox)value).getSelectedItem()).getName());
+            // Kinda lucked out here. Its impossible not to choose an entry from these comboboxes as they are restricted.
+            return true;
         case Argument.HIERARCHY:
             argument.setValue(((JComboBox)value).getSelectedItem().toString());

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

@@ -349 +349 @@
     public Element getBeta() {
     Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_BETA_ELEMENT, null, null);
+    element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_BETA_STR);
     element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
     return element;
@@ -355 +356 @@
     public Element getCreator() {
     Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_CREATOR_ELEMENT, null, null);
+    element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_CREATOR_STR);
     element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
     return element;
@@ -378 +380 @@
     public Element getMaintainer() {
     Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_MAINTAINER_ELEMENT, null, null);
+    element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_MAINTAINER_STR);
     element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
     return element;
@@ -393 +396 @@
     public Element getPublic() {
     Element element = getOrCreateElementByTagName(COLLECTIONMETADATA_PUBLIC_ELEMENT, null, null);
+    element.setAttribute(NAME_ATTRIBUTE, COLLECTIONMETADATA_PUBLIC_STR);
     element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
     return element;
@@ -581 +585 @@
     // Create the element
     Element element = document.createElement(name);
+    // If there was a property set it
+    if(conditional_attribute != null) {
+        element.setAttribute(conditional_attribute, required_value);
+    }
     Node target_node = findInsertionPoint(element);
     if(target_node != null) {
@@ -743 +751 @@
         text.append(name_str);
         text.append(SPACE_CHARACTER);
-        }
-        String language_str = command_element.getAttribute(LANGUAGE_ATTRIBUTE);
-        // If this is element is in english, and it is the first one found, we don't need to write the language argument.
-        if(!language_str.equals(ENGLISH_LANGUAGE_STR) || known_metadata == null || known_metadata.contains(name_str)) {
-        text.append(LBRACKET_CHARACTER);
-        text.append(LANGUAGE_ARGUMENT);
-        text.append(language_str);
-        text.append(RBRACKET_CHARACTER);
-        text.append(SPACE_CHARACTER);
-        }
-        if(known_metadata != null) {
-        known_metadata.add(name_str);
-        }
-        language_str = null;
+        String language_str = command_element.getAttribute(LANGUAGE_ATTRIBUTE);
+        // If this is element is in english, and it is the first one found, we don't need to write the language argument.
+        if(!language_str.equals(ENGLISH_LANGUAGE_STR) || known_metadata == null || known_metadata.contains(name_str)) {
+            text.append(LBRACKET_CHARACTER);
+            text.append(LANGUAGE_ARGUMENT);
+            text.append(language_str);
+            text.append(RBRACKET_CHARACTER);
+            text.append(SPACE_CHARACTER);
+        }
+        if(known_metadata != null) {
+            known_metadata.add(name_str);
+        }
+        language_str = null;
+        }
         name_str = null;
         // We don't wrap the email addresses in quotes, nor any string without spaces
@@ -1129 +1137 @@
             command_element.setAttribute(NAME_ATTRIBUTE, name_str);
             command_element.setAttribute(LANGUAGE_ATTRIBUTE, language_str);
-            MSMUtils.setValue(command_element, value_str);
+            MSMUtils.setValue(command_element, Utility.encodeXML(value_str));
         }
         else {
@@ -1182 +1190 @@
     private Element parsePlugIn(String command_str) {
     Element command_element = null;
+    boolean use_metadata_files = false;
     try {
         CommandTokenizer tokenizer = new CommandTokenizer(command_str);
@@ -1190 +1199 @@
         tokenizer.nextToken();
         // The next token is the type
-        command_element.setAttribute(TYPE_ATTRIBUTE, tokenizer.nextToken());
+        String type = tokenizer.nextToken();
+        command_element.setAttribute(TYPE_ATTRIBUTE, type);
         // Now we parse out the remaining arguments into a hashmapping from name to value
         HashMap arguments = parseArguments(tokenizer);
@@ -1199 +1209 @@
             String value = (String) arguments.get(name); // Can be null
             Element option_element = document.createElement(OPTION_ELEMENT);
+            if(name.substring(1).equals(USE_METADATA_FILES_ARGUMENT)) {
+            use_metadata_files = true;
+            }
             option_element.setAttribute(NAME_ATTRIBUTE, name.substring(1));
             option_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
@@ -1216 +1229 @@
             value = null;
         }
+        // Finally if the type happened to be a RecPlug we ensure that the use metadata files argument is set
+        if(type.equals(RECPLUG_STR) && !use_metadata_files) {
+            Element option_element = document.createElement(OPTION_ELEMENT);
+            option_element.setAttribute(NAME_ATTRIBUTE, USE_METADATA_FILES_ARGUMENT);
+            option_element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
+            option_element.setAttribute(CUSTOM_ATTRIBUTE, TRUE_STR);
+            command_element.appendChild(option_element);
+            option_element = null;
+        }
+        type = null;
         names = null;
         arguments = null;

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

@@ -106 +106 @@
 
     public CollectionMeta getMetadatum(String name, boolean add_if_not_found) {
-    ///atherer.println("Get the metadata for " + name + " in the default language.");
+    //Gatherer.println("Get the metadata for " + name + " in the default language.");
     int size = getSize();
     for(int i = 0; i < size; i++) {
         CollectionMeta metadatum = (CollectionMeta) getElementAt(i);
         if(metadatum.getName().equals(name) && metadatum.getLanguage().equals(Gatherer.config.interface_language)) {
-        ///atherer.println("Found '" + metadatum + "'");
+        //Gatherer.println("Found '" + metadatum + "'");
         return metadatum;
         }
         else {
-        ///atherer.println("No match with: " + metadatum.getName() + " [l=" + metadatum.getLanguage() + "] \"" + metadatum.getValue() + "\"");
+        //Gatherer.println("No match with: " + metadatum.getName() + " [l=" + metadatum.getLanguage() + "] \"" + metadatum.getValue() + "\"");
         }
         metadatum = null;
@@ -122 +122 @@
         CollectionMeta result = new CollectionMeta(name);
         addMetadatum(result);
-        ///atherer.println("Added new metadata.");
+        //Gatherer.println("Added new metadata.");
         return result;
     }

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

@@ -216 +216 @@
         Vector elements = Gatherer.c_man.getCollection().msm.getAssignedElements();
         for(int i = 0; i < elements.size(); i++) {
-        special_model.add("[" + ((ElementWrapper)elements.get(i)).toString() + "]");
+        special_model.add("[" + ((ElementWrapper)elements.get(i)).getName() + "]");
         }
         Collections.sort(special_model);

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

@@ -128 +128 @@
         mapping_element = null;
         }
-                // Otherwise add the mapping.
+        // Otherwise add the mapping.
         if(!found) {
         Element mapping_element = document.createElement(MAPPING);

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

@@ -70 +70 @@
 import org.greenstone.gatherer.util.GSDLSiteConfig;
 import org.greenstone.gatherer.util.MetadataXML;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
 import org.greenstone.gatherer.util.Utility;
@@ -197 +198 @@
     Gatherer.g_man.collectionChanged(false);
     ///ystem.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;
+    // 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;
     }
 
@@ -226 +227 @@
         progress.setProgress(1);
 
-        // ACTIVE_DIR/gimport/
         String a_dir = Utility.getCollectionDir(Gatherer.config.gsdl_path) + name + File.separator;
-
-        // Has to be done before creating greenstone directory metadata manager.
-        File gimport_dir_temp = new File(Utility.getImportDir(a_dir)+"temp.dat");
-        File gimport_dir = gimport_dir_temp.getParentFile();
-        gimport_dir.mkdirs();
-        if(progress != null) {
-        progress.setNote(get("Gimport_Created"));
-        }
 
         // ACTIVE_DIR/gcache/
@@ -260 +252 @@
         msm = collection.msm; // Legacy
         collection.msm.load();
+        // Always import the extracted metadata set
+        collection.msm.importMDS(new File(Utility.METADATA_DIR + Utility.EXTRACTED_METADATA_NAMESPACE + StaticStrings.METADATA_SET_EXTENSION), false);
         // Import default metadata sets if any.
         for(int i = 0; metadata_sets != null && i < metadata_sets.size(); i++) {
@@ -360 +354 @@
             // Find the import directory
             File base_import = new File(base_collection_directory, Utility.IMPORT_DIR);
-            if(!base_import.exists()) {
-                base_import = new File(base_collection_directory, Utility.OLD_IMPORT_DIR);
-            }
             if(base_import.exists()) {
                 searchForMetadata(base_import);
@@ -536 +527 @@
     return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + collection.getName() + ".col";
     }
-    /** Constructs the absolute filename of the collection import directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/gimport/"
+    /** Constructs the absolute filename of the collection import directory, which should resemble "$GSDLHOME/collect/&lt;col_name&gt;/import/"
       * @return A <strong>String</strong> containing the filename.
       * @see org.greenstone.gatherer.Configuration
@@ -577 +568 @@
     }
 
-    public String getCollectionOldImport() {
-    return Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator + Utility.OLD_IMPORT_DIR;
-    }
-
     /** This method either returns the title of the current collection, or a placeholder string of 'No Collection'.
       * @return A <strong>String</strong> which represents what we wish to display for a collection title.
@@ -595 +582 @@
     public TreeModel getRecordSet() {
     if(collection_model == null && collection != null) {
-        // Check if the gimport directory exists, and if so use it.
-        File gimport_directory = new File(getCollectionImport());
-        if(gimport_directory.exists()) {
-        // Generate a new FileSystemModel based on the collection gimport directory.
-        collection_model = new FileSystemModel(new FileNode(gimport_directory, false));
-        }
-        else {
-        ///ystem.err.println("No gimport directory exists.");
-        // Otherwise default to the import directory. If it doesn't exist, there aint much more I can do.
-        // Generate a new FileSystemModel based on the collection import directory.
-        collection_model = new FileSystemModel(new FileNode(new File(getCollectionOldImport()), false));
-        }
+        // Use the import directory to generate a new FileSystemModel
+        collection_model = new FileSystemModel(new FileNode(new File(getCollectionImport()), false));
         // Ensure that the manager is a change listener for the tree.
         if(fm_tree_model_listener == null) {
@@ -661 +638 @@
     // If mirroring is enabled show the public and private caches.
     if(Gatherer.config.get("workflow.mirror", false)) {
-                // Add Public workspace
+        // Add Public workspace
         FileNode public_root = new FileNode(new File(Utility.CACHE_DIR), get("Tree.Public"));
         workspace_root.insert(public_root);
-                // Add Private workspace if a collection has been loaded.
+        // Add Private workspace if a collection has been loaded.
         if(ready()) {
         FileNode private_root = new FileNode(new File(getCollectionCache()), get("Tree.Private"));
@@ -973 +950 @@
     }
     }
+
+    /** Refresh the Greenstone Collections special mapping in the workspace tree to account for collections being added/removed
+     */
+    public void refreshGreenstoneCollections() {
+    FileNode root = (FileNode) workspace_model.getRoot();
+    FileNode greenstone_collections_node = null;
+    int root_child_count = root.getChildCount();
+    String greenstone_collections_str = get("Tree.World");
+    for(int i = 0; greenstone_collections_node == null && i < root_child_count; i++) {
+        TreeNode child = root.getChildAt(i);
+        if(child.toString().equals(greenstone_collections_str)) {
+        greenstone_collections_node = (FileNode) child;
+        }
+        child = null;
+    }
+    greenstone_collections_str = null;
+    root = null;
+    if(greenstone_collections_node != null) {
+        TreePath greenstone_collections_path = new TreePath(greenstone_collections_node.getPath());
+        workspace_model.refresh(greenstone_collections_path);
+        greenstone_collections_path = null;
+        greenstone_collections_node = null;
+    }
+    }
+
     /** Called to refresh the models upon which the trees are based.
      * @see org.greenstone.gatherer.collection.Collection

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

@@ -10 +10 @@
 import org.greenstone.gatherer.file.FileSystemModel;
 import org.greenstone.gatherer.util.ArrayTools;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 
@@ -242 +243 @@
         File cols[] = start.listFiles();
         ArrayTools.sort(cols);
-        // We add their import and gimport directories, but only if its not our current collection.
+        // We add their import directories, but only if its not our current collection, nor the model collection.
         for(int i = 0; cols != null && i < cols.length; i++) {
-            if(!cols[i].getName().equals("modelcol") && (!Gatherer.c_man.ready() || !Gatherer.c_man.getCollectionDirectory().equals(cols[i].getAbsolutePath()))) {
+            if(!cols[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME) && (!Gatherer.c_man.ready() || !Gatherer.c_man.getCollectionDirectory().equals(cols[i].getAbsolutePath()))) {
             File dirs[] = cols[i].listFiles();
             ArrayTools.sort(dirs);
-            File import_dir = new File(cols[i], "gimport");
-            if(!import_dir.exists()) {
-                import_dir = new File(cols[i], "import");
-            }
+            File import_dir = new File(cols[i], StaticStrings.IMPORT_FOLDER);
             if(import_dir.exists()) {
                 FileNode collection_root = new FileNode(import_dir, cols[i].getName(), true);
@@ -290 +288 @@
             }
             // Finally remove any files whose canonical path do not match their absolute one (ie symbolic links). We only do this test under linux, because under windows there is no such thing as a symbolic link, and instead we suffer difficulties with the 16bit truncated file paths not being the same as the canonical ones (i.e Program Files => Progra~1).
+            /* This test to eliminate infinite recursions causes more problems than it solves
             if(!Utility.isWindows()) {
             for(int k = files.length; k != 0; k--) {
@@ -305 +304 @@
             }
             }
+            */
             // Sort the remaining files.
             tools.sort(files, true);

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

@@ -100 +100 @@
     // If no path is set, take the path to the root node (ie update the whole tree)
     if(path == null) {
-                ///ystem.err.println("Refresh entire tree.");
+        System.err.println("Refresh entire tree.");
         path = new TreePath(((FileNode)root).getPath());
     }
     else {
-                ///ystem.err.println("Refresh: " + path.getLastPathComponent());
+        System.err.println("Refresh: " + path.getLastPathComponent());
     }
     // Only a valid action if this model is currently being displayed in a tree.
     if(tree != null) {
-                // Retrieve the error node.
+        // Retrieve the error node.
         FileNode node = (FileNode) path.getLastPathComponent();
-                // If this error node is a dummy node (ie has no associated file) we can't unmap it, so we iterate through its children refreshing each in turn.
-        if(node.getFile() == null) {
+        // If this error node is a dummy node (ie has no associated file) we can't unmap it, so we iterate through its children refreshing each in turn. The exception being Greenstone Collections, as it is a dummy node but we can map/unmap it
+        if(node.getFile() == null && !node.toString().equals(Gatherer.dictionary.get("Tree.World"))) {
         for(int i = 0; i < node.getChildCount(); i++) {
             FileNode child = (FileNode) node.getChildAt(i);
@@ -118 +118 @@
         }
         }
-                // Otherwise we refresh this node.
+        // Otherwise we refresh this node.
         else {
         // Record all of the expanded paths under this node. How come getExpandedDescendants returns more results each time.
@@ -181 +181 @@
     }
     else {
-                ///ystem.err.println("No Tree!");
+        ///ystem.err.println("No Tree!");
     }
     }

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

@@ -54 +54 @@
 import org.greenstone.gatherer.shell.GShellListener;
 import org.greenstone.gatherer.shell.GShellProgressMonitor;
+import org.greenstone.gatherer.util.AppendLineOnlyFileDocument;
 /** 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>
@@ -88 +89 @@
     /** The options pane generates all the various option sheet configuations. */
     public OptionsPane options_pane = null;
+    private AppendLineOnlyFileDocument document;
     /** A card layout is used to store the separate configuration and progress panes. */
     private CardLayout card_layout = null;
@@ -121 +123 @@
     private JScrollPane scroll_pane;
     /** The message log for the entire session. */
-    private JTextArea message_log;
+    private JTextArea log_textarea;
     /** A tree used to display the currently available option views. */
     private OptionTree tree = null;
@@ -148 +150 @@
     public CreatePane() {
     Collection collection = Gatherer.c_man.getCollection();
-    message_log = new JTextArea();
+    log_textarea = new JTextArea();
 
     // Create components
@@ -210 +212 @@
     ///ystem.err.println("Collection changed... ");
     if(Gatherer.c_man != null && ready) {
-        ///ystem.out.println("create coll changed");
-        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) {
-        message_log.setText(null);
-        this.options_pane = new OptionsPane(message_log, current_collection.build_options);
+        this.options_pane = new OptionsPane(current_collection.build_options);
         previous_collection = current_collection;
         }
@@ -280 +276 @@
     progress_pane.setLayout(new BorderLayout());
     progress_pane.add(bar_area, BorderLayout.NORTH);
-    progress_pane.add(new JScrollPane(message_log), BorderLayout.CENTER);
+    progress_pane.add(new JScrollPane(log_textarea), BorderLayout.CENTER);
 
     // Main pane
@@ -340 +336 @@
      */
     public synchronized void message(GShellEvent event) {
-    final String text = event.getMessage();
-    ///ystem.err.println("Recieved message: " + event.getMessage());
-    SwingUtilities.invokeLater(new Runnable() {
-        public void run() {
-            message_log.append(text);
-        }
-        });
-    }
+    document.appendLine(event.getMessage());
+    }
+
     /** All implementation of GShellListener must include this method so the listener can be informed when a GShell begins its task. Implementation side-effect, not actually used.
       * @param event A <strong>GShellEvent</strong> that contains details of the initial state of the <strong>GShell</strong> before task comencement.
@@ -364 +355 @@
         int status = event.getStatus();
         if (status == GShell.OK) {
-        options_pane.addNewLog(OptionsPane.SUCCESSFUL);
+        document.setSpecialCharacter(OptionsPane.SUCCESSFUL);
         } else {
-        options_pane.addNewLog(OptionsPane.UNSUCCESSFUL);
-        }
+        document.setSpecialCharacter(OptionsPane.UNSUCCESSFUL);
+        }
+        options_pane.resetFileEntry();
         card_layout.show(main_pane, CONTROL);
     }
@@ -407 +399 @@
         build_button.setEnabled(false);
         cancel_button.setEnabled(true);
-        // clear the log list and message_log
-        options_pane.resetLogList();
+        // Create a new log document and assign it to the two textareas
+        document = options_pane.createNewLogDocument();
+        log_textarea.setDocument(document);
+        options_pane.log_textarea.setDocument(document);
         // Change the view.
         processing = true;
@@ -438 +432 @@
         cancel_button.setEnabled(false);
         processing = false;
-        options_pane.addNewLog(OptionsPane.CANCELLED);
+        document.setSpecialCharacter(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.
+        // Set removeold automatically.
         Gatherer.c_man.getCollection().build_options.setImportValue("removeold", true, null);
-        // Remove the collection lock.
+        // Remove the collection lock.
         //Gatherer.g_man.lockCollection(false, false);
     }

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

@@ -21 +21 @@
     private JComboBox base_collection;
     private JDialog self;
+    private JRadioButton hide_extracted_metadata_radio_button;
+    private JRadioButton view_extracted_metadata_radio_button;
     private JTextArea description;
     private JTextField address;
@@ -59 +61 @@
         String collection_name = collect_cfg.getName();
         // Even if there is no metadata directory we add it if its one of the 'big five + 1' that we know how to handle.
-        if(metadata_directory.exists() || collection_name.equals(Utility.COLLECTION_DLS) || collection_name.equals(Utility.COLLECTION_DEMO)) { /** @todo - the other big five */
+        if(metadata_directory.exists() || collection_name.equals(Utility.COLLECTION_DLS) || collection_name.equals(Utility.COLLECTION_DEMO)) {
             // Add to model.
             Item item = new Item(possible_collections[i], collection_name);
@@ -123 +125 @@
     JButton base_collection_browse = new JButton(get("General.Browse"));
 
+    JPanel extracted_metadata_pane = new JPanel();
+    ButtonGroup extracted_metadata_button_group = new ButtonGroup();
+    view_extracted_metadata_radio_button = new JRadioButton(get("View_Extracted_Metadata"));
+    view_extracted_metadata_radio_button.setOpaque(false);
+    extracted_metadata_button_group.add(view_extracted_metadata_radio_button);
+    hide_extracted_metadata_radio_button = new JRadioButton(get("Hide_Extracted_Metadata"));
+    hide_extracted_metadata_radio_button.setOpaque(false);
+    extracted_metadata_button_group.add(hide_extracted_metadata_radio_button);
+    view_extracted_metadata_radio_button.setSelected(true);
+
     JPanel button_pane = new JPanel();
     button_pane.setOpaque(false);
@@ -182 +194 @@
     description_pane.add(new JScrollPane(description), BorderLayout.CENTER);
 
+    extracted_metadata_pane.setLayout(new GridLayout(1,2,5,0));
+    extracted_metadata_pane.add(view_extracted_metadata_radio_button);
+    extracted_metadata_pane.add(hide_extracted_metadata_radio_button);
+
+    base_collection_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
     base_collection_pane.setLayout(new BorderLayout());
     base_collection_pane.add(base_collection_label, BorderLayout.NORTH);
@@ -192 +209 @@
           
     bottom_pane.setLayout(new BorderLayout());
+    bottom_pane.add(extracted_metadata_pane, BorderLayout.NORTH);
     bottom_pane.add(base_collection_pane, BorderLayout.CENTER);
     bottom_pane.add(button_pane, BorderLayout.SOUTH);
@@ -233 +251 @@
     public String getTitle() {
     return title_final;
+    }
+
+    public boolean viewExtractedMetadata() {
+    return view_extracted_metadata_radio_button.isSelected();
     }
 
@@ -302 +324 @@
     implements ActionListener {
     public void actionPerformed(ActionEvent event) {
-                // Validate.
+        // Validate.
         title_final = title.getText();
         if(title_final.length() == 0) {
@@ -362 +384 @@
         }
         description_final = Utility.encodeGreenstone(description_final);
-                // If we got this far there are no errors.
+        // If we got this far there are no errors.
         Item item_final = (Item) base_collection.getSelectedItem();
         base_final = item_final.getFile();

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

@@ -216 +216 @@
                 // Retrieve the files usually returned by the platform specific file system view.
         File[] files = default_system_view.getFiles(dir, useFileHiding);
-                // Determine if the current dir actually contains a valid greenstone collection. To do this we check for the presence of the file <dir>/etc/collect.cfg and a directory named import or gimport.
+                // Determine if the current dir actually contains a valid greenstone collection. To do this we check for the presence of the file <dir>/etc/collect.cfg and a directory named import.
         File collect_cfg_file = new File(dir, Utility.CONFIG_DIR);
-        File import_dir_file = new File(dir, Utility.OLD_IMPORT_DIR);
-        File gimport_dir_file = new File(dir, Utility.IMPORT_DIR);
-        if(collect_cfg_file.exists() && (gimport_dir_file.exists() || import_dir_file.exists())) {
+        File import_dir_file = new File(dir, Utility.IMPORT_DIR);
+        if(collect_cfg_file.exists() && import_dir_file.exists()) {
         // Create a new dummy collection file.
         String name = dir.getName();
@@ -235 +234 @@
         name = null;
         }
-        gimport_dir_file = null;
         import_dir_file = null;
         collect_cfg_file = null;

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

@@ -42 +42 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import javax.swing.text.*;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.Argument;
@@ -49 +50 @@
 import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.msm.ElementWrapper;
+import org.greenstone.gatherer.util.AppendLineOnlyFileDocument;
+import org.greenstone.gatherer.util.AppendLineOnlyFileDocumentOwner;
 import org.greenstone.gatherer.util.Utility;
 //import org.w3c.dom.*;
@@ -55 +58 @@
  * @version 2.2
  */
-final public class OptionsPane
-    extends JPanel {
+public class OptionsPane
+    extends JPanel 
+    implements AppendLineOnlyFileDocumentOwner {
+
+    static final public char SUCCESSFUL = 's';
+    static final public char UNSUCCESSFUL = 'u';
+    static final public char CANCELLED = 'c';
+    static final public char UNKNOWN = 'x';
+
+    /** All process messages are written to this log text area. */
+    public JTextArea log_textarea = null;
+
     /** The <strong>BuildOptions</strong> data object contains all the option settings we wish to persist between Gatherer sessions (and thus is stored in <strong>Collection</strong>). */
     private BuildOptions build_options = null;
+
+    private FileEntry file_entry = null;
     /** the log pane - we only create it once now, not each time */
     private JPanel log_pane = null;
     /** the list of previous log messages */
     private JList log_list = null;
-    /** whether that currently showing log is changed or not */
-    private boolean is_log_changed = false;
-    /** the list entry that is currently displayed */
-    private FileEntry displayed_log = null;
-    /** a listener for changes in the log text */
-    private LogChangeListener log_change_listener = null;
-    /** All process messages are written to this log text area. */
-    private JTextArea log_display = null;
-
-    static final public char SUCCESSFUL = 's';
-    static final public char UNSUCCESSFUL = 'u';
-    static final public char CANCELLED = 'c';
+    private Vector writing_documents;
 
     static private int BUILD = 0;
@@ -88 +92 @@
 
      /** 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 message_log, BuildOptions build_options) {
-    this.log_display = new JTextArea(message_log.getDocument());
+    public OptionsPane(BuildOptions build_options) {
     this.build_options = build_options;
-    this.log_change_listener = new LogChangeListener();
-    //this.target_pane = target_pane;
-    }
-
-    /** 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();
-    StringBuffer name = new StringBuffer();
-    name.append("build_log.");
-    name.append(time);
-    name.append(success);
-    name.append(".txt");
-    File f = new File(Gatherer.c_man.getCollectionLog()+name.toString());
-    // just in case there is no log directory
-    File parent_file = f.getParentFile();
-    parent_file.mkdirs();
-
-    // save the log text to the file
-    saveLogFile(f);
-    is_log_changed=false;
-    log_display.getDocument().addDocumentListener(log_change_listener);
-
-    // create the file entry and add it to the list at pos 0 - it will always be the newest one created
-    FileEntry fe = new FileEntry(f);
-    ((DefaultListModel)log_list.getModel()).add(0, fe);
-    log_list.setSelectedIndex(0);
-    displayed_log = fe;
-
+    this.writing_documents = new Vector();
+
+    // Have to do this here, not in display, as the message log view may not have been displayed yet.
+    log_textarea = new JTextArea();
+    log_textarea.setEditable(false);
     }
 
@@ -134 +109 @@
     pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     int build_argument_count = build_options.getBuildArgumentCount();
-    pane.setLayout(new GridLayout(build_argument_count, 1, 0, 0));
-    int total_height = PANE_SIZE.height;
+    pane.setPreferredSize(new Dimension(ROW_SIZE.width, ROW_SIZE.height * build_argument_count));
     for(int i = 0; i < build_argument_count; i++) {
         // Retrieve the argument so we know how to format the control.
@@ -143 +117 @@
         String value = build_options.getBuildValue(argument.getName());
         ArgumentControl argument_control = new ArgumentControl(BUILD, argument, enabled, value);
-        total_height = total_height - argument_control.getPreferredSize().height;
         pane.add(argument_control);
-    }
-    if(total_height > 0) {
-        JPanel filler = new JPanel();
-        filler.setPreferredSize(new Dimension(100, total_height));
-        filler.setSize(filler.getPreferredSize());
-        pane.add(filler);
     }
     return pane;
@@ -162 +129 @@
     pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
     int import_argument_count = build_options.getImportArgumentCount();
-    pane.setLayout(new GridLayout(import_argument_count, 1, 0, 0));
-    int total_height = PANE_SIZE.height;
+    pane.setPreferredSize(new Dimension(ROW_SIZE.width, ROW_SIZE.height * import_argument_count));
     for(int i = 0; i < import_argument_count; i++) {
         // Retrieve the argument so we know how to format the control.
@@ -171 +137 @@
         String value = build_options.getImportValue(argument.getName());
         ArgumentControl argument_control = new ArgumentControl(IMPORT, argument, enabled, value);
-        total_height = total_height - argument_control.getPreferredSize().height;
         pane.add(argument_control);
-    }
-    if(total_height > 0) {
-        JPanel filler = new JPanel();
-        filler.setPreferredSize(new Dimension(100, total_height));
-        filler.setSize(filler.getPreferredSize());
-        pane.add(filler);
     }
     return pane;
@@ -195 +154 @@
         File children[] = log_directory.listFiles();
         for(int i = 0; children != null && i < children.length; i++) {
-        if(children[i].getName().startsWith("build_log")&&children[i].getName().endsWith(".txt") ) {
-            FileEntry entry = new FileEntry(children[i]);
+        if(children[i].getName().startsWith("build_log") && children[i].getName().endsWith(".txt") ) {
+            FileEntry entry = new FileEntry(children[i].getName(), children[i].getAbsolutePath());
             // We are about to insert it. But where.
             boolean found = false;
-            for(int j = 0; j < contents.size(); j++) {
+            for(int j = 0; !found && j < contents.size(); j++) {
             FileEntry sibling = (FileEntry) contents.getElementAt(j);
             int order = entry.compareTo(sibling);
@@ -205 +164 @@
                 contents.insertElementAt(entry, j);
                 found = true;
-                break;
             }
             }
@@ -217 +175 @@
         log_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         log_list.setLayoutOrientation(JList.VERTICAL);
+        log_list.setPreferredSize(new Dimension(600, 100));
         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) {
-        int index = contents.indexOf(displayed_log);
-        if (index != -1) {
-            log_list.setSelectedIndex(index);
-        }
-
-        }
-
-        log_pane.add(new JScrollPane(log_display), BorderLayout.CENTER);
         JLabel log_history_label = new JLabel(get("LogHistory"));
         JPanel log_history_pane = new JPanel();
-
+        log_history_pane.setPreferredSize(new Dimension(600, 100));
         log_history_pane.setLayout(new BorderLayout());
         log_history_pane.add(log_history_label, BorderLayout.NORTH);
-        log_history_pane.add(list_scroller, BorderLayout.SOUTH);
+        log_history_pane.add(new JScrollPane(log_list), BorderLayout.CENTER);
         
+        log_pane.add(new JScrollPane(log_textarea), BorderLayout.CENTER);
         log_pane.add(log_history_pane, BorderLayout.SOUTH);
     }
     return log_pane;
+    }
+
+    public AppendLineOnlyFileDocument createNewLogDocument() {
+    long time = System.currentTimeMillis();
+    StringBuffer name = new StringBuffer();
+    name.append("build_log.");
+    name.append(time);
+    name.append(".txt");
+    // just in case there is no log directory
+    File file = new File(Gatherer.c_man.getCollectionLog() + name.toString());
+    File parent_file = file.getParentFile();
+    parent_file.mkdirs();
+    parent_file = null;
+    // create the file entry and add it to the list at pos 0 - it will always be the newest one created
+    file_entry = new FileEntry(name.toString(), file.getAbsolutePath());
+    ((DefaultListModel)log_list.getModel()).add(0, file_entry);
+    log_list.setSelectedIndex(0);
+    // Finally retrieve and return the document associated with this file entry
+    return file_entry.getDocument();
     }
 
@@ -265 +232 @@
     }
     /** Attempts to discover the latest document count.
-      * @return An <strong>int</strong> detailing the number of documents in this collection.
-     */
+     * @return An <strong>int</strong> detailing the number of documents in this collection.
+     */
     public int getDocumentCount() {
     if(Gatherer.c_man.ready()) {
@@ -277 +244 @@
     }
 
-    /** 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
-     */
-    public void loadSelectedLog(FileEntry fe) {
-    ///ystem.out.println("load selected log");
-    if(displayed_log != null) {
-        if (is_log_changed) {
-        saveLogFile(displayed_log.getFile());
-        } else {
-        log_display.getDocument().removeDocumentListener(log_change_listener);
-        }
-    }
-
-    displayed_log = fe;
-    if (fe != null) {
-        log_display.setText(fe.getFileText());
-    } else {
-        log_display.setText("");
-    }
-    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
-     * add a listener back in */
-    public void resetLogList() {
-    ///ystem.out.println("reset log");
-    if (is_log_changed) {
-        saveLogFile(displayed_log.getFile());
-    } else {
-        log_display.getDocument().removeDocumentListener(log_change_listener);
-    }
-    log_display.setText("");
-    displayed_log = null;
-    if (log_list != null) {
-        log_list.clearSelection();
-    }
-    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
-        String log_text = log_display.getText();
-        // set teh return delims to true, then swap them for newLine() (platform dependent) - having return delims set to false seemed to not get empty strings so that empty lines were not preserved.
-        StringTokenizer t = new StringTokenizer(log_text, "\n", true);
-        while (t.hasMoreTokens()) {
-        String token = t.nextToken();
-        if (token.equals("\n")) {
-            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();
-    }
-
-
-    }
-
+    /** Called by our magic log documents after they have finished writing themselves to file, whereapon it is no longer necessary to hold a reference to them. */
+    public void remove(AppendLineOnlyFileDocument document) {
+    writing_documents.remove(document);
+    }
+
+    public void resetFileEntry() {
+    if(file_entry != null) {
+        file_entry.reset();
+    }
+    }
 
     /** Given a panel containing ArgumentControls, update the values associated with them. */
@@ -591 +493 @@
     }
 
-    /** holds a File which has a particular naming convention
-     * build_log.date.txt
-     * also keeps a Date corresponding to the date in its name*/
+    /** Holds a File which has a particular naming convention 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;
-    private String display=null;
-    public FileEntry(File f) {
-        this.file=f;
-        this.date = getDateFromFileName();
-        this.display = createDisplayText();
-
+    private Date date;
+    private long last_modified;
+    private String display;
+    private String filename;
+    private String filepath;
+
+    public FileEntry(String filename, String filepath) {
+        this.date = null;
+        this.display = null;
+        this.filename = filename;
+        this.filepath = filepath;
+        this.last_modified = 0L;
     }
 
     /** returns 0 if the dates are the same, -ve number if the current FileEntry is earlier than the fe FileEntry ...*/
-    public int compareTo(FileEntry fe) {
-        Date d = fe.getDate();
-        return date.compareTo(d);
+    public int compareTo(FileEntry file_entry) {
+        Date our_date = getDate();
+        Date other_date = file_entry.getDate();
+        return our_date.compareTo(other_date);
     }
 
     public Date getDate() {
-        return this.date;
-    }
-    public File getFile() {
-        return this.file;
-    }
-    /** returns the contents of the file */
-    public String getFileText() {
-        if (!this.file.exists()) {
-        return "";
-        }
-        StringBuffer contents = new StringBuffer();
-        try {
-        BufferedReader in = new BufferedReader(new FileReader(this.file));
-        String line;
-
-        while ((line = in.readLine()) != null) {
-            contents.append(line);
-            contents.append("\n");
-        }
-        } catch (FileNotFoundException fnfe) {
-        Gatherer.println("Error: log file not found: "+ this.file.toString());
-        return "";
-        } catch (IOException ioe) {
-        Gatherer.println("Error: exception occurred when trying to read in file "+this.file.toString()+", "+ioe.getMessage());
-
-        }
-
-        return contents.toString();
-    }
+        if(date == null) {
+        // Need to exclude first '.'
+        int first_index = filename.indexOf(".") + 1;
+        // Need to exclude the last '.'
+        int last_index = filename.lastIndexOf(".");
+        if(first_index > 0 && last_index > 0 && first_index < last_index) {
+            String date_string = filename.substring(first_index, last_index);
+            date = new Date(Long.parseLong(date_string));
+        }
+        else {
+            date = new Date(); // Current date
+        }
+        }
+        return date;
+    }
+
+    public AppendLineOnlyFileDocument getDocument() {
+        return new AppendLineOnlyFileDocument(filepath);
+    }
+
+    public void reset() {
+        display = null;
+    }
+
     /** we only want the date out of the file name, not the whole path */
     public String toString() {
-        return this.display;
-    }
-    /** creates the display text for the list */
-    private String createDisplayText() {
-        StringBuffer d = new StringBuffer();
-        d.append(date.toString());
-        //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();
-    }
-    /** extracts the date from the file name, which is of the form 'build_log.'<long>[scu]'.txt' */
-    private Date getDateFromFileName() {
-        String name = this.file.getName();
-        // Need to exclude first '.'
-        int first_index = name.indexOf(".") + 1;
-        // Need to exclude state letter before last '.'
-        int last_index = name.lastIndexOf(".") - 1;
-        if(first_index > 0 && last_index > 0 && first_index < last_index) {
-        String date_string = name.substring(first_index, last_index);
-        return new Date(Long.parseLong(date_string));
-        }
-        else {
-        return new Date(); // Current date
-        }
-    }
-
-
-    }
-
-    /** 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
-     * 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 {
-
-    public void changedUpdate(DocumentEvent e) {
-        ///ystem.out.println("changed update");
-        registerChange();
-    }
-    public void insertUpdate(DocumentEvent e) {
-        ///ystem.out.println("insert update");
-        registerChange();
-    }
-    public void removeUpdate(DocumentEvent e) {
-        ///ystem.out.println("remove update");
-        registerChange();
-    }
-
-    private void registerChange() {
-        ///ystem.err.println("a change in the doc occurred, removing the listener");
-        is_log_changed = true;
-        log_display.getDocument().removeDocumentListener(this);
-    }
-    }
-
-    /** a ListSelectionListener that triggers the load of a newly selected
-    log */
+        File file = new File(filename);
+        if(display == null) {
+        last_modified = file.lastModified();
+        StringBuffer d = new StringBuffer();
+        Date date = getDate();
+        d.append(date.toString());
+        char success = UNKNOWN;
+        try {
+            FileInputStream in = new FileInputStream(new File(filepath));
+            success = (char) in.read();
+            in.close();
+            in = null;
+        }
+        catch(Exception error) {
+            error.printStackTrace();
+        }
+        switch (success) {
+        case SUCCESSFUL:
+            d.append(get("Successful"));
+            break;
+        case UNSUCCESSFUL:
+            d.append(get("Unsuccessful"));
+            break;
+        case CANCELLED:
+            d.append(get("Cancelled"));
+            break;
+        default:
+            d.append(get("Unknown"));
+        }
+        display = d.toString();
+        }
+        return display;
+    }
+    }
+
+    /** a ListSelectionListener that triggers the load of a newly selected log */
     private class LogListListener implements ListSelectionListener {
 
@@ -721 +585 @@
         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();
-        loadSelectedLog(fe);
+        file_entry = (FileEntry) source.getSelectedValue();
+        // First we determine if the old log has been completely written to file
+        Document document = log_textarea.getDocument();
+        if(document instanceof AppendLineOnlyFileDocument) {
+            AppendLineOnlyFileDocument append_line_only_file_document = (AppendLineOnlyFileDocument) document;
+            if(append_line_only_file_document.isStillWriting()) {
+                writing_documents.add(append_line_only_file_document); // We have to maintain a reference until they are all done.
+                append_line_only_file_document.setOwner(OptionsPane.this);
+                append_line_only_file_document.setExit();
+            }
+        }
+        // Load the new log
+        log_textarea.setDocument(file_entry.getDocument());
         }
     }

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

@@ -3 +3 @@
 import java.awt.*;
 import java.awt.event.*;
+import java.io.*;
 import java.net.*;
 import java.util.*;
 import javax.swing.*;
+import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.checklist.CheckList;
@@ -13 +16 @@
 import org.greenstone.gatherer.gui.NumberField;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XORToggleButtonGroup;
@@ -33 +37 @@
     private JCheckBox workflow_export;
     private JCheckBox workflow_preview;
+    private JComboBox language_combobox;
+    private JLabel extracted_metadata_label;
+    private JLabel file_size_label;
+    private JLabel language_label;
+    private JLabel library_path_label;
+    private JLabel predefined_label;
+    private JLabel proxy_host_label;
+    private JLabel proxy_port_label;
+    private JLabel title_label;
+    private JRadioButton hide_extracted_metadata_radio_button;
+    private JRadioButton hide_file_size_radio_button;
+    private JRadioButton show_file_size_radio_button;
+    private JRadioButton view_extracted_metadata_radio_button;
     private JTabbedPane tab_pane;
     private JTextField library_path_field;
@@ -39 +56 @@
     private Preferences self;
 
-    static final Dimension LABEL_SIZE = new Dimension(100, 25);
-    static final Dimension ROW_SIZE = new Dimension(380, 25);
-    static final Dimension SIZE = new Dimension(400, 345);
+    static final Dimension LABEL_SIZE = new Dimension(150, 25);
+    static final Dimension ROW_SIZE = new Dimension(450, 25);
+    static final Dimension SIZE = new Dimension(450, 345);
     static final String TRUE = "true";
 
@@ -54 +71 @@
     JPanel content_pane = (JPanel) getContentPane();
     tab_pane = new JTabbedPane();
+    tab_pane.add("Preferences.General", createGeneralPreferences());
     tab_pane.add("Preferences.Workflow", createWorkflowPreferences());
     tab_pane.add("Preferences.Connection", createConnectionPreferences());
@@ -101 +119 @@
     JPanel library_path_pane = new JPanel();
     library_path_pane.setPreferredSize(ROW_SIZE);
-    JLabel library_path_label = new JLabel("Preferences.Connection.Library_Path");
+    library_path_label = new JLabel("Preferences.Connection.Library_Path");
     library_path_label.setPreferredSize(LABEL_SIZE);
     library_path_field = new JTextField(Gatherer.config.getString("general.exec_address", true));
@@ -113 +131 @@
     JPanel proxy_host_pane = new JPanel();
     proxy_host_pane.setPreferredSize(ROW_SIZE);
-    JLabel proxy_host_label = new JLabel("Preferences.Connection.Proxy_Host");
+    proxy_host_label = new JLabel("Preferences.Connection.Proxy_Host");
     proxy_host_label.setPreferredSize(LABEL_SIZE);
     proxy_host_field = new JTextField(Gatherer.config.getString("general.proxy_host", true));
@@ -119 +137 @@
     JPanel proxy_port_pane = new JPanel();
     proxy_port_pane.setPreferredSize(ROW_SIZE);
-    JLabel proxy_port_label = new JLabel("Preferences.Connection.Proxy_Port");
+    proxy_port_label = new JLabel("Preferences.Connection.Proxy_Port");
     proxy_port_label.setPreferredSize(LABEL_SIZE);
     proxy_port_field = new NumberField(Gatherer.config.getString("general.proxy_port", true));
@@ -152 +170 @@
     }
 
+    private JPanel createGeneralPreferences() {
+    JPanel general_pane = new JPanel();
+
+    // Build the model of available languages
+    ArrayList dictionary_model = new ArrayList();
+
+    Locale french = new Locale("fr","FR");
+    System.err.println("French locale: " + french);
+
+
+    dictionary_model.add(new DictionaryEntry(Locale.ENGLISH));
+    File classes_folder = new File(Utility.BASE_DIR + StaticStrings.CLASSES_FOLDER);
+    File[] possible_dictionaries = classes_folder.listFiles();
+    for(int i = 0; i < possible_dictionaries.length; i++) {
+        String filename = possible_dictionaries[i].getName();
+        if(filename.endsWith(StaticStrings.PROPERTIES_FILE_EXTENSION) && filename.indexOf(StaticStrings.UNDERSCORE_CHARACTER) != -1) {
+        StringTokenizer tokenizer = new StringTokenizer(filename.substring(filename.indexOf(StaticStrings.UNDERSCORE_CHARACTER) + 1, filename.indexOf(StaticStrings.STOP_CHARACTER)), StaticStrings.UNDERSCORE_CHARACTER);
+        Locale locale = null;
+        switch(tokenizer.countTokens()) {
+        case 1:
+            locale = new Locale(tokenizer.nextToken().toLowerCase());
+            break;
+        case 2:
+            locale = new Locale(tokenizer.nextToken().toLowerCase(), tokenizer.nextToken().toUpperCase());
+            break;
+        }
+        tokenizer = null;
+        // Open the file and read the first line
+        String description = null;
+        try {
+            BufferedReader br = new BufferedReader(new FileReader(possible_dictionaries[i]));
+            String first_line = br.readLine();
+            br.close();
+            description = first_line.substring(first_line.indexOf(StaticStrings.COLON_CHARACTER) + 1);
+        }
+        catch(Exception error) {
+        }
+        DictionaryEntry entry = new DictionaryEntry(description, locale);
+        description = null;
+        locale = null;
+        if(!dictionary_model.contains(entry)) {
+            dictionary_model.add(entry);
+        }
+        entry = null;
+        }
+        filename = null;
+    }
+    possible_dictionaries = null;
+    classes_folder = null;
+
+    // Extracted metadata
+    JPanel extracted_metadata_pane = new JPanel();
+    extracted_metadata_label = new JLabel("NewCollectionPrompt.Extracted_Metadata");
+    ButtonGroup extracted_metadata_button_group = new ButtonGroup();
+    view_extracted_metadata_radio_button = new JRadioButton("NewCollectionPrompt.View_Extracted_Metadata");
+    view_extracted_metadata_radio_button.setEnabled(Gatherer.c_man.ready());
+    view_extracted_metadata_radio_button.setOpaque(false);
+    extracted_metadata_button_group.add(view_extracted_metadata_radio_button);
+    hide_extracted_metadata_radio_button = new JRadioButton("NewCollectionPrompt.Hide_Extracted_Metadata");
+    hide_extracted_metadata_radio_button.setEnabled(Gatherer.c_man.ready());
+    hide_extracted_metadata_radio_button.setOpaque(false);
+    extracted_metadata_button_group.add(hide_extracted_metadata_radio_button);
+    if(Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
+        view_extracted_metadata_radio_button.setSelected(true);
+    }
+    else {
+        hide_extracted_metadata_radio_button.setSelected(true);
+    }
+
+    // Show file sizes
+    JPanel file_size_pane = new JPanel();
+    file_size_label = new JLabel("Prefereces.General.File_Size");
+    ButtonGroup file_size_button_group = new ButtonGroup();
+    show_file_size_radio_button = new JRadioButton("Prefereces.General.Show_File_Size");
+    show_file_size_radio_button.setEnabled(Gatherer.c_man.ready());
+    show_file_size_radio_button.setOpaque(false);
+        file_size_button_group.add(show_file_size_radio_button);
+    hide_file_size_radio_button = new JRadioButton("Prefereces.General.Hide_File_Size");
+    hide_file_size_radio_button.setEnabled(Gatherer.c_man.ready());
+    hide_file_size_radio_button.setOpaque(false);
+    file_size_button_group.add(hide_file_size_radio_button);
+    if(Gatherer.config.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC)) {
+        show_file_size_radio_button.setSelected(true);
+    }
+    else {
+        hide_file_size_radio_button.setSelected(true);
+    }
+
+    // Language
+    JPanel language_pane = new JPanel();
+    language_label = new JLabel("Preferences.General.Interface_Language");
+    language_label.setPreferredSize(LABEL_SIZE);
+    language_combobox = new JComboBox(dictionary_model.toArray());
+
+    // Connect
+    Gatherer.dictionary.register(file_size_label, null, false);
+    Gatherer.dictionary.register(show_file_size_radio_button, null, false);
+    Gatherer.dictionary.register(hide_file_size_radio_button, null, false);
+    Gatherer.dictionary.register(view_extracted_metadata_radio_button, null, false);
+    Gatherer.dictionary.register(hide_extracted_metadata_radio_button, null, false);
+    Gatherer.dictionary.register(language_label, null, false);
+    language_combobox.addActionListener(new LanguageComboboxListener());
+    // Layout
+
+    file_size_pane.setLayout(new GridLayout(1,3,5,0));
+        file_size_pane.add(show_file_size_radio_button);
+    file_size_pane.add(hide_file_size_radio_button);
+
+    extracted_metadata_pane.setLayout(new GridLayout(1,3,5,0));
+    extracted_metadata_pane.add(view_extracted_metadata_radio_button);
+    extracted_metadata_pane.add(hide_extracted_metadata_radio_button);
+
+    language_pane.setLayout(new BorderLayout());
+    language_pane.add(language_label, BorderLayout.WEST);
+    language_pane.add(language_combobox, BorderLayout.CENTER);
+
+    general_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
+    general_pane.setLayout(new GridLayout(5,1,0,5));
+    general_pane.add(extracted_metadata_pane);
+    general_pane.add(file_size_pane);
+    general_pane.add(language_pane);
+
+    return general_pane;
+    }
+
     /** The warning preferences are controlled through a checklist. */
     private JPanel createWarningPreferences() {
     // Retrieve all of the warning preferences settings.
     HashMap warning_preferences = Gatherer.config.getAll("warning\\..*", true);
-    warning_preferences_check_list = new CheckList();
+    warning_preferences_check_list = new CheckList(false);
     for(Iterator keys = warning_preferences.keySet().iterator(); keys.hasNext(); ) {
         String property = (String) keys.next();
@@ -189 +332 @@
     JPanel workflow_preferences_pane = new JPanel();
     JPanel checklist_pane = new JPanel();
-    JLabel title_label = new JLabel("Preferences.Workflow.Title");
+    title_label = new JLabel("Preferences.Workflow.Title");
     title_label.setPreferredSize(ROW_SIZE);
     XORToggleButtonGroup checkbox_group = new XORToggleButtonGroup();
@@ -209 +352 @@
     workflow_preview.setPreferredSize(ROW_SIZE);
     JPanel predefined_pane = new JPanel();
-    JLabel predefined_label = new JLabel("Preferences.Workflow.Predefined.Label");
+    predefined_label = new JLabel("Preferences.Workflow.Predefined.Label");
     predefined_label.setPreferredSize(new Dimension(150,25));
     JComboBox predefined_combobox = new JComboBox(predefined);
@@ -272 +415 @@
     public void dispose() {
     // Deregister dictionary components
+
+    // Connection
+    Gatherer.dictionary.deregister(library_path_label);
+    Gatherer.dictionary.deregister(use_proxy_checkbox);
+    Gatherer.dictionary.deregister(proxy_host_label);
+    Gatherer.dictionary.deregister(proxy_port_label);
+
+    // General
+    Gatherer.dictionary.deregister(file_size_label);
+    Gatherer.dictionary.deregister(show_file_size_radio_button);
+    Gatherer.dictionary.deregister(hide_file_size_radio_button);
+    Gatherer.dictionary.deregister(extracted_metadata_label);
+    Gatherer.dictionary.deregister(view_extracted_metadata_radio_button);
+    Gatherer.dictionary.deregister(hide_extracted_metadata_radio_button);
+    Gatherer.dictionary.deregister(language_label);
+
+    // Workflow
+    Gatherer.dictionary.deregister(title_label);
+    Gatherer.dictionary.deregister(workflow_browse);
+    Gatherer.dictionary.deregister(workflow_mirror);
+    Gatherer.dictionary.deregister(workflow_gather);
+    Gatherer.dictionary.deregister(workflow_enrich);
+    Gatherer.dictionary.deregister(workflow_design);
+    Gatherer.dictionary.deregister(workflow_export);
+    Gatherer.dictionary.deregister(workflow_create);
+    Gatherer.dictionary.deregister(workflow_preview);
+    Gatherer.dictionary.deregister(predefined_label);
+
+    // Dialog
     Gatherer.dictionary.deregister(this);
     Gatherer.dictionary.deregister(tab_pane);
@@ -288 +460 @@
     }
     public void actionPerformed(ActionEvent event) {
-                // Submit the various changes.
-                // Connection preferences
+        // Submit the various changes.
+        // Connection preferences
         String library_path_string = library_path_field.getText();
         Gatherer.config.setString("general.exec_address", true, library_path_string);
@@ -300 +472 @@
         }
         }
-
         Gatherer.config.set("general.use_proxy", true, use_proxy_checkbox.isSelected());
         Gatherer.config.setString("general.proxy_host", true, proxy_host_field.getText());
         Gatherer.config.setString("general.proxy_port", true, proxy_port_field.getText());
         Gatherer.setProxy();
-                // Warning preferences
+
+        // General preferences
+        Gatherer.config.set("general.show_file_size", Configuration.COLLECTION_SPECIFIC, show_file_size_radio_button.isSelected());
+        if(Gatherer.g_man.mirror_pane != null) {
+        Gatherer.g_man.mirror_pane.refreshTrees();
+        }
+        Gatherer.g_man.collection_pane.refreshTrees();
+        Gatherer.g_man.metaedit_pane.refreshTrees();
+
+        Gatherer.config.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_radio_button.isSelected());
+        Gatherer.g_man.metaedit_pane.valueChanged((TreeSelectionEvent) null); // Refresh metadata table
+
+        Gatherer.config.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());
+
+        // Warning preferences
         for(int i = 0; i < warning_preferences_check_list.getEntryCount(); i++) {
         Entry entry = warning_preferences_check_list.get(i);
         Gatherer.config.set(entry.getProperty(), true, entry.isSelected());
         }
-                // Workflow preferences
+        // Workflow preferences
         Gatherer.config.set("workflow.browse", false, workflow_browse.isSelected());
         Gatherer.config.set("workflow.mirror", false, workflow_mirror.isSelected());
@@ -327 +512 @@
         Gatherer.g_man.workflowUpdate("Create", workflow_create.isSelected());
         Gatherer.g_man.workflowUpdate("Preview", workflow_preview.isSelected());
-                // Hide dialog
+        // Hide dialog
         if(close) {
         self.dispose();
@@ -338 +523 @@
     public void actionPerformed(ActionEvent event) {
         self.dispose();
+    }
+    }
+
+    private class DictionaryEntry 
+    implements Comparable {
+    private Locale locale;
+    private String description;
+    public DictionaryEntry(Locale locale) {
+        this.description = null;
+        this.locale = locale;
+    }
+    public DictionaryEntry(String description, Locale locale) {
+        this.description = description;
+        this.locale = locale;
+    }
+    public int compareTo(Object object) {
+        return toString().compareTo(object.toString());
+    }
+    public boolean equals(Object object) {
+        return toString().equals(object.toString());
+    }
+    public Locale getLocale() {
+        return locale;
+    }
+    public String toString() {
+        if(description != null) {
+        return description;
+        }
+        else {
+        return locale.getDisplayName();
+        }
     }
     }
@@ -369 +585 @@
     }
 
+    private class LanguageComboboxListener
+    implements ActionListener {
+    public void actionPerformed(ActionEvent event) {
+        // Retrieve the entry
+        DictionaryEntry entry = (DictionaryEntry) language_combobox.getSelectedItem();
+        if(entry != null) {
+        Gatherer.dictionary.changeDictionary(entry.getLocale());
+        // Display message
+        JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("Preferences.General.Restart_Required"), Gatherer.dictionary.get("Preferences.General.Restart_Required"), JOptionPane.WARNING_MESSAGE);
+        }
+    }
+    }
+
     private class UseProxyListener
     implements ActionListener {

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

@@ -8 +8 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.gui.SmarterTextArea;
+import org.greenstone.gatherer.util.FocusChangerTask;
 import org.greenstone.gatherer.util.Utility;
 
@@ -25 +26 @@
     private JCheckBox show_check;
     private JTextField value_field;
+    private JPanel value_panel;
     private String affected_property;
     private String full_property;
@@ -76 +78 @@
     text_area.setLineWrap(true);
     text_area.setWrapStyleWord(true);
-    JPanel value_panel = new JPanel();
+    value_panel = new JPanel();
     JLabel value_label = new JLabel(get("WarningDialog.Value"));
     value_label.setPreferredSize(LABEL_SIZE);
@@ -137 +139 @@
 
     public void actionPerformed(ActionEvent event) {
+    boolean bad_value = false;
     if(event.getSource() == ok_button) {
-        result = JOptionPane.OK_OPTION;
+        if(affected_property != null && Gatherer.config != null) {
+        String value = value_field.getText();
+        if(value.length() == 0) {
+            bad_value = true;
+        }
+        else if(value_field instanceof URLField) {
+            bad_value = !((URLField)value_field).validateURL();
+        }
+        if(!bad_value) {
+            // Store the value of the property
+            Gatherer.config.setString(affected_property, true, value_field.getText());
+        }
+        }
+        if(!bad_value) {
+        result = JOptionPane.OK_OPTION;
+        }
+    }
+    if(!bad_value) {
         if(Gatherer.config != null) {
-        // Store the value of the property
-        Gatherer.config.setString(affected_property, true, value_field.getText());
-        }
-    }
-    if(Gatherer.config != null) {
-        // Store the state of the show message checkbox.
-        Gatherer.config.set(full_property, true, !show_check.isSelected());
-    }
-    // Done.
-    dispose();
+        // Store the state of the show message checkbox.
+        Gatherer.config.set(full_property, true, !show_check.isSelected());
+        }
+        // Done.
+        dispose();
+    }
+    else {
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("WarningDialog.Invalid_Value"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+    }
     }
 
@@ -155 +174 @@
     ///ystem.err.println("Show " + full_property + ": " + Gatherer.config.get(full_property, false));
     if(Gatherer.config == null || Gatherer.config.get(full_property, false)) {
-        // We only show if the warning has not been disabled.
+        // Create and run the shortlived move focus thread
+        FocusChangerTask task = null;
+        if(affected_property != null) {
+        task = new FocusChangerTask(value_field);
+        }
+        else {
+        task = new FocusChangerTask(ok_button);
+        }
+        task.start();
         show();
     }
@@ -163 +190 @@
     }
     return result;
+    }
+
+    /** Allows you to replace the generic text field control with a JTextField subclass with further functionality. For instance you might provide a URLField to allow only valid URLs to be accepted.
+     * @param  control the JTextField subclass you want to use for the control
+     */
+    public void setValueField(JTextField control) {
+    // Remove the current control
+    value_panel.remove(value_field);
+    // Replace with the new one
+    value_field = control;
+    // Re-add
+    value_panel.add(value_field, BorderLayout.CENTER);
     }
 

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

@@ -32 +32 @@
 import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.HashMap3D;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.valuetree.GValueModel;
@@ -138 +139 @@
         filename_element = null;
         }
-                // Now, finally, we can add the metadata.
+        // Now, finally, we can add the metadata.
         Element metadata_element = base_document.createElement(METADATA_ELEMENT);
-        metadata_element.setAttribute(NAME_ATTRIBUTE, metadata.getElement().getName());
-
-                // To determine if this metadata entry should overwrite or accumulate we check if there are other entries with the same element in this fileset.
+        String name = metadata.getElement().getName();
+        if(name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
+        name = name.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);
+        }
+        metadata_element.setAttribute(NAME_ATTRIBUTE, name);
+
+        // To determine if this metadata entry should overwrite or accumulate we check if there are other entries with the same element in this fileset.
         boolean will_accumulate = false;
         NodeList sibling_description_elements = fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT);
@@ -180 +185 @@
         }
         metadata_element.appendChild(base_document.createTextNode(metadata.getAbsoluteValue()));
-                // Retrieve the first description element for this fileset (there should only be one, but I'll play it safe).
+        // Retrieve the first description element for this fileset (there should only be one, but I'll play it safe).
         NodeList description_elements = fileset_element.getElementsByTagName("Description");
         Element description_element = (Element) description_elements.item(0);
@@ -194 +199 @@
         Gatherer.printStackTrace(error);
     }
+    }
+
+    public int countMetadata() {
+    int count = 0;
+    try {
+        // Retrieve the document element.
+        Element directorymetadata_element = base_document.getDocumentElement();
+        // Iterate through the filesets, checking the FileName child element against    the target file's name using regular expression matching.
+        NodeList fileset_elements = directorymetadata_element.getElementsByTagName(FILESET_ELEMENT);
+        for(int i = 0; i < fileset_elements.getLength(); i++) {
+        Element fileset_element = (Element) fileset_elements.item(i);
+        NodeList description_elements = fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT);
+        for(int k = 0; k < description_elements.getLength(); k++) {
+            Element description_element = (Element) description_elements.item(k);
+            NodeList metadata_elements = description_element.getElementsByTagName(METADATA_ELEMENT);
+            count = count + metadata_elements.getLength();
+            metadata_elements = null;
+            description_element = null;
+        }
+        description_elements = null;
+        fileset_element = null;
+        }
+        fileset_elements = null;
+        directorymetadata_element = null;
+    }
+    catch (Exception error) {
+        Gatherer.printStackTrace(error);
+    }
+    return count;
     }
 
@@ -240 +274 @@
                     raw_value = MSMUtils.getValue(metadata_element);
                 }
+                // ***** LEGACY SUPPORT *****
+                // If this raw_value contains a '\' character, but no '\\', '[' or ']' characters, then replace the '\' with a '\\'
+                if(raw_value.indexOf(StaticStrings.ESCAPE_STR) != -1 && raw_value.indexOf(StaticStrings.ESCAPE_STR + StaticStrings.ESCAPE_STR) == -1 && raw_value.indexOf(StaticStrings.RBRACKET_CHARACTER) == -1 && raw_value.indexOf(StaticStrings.LBRACKET_CHARACTER) == -1) {
+                    Gatherer.println("Detected Legacy Path: " + raw_value);
+                    raw_value = raw_value.replaceAll(StaticStrings.ESCAPE_PATTERN, StaticStrings.ESCAPE_PATTERN + StaticStrings.ESCAPE_PATTERN);
+                    Gatherer.println("Updated Path To: " + raw_value);
+                    metadata_element.setAttribute(HVALUE_ATTRIBUTE, raw_value);
+                }
+                // **************************
                 // Using the element string and value, retrieve a matching Metadata object from the cache
                 Metadata metadata = null;

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

@@ -319 +319 @@
         // First purge any old references.
         document.getMetadata(null, false, null, null, true);
-        // Now write the xml
-        Utility.export(document.getDocument(), file);
-        document.setUpToDate(true);
+        // If there is no metadata in this document then don't write out a file. In fact delete any file that already exists.
+        int count = document.countMetadata();
+        if(count > 0) {
+            // Now write the xml
+            Utility.export(document.getDocument(), file);
+            document.setUpToDate(true);
+        }
+        else if(file.exists()) {
+            file.delete();
+        }
         }
     }

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

@@ -80 +80 @@
             args[0] = document_directories[i].getName();
             args[1] = String.valueOf(count);
-            shell.message(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Gatherer.dictionary.get("GShell.Extracted", args), GShell.OK);
+            shell.fireMessage(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Gatherer.dictionary.get("GShell.Extracted", args), GShell.OK);
             args = null;
             progress.increment();

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

@@ -44 +44 @@
 import org.greenstone.gatherer.valuetree.GValueModel;
 import org.greenstone.gatherer.valuetree.GValueNode;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.w3c.dom.Element;
 /** Stores a mapping between a particular metadata element, and a certain value node. 
@@ -124 +125 @@
     if(model != null && model.isHierarchy()) {
         if(value != null) {
-        GValueNode node = (GValueNode)value.getParent();
-        while(node != null) {
-            GValueNode next = (GValueNode)node.getParent();
-            if(next != null) {
-            abs_value = node.toString() + "\\" + abs_value;
-            }
-            node = next;
-        }
+        abs_value = value.getFullPath();
         }
         abs_value = model.getHIndex(abs_value);
+    }
+    else {
+        abs_value = abs_value.replaceAll(StaticStrings.LBRACKET_PATTERN, StaticStrings.ESCAPE_PATTERN + StaticStrings.LBRACKET_PATTERN);
+        abs_value = abs_value.replaceAll(StaticStrings.RBRACKET_PATTERN, StaticStrings.ESCAPE_PATTERN + StaticStrings.RBRACKET_PATTERN);
     }
     // Return the result