Changeset 17132 for gli/trunk/src/org/greenstone/gatherer/gui/ExportAsPrompt.java

Timestamp:

2008-09-04T11:16:50+12:00 (16 years ago)

Author:

kjdon

Message:

added GreenstoneMETS and FedoraMETS instead of METS in the saveas list. changed all .equals(METS) tests to .endsWith(METS)

File:

• gli/trunk/src/org/greenstone/gatherer/gui/ExportAsPrompt.java (modified) (8 diffs)

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

@@ -159 +159 @@
     plugoutMap.put("DSpace","dublin-core.xml");
         plugoutMap.put("MARCXML","doc.xml");   
-    plugoutMap.put("METS","doctxt.xml,docmets.xml");     
+    plugoutMap.put("GreenstoneMETS","doctxt.xml,docmets.xml");     
+    plugoutMap.put("FedoraMETS","doctxt.xml,docmets.xml");     
     plugoutMap.put("GA","doc.xml");
 
+    // this is the order we want them to appear in the list
+    String [] saveas_formats = {"GA", "GreenstoneMETS", "FedoraMETS", "MARCXML", "DSpace"};
         cancel_button = new GLIButton(Dictionary.get("General.Close"), Dictionary.get("General.Close_Tooltip"));
     
@@ -178 +181 @@
     
              
-        // Save As
-    ArrayList saveas_formats = new ArrayList(plugoutMap.keySet());
        
         saveas_label = new JLabel(Dictionary.get("ExportAsPrompt.SaveAs")
@@ -185 +186 @@
         //saveas_label.setPreferredSize(LABEL_SIZE);
         
-        saveas_combobox = new JComboBox(saveas_formats.toArray());
+    saveas_combobox = new JComboBox(saveas_formats);
     saveas_combobox.setOpaque(false);
     saveas_combobox.setToolTipText(Dictionary.get("ExportAsPrompt.SaveAs_Tooltip"));
@@ -334 +335 @@
     }
         else{
-        if (saveas.equals("METS")){
+        if (saveas.endsWith("METS")){
         convert_xml_pane.add(convert_xml_pane2); 
         }
@@ -448 +449 @@
         command_parts_list.add(export_dir);
 
-        if (!export_type.equals("METS") && xsl_file1 !=null){
+        if (!export_type.endsWith("METS") && xsl_file1 !=null){
              command_parts_list.add("-xsltfile");
              command_parts_list.add(xsl_file1.getPath()); 
@@ -477 +478 @@
 
             
-        if (export_type.equals("METS") && xsl_file1 !=null){
+        if (export_type.endsWith("METS") && xsl_file1 !=null){
              command_parts_list.add("-xslt_txt");
              command_parts_list.add(xsl_file1.getPath()); 
     }
 
-         if (export_type.equals("METS") && xsl_file2 !=null){
+         if (export_type.endsWith("METS") && xsl_file2 !=null){
              command_parts_list.add("-xslt_mets");
              command_parts_list.add(xsl_file2.getPath()); 
@@ -575 +576 @@
         details = Dictionary.get("ExportAsPrompt.Failed_Details", args);
     }
-    SimpleResultDialog result_dialog = new SimpleResultDialog(title, label, details);
+    SimpleResultDialog result_dialog = new SimpleResultDialog(this, title, label, details);
     result_dialog.setVisible(true); // Blocks
     result_dialog.dispose();
@@ -840 +841 @@
         }
 
-        if (!saveas.equals("METS")){
+        if (!saveas.endsWith("METS")){
     
         convert_xml_checkbox1.setText(Dictionary.get("ExportAsPrompt.ApplyXSL",(String)plugoutMap.get(saveas)));