Changeset 7454

Timestamp:

2004-05-27T10:51:18+12:00 (20 years ago)

Author:

mdewsnip

Message:

Changing format statements now saves the collection configuration file immediately, to work better with the web library version of Greenstone. (For the Local Library, you still need to reload the collection configuration files, so going to Build and clicking the Preview button is required).

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (2 diffs)
• cdm/FormatManager.java (modified) (10 diffs)

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

@@ -295 +295 @@
         // Create Collection Manager
         c_man = new CollectionManager();
-        // If there was an open collection last session, reopen it.
         
         if (GS3) {
@@ -306 +305 @@
         }
         }
-        if(open_collection == null) {
+
+        // If there was an open collection last session, reopen it.
+        if (open_collection == null) {
         open_collection = config.getString("general.open_collection", true);
         }
-        if(!no_load && open_collection.length() > 0) {
+        if (!no_load && open_collection.length() > 0) {
         c_man.loadCollection(open_collection);
         }
+
         // Create GUI Manager (last) or else suffer the death of a thousand NPE's
         splash.toFront();

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

@@ -83 +83 @@
 
     // Ensure the default formats for DateList, HList and VList are assigned
-    if(getFormat("DateList") == null) {
-       addFormat(new Format("","DateList","<td>[link][icon][/link]</td><td>[highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight]</td><td>[Date]</td>"));
-    }
-    
-    if(getFormat("HList") == null) {
-       addFormat(new Format("","HList","[link][highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight][/link]"));
-    }
-    
-    if(getFormat("VList") == null) {
-       addFormat(new Format("","VList","<td valign=top>[link][icon][/link]</td><td valign=top>[srclink]{Or}{[thumbicon],[srcicon]}[/srclink]</td><td valign=top>[highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight]{If}{[Source],<br><i>([Source])</i>}</td>"));
+    if (getFormat("DateList") == null) {
+        addFormat(new Format("","DateList","<td>[link][icon][/link]</td><td>[highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight]</td><td>[Date]</td>"));
+    }
+
+    if (getFormat("HList") == null) {
+        addFormat(new Format("","HList","[link][highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight][/link]"));
+    }
+
+    if (getFormat("VList") == null) {
+        addFormat(new Format("","VList","<td valign=top>[link][icon][/link]</td><td valign=top>[srclink]{Or}{[thumbicon],[srcicon]}[/srclink]</td><td valign=top>[highlight]{Or}{[dls.Title],[dc.Title],[Title],Untitled}[/highlight]{If}{[Source],<br><i>([Source])</i>}</td>"));
     }
     }
@@ -117 +117 @@
     }
 
-   /** Have the formats changed since the last save. */
-   public boolean formatsChanged() {
-      return formats_changed;
-   }
-   
+    /** Have the formats changed since the last save. */
+    public boolean formatsChanged() {
+    return formats_changed;
+    }
+
     /** Gets the format indicated by the index.
      * @param index The location of the desired format, as an <i>int</i>.
@@ -163 +163 @@
     }
 
-   /** Set the state of the formats changed flag.
-    * @param state the new state as a boolean
-    */
-   public void setFormatsChanged(boolean state) {
-      formats_changed = state;
-   }
-   
+    /** Set the state of the formats changed flag.
+     * @param state the new state as a boolean
+     */
+    public void setFormatsChanged(boolean state) {
+    formats_changed = state;
+    }
+
     private HashMap buildDefaultMappings(ArrayList features_model, ArrayList parts_model) {
-       Gatherer.println("buildDefaultMappings(): replace me with something that reads in a data xml file.");
+    Gatherer.println("buildDefaultMappings(): replace me with something that reads in a data xml file.");
     return new HashMap();
     }
@@ -232 +232 @@
     private HashMap default_mappings;
     private JButton add_button;
-       //private JButton default_button;
-       private JButton insert_button;
+    //private JButton default_button;
+    private JButton insert_button;
     private JButton remove_button;
     private JButton replace_button;
@@ -243 +243 @@
     private JTextArea instructions_textarea;
     private JTextArea editor_textarea;
-       private JPanel blank_pane;
-       private JPanel control_pane;
+    private JPanel blank_pane;
+    private JPanel control_pane;
     private JPanel part_pane;
     private JPanel selection_pane;
@@ -459 +459 @@
     private class AddListener
         implements ActionListener {
-        public void actionPerformed(ActionEvent event) {
+
+        public void actionPerformed(ActionEvent event)
+        {
         ignore_event = true; // Prevent format_list excetera propagating events
-        Entry entry = (Entry)feature_combobox.getSelectedItem();
+
+        Entry entry = (Entry) feature_combobox.getSelectedItem();
         Object f = entry.getFeature();
         String p = "";
@@ -467 +470 @@
             p = part_combobox.getSelectedItem().toString();
         }
+
+        // Add a new format string of the appropriate type
         Format format = null;
-        if(view_type.equals(FLAG)) {
+        if (view_type.equals(FLAG)) {
             format = new Format(f, p, enabled_checkbox.isSelected());
         }
@@ -475 +480 @@
         }
         addFormat(format);
+
+        // Save the collection configuration file immediately
+        Gatherer.g_man.design_pane.saveConfiguration();
+
         add_button.setEnabled(false);
         replace_button.setEnabled(false);
         remove_button.setEnabled(true);
+
         // Update list selection
         format_list.setSelectedValue(format, true);
@@ -770 +780 @@
     private class RemoveListener
         implements ActionListener {
-        public void actionPerformed(ActionEvent event) {
-        if(!format_list.isSelectionEmpty()) {
+
+        public void actionPerformed(ActionEvent event)
+        {
+        if (!format_list.isSelectionEmpty()) {
+            // Remove the current format
             removeFormat((Format)format_list.getSelectedValue());
+
+            // Save the collection configuration file immediately
+            Gatherer.g_man.design_pane.saveConfiguration();
+
             // Change buttons
             add_button.setEnabled(true);
             replace_button.setEnabled(false);
         }
+
         remove_button.setEnabled(false);
         }
@@ -784 +802 @@
         implements ActionListener {
 
-       public void actionPerformed(ActionEvent event) {
-          ignore_event = true; // Prevent format_list excetera propagating events
-
-          if(!format_list.isSelectionEmpty()) {
-
-         // Remove the current format
-         removeFormat((Format)format_list.getSelectedValue());
-         
-         Entry entry = (Entry)feature_combobox.getSelectedItem();
-         Object f = entry.getFeature();
-         String p =  "";
-         if (entry.canHavePart()) {
-            p = part_combobox.getSelectedItem().toString();
-         }
-         Format format = null;
-         if(view_type.equals(FLAG)) {
-            format = new Format(f, p, enabled_checkbox.isSelected());
-         }
-         else {
-            format = new Format(f, p, editor_textarea.getText());
-         }
-         addFormat(format);
-         add_button.setEnabled(false);
-         remove_button.setEnabled(true);
-         // Update list selection
-         format_list.setSelectedValue(format, true);
-         format = null;
-         p = null;
-         f = null;
-         entry = null;
-          }
-          replace_button.setEnabled(false);
-          ignore_event = false;
-       }
+        public void actionPerformed(ActionEvent event)
+        {
+        ignore_event = true; // Prevent format_list excetera propagating events
+
+        if (!format_list.isSelectionEmpty()) {
+            // Remove the current format
+            removeFormat((Format) format_list.getSelectedValue());
+
+            Entry entry = (Entry) feature_combobox.getSelectedItem();
+            Object f = entry.getFeature();
+            String p = "";
+            if (entry.canHavePart()) {
+            p = part_combobox.getSelectedItem().toString();
+            }
+
+            // Add a new format string of the appropriate type
+            Format format = null;
+            if (view_type.equals(FLAG)) {
+            format = new Format(f, p, enabled_checkbox.isSelected());
+            }
+            else {
+            format = new Format(f, p, editor_textarea.getText());
+            }
+            addFormat(format);
+
+            // Save the collection configuration file immediately
+            Gatherer.g_man.design_pane.saveConfiguration();
+
+            add_button.setEnabled(false);
+            remove_button.setEnabled(true);
+            // Update list selection
+            format_list.setSelectedValue(format, true);
+            format = null;
+            p = null;
+            f = null;
+            entry = null;
+        }
+
+        replace_button.setEnabled(false);
+        ignore_event = false;
+        }
     }
     }