Changeset 5651

Timestamp:

2003-10-16T11:22:08+13:00 (21 years ago)

Author:

jmt12

Message:

Workaround for [ and ] bug, plus ensuring collection released, configuration saved etc

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/FormatManager.java (modified) (6 diffs)

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

@@ -48 +48 @@
 import org.greenstone.gatherer.cdm.Format;
 import org.greenstone.gatherer.msm.ElementWrapper;
-import org.greenstone.gatherer.util.GSDLSiteConfig;
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
@@ -103 +102 @@
     }
 
+   /** 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>.
@@ -144 +148 @@
     }
 
+   /** 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) {
     System.err.println("buildDefaultMappings(): replace me with something that reads in a data xml file.");
@@ -385 +396 @@
     public void destroy() {
     }
-
+       
     /** Overriden to ensure that the instructions pane is scrolled to the top.
      */
@@ -414 +425 @@
         format = null;
         }
-
-        // Now if the formats have changed, and the greenstone local library is being used and the collection has been built for previewing, then remove the add the collection to Greenstone to ensure the formatting updates correctly.
-        if(formats_changed && Gatherer.c_man.built() && Gatherer.config.exec_file != null) {
-        // Release the collection
-        Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.RELEASE_COMMAND + Gatherer.c_man.getCollection().getName());
-        // Then re-add it to force format commands to be processed
-        Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.ADD_COMMAND + Gatherer.c_man.getCollection().getName());
-        }
-        formats_changed = false;
     }
 
@@ -735 +737 @@
         implements ActionListener {
 
-        public void actionPerformed(ActionEvent event) {
-        /** @todo **/
-        }
+       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 = (String)part_combobox.getSelectedItem();
+         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;
+       }
     }
     }