Changeset 4673

Timestamp:

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

Author:

jmt12

Message:

* empty log message *

Location:

trunk/gli

Files:

• classes/dictionary.properties (modified) (4 diffs)
• classes/xml/config.xml (modified) (1 diff)
• src/org/greenstone/gatherer/Dictionary.java (modified) (1 diff)
• src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (1 diff)
• src/org/greenstone/gatherer/gui/CreatePane.java (modified) (2 diffs)
• src/org/greenstone/gatherer/msm/MSMUtils.java (modified) (1 diff)
• src/org/greenstone/gatherer/msm/MetadataSetManager.java (modified) (1 diff)
• src/org/greenstone/gatherer/util/Utility.java (modified) (3 diffs)

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: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.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.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: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.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.Remove:Remove Selected Plugin
 CDM.PlugInManager.Title:{39}{46}Plugin Selection & Configuration{47}{34}
@@ -415 +415 @@
 #
 #******* File Associations dialog **********
+FileAssociationDialog.Add:Add
 FileAssociationDialog.Batch_File:Batch files
 FileAssociationDialog.Browse:Browse
 FileAssociationDialog.Browse_Title:Choose Application
-FileAssociationDialog.Command:Open using:
+FileAssociationDialog.Command:Launch command:
 FileAssociationDialog.Command_File:Command files
 FileAssociationDialog.Executable_File:Executable files
 FileAssociationDialog.Extension:For files ending:
+FileAssociationDialog.Instructions:Use this dialog to set what external programs are used to view a certain file-type, and what command is sent to launch this program.\nTo select a current file association, choose an extension from the 'For file's ending' drop down list.\nTo add a new file-type, type its extension in 'For file's ending'.\nTo add or modify a launch command, type the new command in 'Launch command' or click 'Browse' to search the file system for an appropriate program. Use the special string '%1' to indicate where the name of the file to be opened should be inserted, e.g. "C:\\Windows\\System\\MSPaint.exe %1". '%1' will be appended to the end of a command if not otherwise specified.
 FileAssociationDialog.Title:Edit File Associations
 #*******************
@@ -767 +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, 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 (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_Merge:Merge
 MSMPrompt.Select_Element_Original:Original element name:

trunk/gli/classes/xml/config.xml

@@ -93 +93 @@
     <!-- Warnings can be disabled by the user. -->
     <!-- Do we show a warning message when a user attempts to add folder level metadata. [true] -->
-    <Argument name="warning.DirectoryLevelMetadataPrompt">true</Argument>
+    <Argument name="warning.DirectoryLevelMetadata">true</Argument>
     <Argument name="warning.InheritedMetadata">true</Argument>
     <Argument name="warning.MissingEXEC">true</Argument>

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

@@ -203 +203 @@
         Gatherer.println("Missing value for key: " + key);
         }
+        //e.printStackTrace();
         return key;
     }

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

@@ -708 +708 @@
     public void importCollection() {
     if(!saved()) {
-                // Force save.
+        // Force save.
         try {
         SaveCollectionTask save_task = new SaveCollectionTask(collection);

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

@@ -418 +418 @@
      */
     public void actionPerformed(ActionEvent event) {
-                // First we force the build options to be updated if we haven't already.
+        // First we force the build options to be updated if we haven't already.
         tree.valueChanged(null);
-                // Now go about building.
+        // Now go about building.
         build_button.setEnabled(false);
         cancel_button.setEnabled(true);
-                // Create a new process log, and place it.
+        // Create a new process log, and place it.
         if(scroll_log != null) {
         progress_pane.remove(scroll_log);
@@ -430 +430 @@
         scroll_log = new JScrollPane(process_log);
         progress_pane.add(scroll_log, BorderLayout.CENTER);
-                // clear the log list and message_log
+        // clear the log list and message_log
         options_pane.resetLogList();
-                // Change the view.
+        // Change the view.
         processing = true;
         card_layout.show(main_pane, PROGRESS);
-                // Reset the stop flag in all the process monitors, just incase.
+        // Reset the stop flag in all the process monitors, just incase.
         ((GBuildProgressMonitor)build_monitor).reset();
         copy_monitor.setStop(false);
         import_monitor.setStop(false);
-                // Set removeold automatically.
-        if(Gatherer.c_man.ready() && !Gatherer.c_man.built()) {
+        // Set removeold automatically.
+        if(Gatherer.c_man.ready() && Gatherer.c_man.built()) {
         Gatherer.c_man.getCollection().build_options.setImportValue("removeold", true, null);
         }
-                // Call CollectionManagers method to build collection.
+        // Call CollectionManagers method to build collection.
         Gatherer.c_man.importCollection();
     }

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

@@ -712 +712 @@
     element.setAttribute("occurances", new_value.toString());
     }
+
+    /** Set the #text node value of some element.
+     * @param element the Element whose value we wish to set
+     * @param value the new value for the element as a String
+     */
+    static final public void setValue(Element element, String value) {
+    // Remove any existing child node(s)
+    while(element.hasChildNodes()) {
+        element.removeChild(element.getFirstChild());
+    }
+    // Add new text node.
+    element.appendChild(element.getOwnerDocument().createTextNode(value));
+    }
+
     /** This method also traverses the tree, but this one is used to gather all the values and aliases at once, and to 'prune' the tree if necessary.
      * @param current The current root <strong>Node</strong> of this AssignedValues tree subtree.

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

@@ -915 +915 @@
     // And make back ups of all existing metadata set files.
     File temp[] = file.listFiles();
-    for(int i = temp.length - 1; i >= 0; i--) {
+    for(int i = 0; temp != null && i < temp.length; i++) {
         if(temp[i].getName().endsWith(".mds") || temp[i].getName().endsWith(".mdv")) {
         File backup = new File(temp[i].getAbsolutePath() + "~");

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

@@ -70 +70 @@
     static final public String CFG_COLLECTIONMETA_COLLECTIONEXTRA = "collectionmeta collectionextra";
     static final public String CFG_COLLECTIONMETA_ICONCOLLECTION = "collectionmeta iconcollection";
-    static final public String CFG_COLLECTIONMETA_ICONCOLLECTIONSMALL = "collectionmeta iconcollectionsmall";
     static final public String CFG_CLASSIFY = "classify";
     static final public String CFG_CLASSIFY_BUTTONNAME = "-buttonname";
@@ -104 +103 @@
     /** Definition of an important directory name, in this case the private web cache directory for the collection. */
     static final public String GCACHE_DIR = "gcache" + File.separator;
-    /** The archive file where the GLI can find dynamically loaded classes. */
     static final public String GLI_ARCHIVE = "GLI.jar";
     /** Definition of an important directory name, in this case the location of help documentation. */
@@ -145 +143 @@
     static final public String WELCOME_DIR = BASE_DIR + "welcome" + File.separator;
     static final public String WORKSPACE_TREE = "Workspace";
+    static final public String XML_DIRECTORY = "xml" + File.separator;
     // These are out of alphabetic order to avoid forward reference error.
     /** The default icon to produce a 'help-icon' sized blank space before a menu entry. */