fileFormat enum wip changes

[jalview.git] / src / jalview / gui / Preferences.java

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 117f103..80b1806 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -24,6 +24,7 @@ import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
 import jalview.bin.Cache;
 import jalview.gui.Help.HelpId;
 import jalview.gui.StructureViewer.ViewerType;
+import jalview.io.FileFormat;
 import jalview.io.JalviewFileChooser;
 import jalview.io.JalviewFileView;
 import jalview.jbgui.GPreferences;
@@ -369,7 +370,6 @@ public class Preferences extends GPreferences
     /*
      * Set Output tab defaults
      */
-
     epsRendering.addItem(promptEachTimeOpt);
     epsRendering.addItem(lineArtOpt);
     epsRendering.addItem(textOpt);
@@ -385,8 +385,7 @@ public class Preferences extends GPreferences
     }
     else
     {
-      epsRendering.setSelectedItem(new OptionsParam(MessageManager
-              .getString("label.prompt_each_time"), "Prompt each time"));
+      epsRendering.setSelectedItem(promptEachTimeOpt);
     }
     autoIdWidth.setSelected(Cache.getDefault("FIGURE_AUTOIDWIDTH", false));
     userIdWidth.setEnabled(!autoIdWidth.isSelected());
@@ -685,12 +684,14 @@ public class Preferences extends GPreferences
   @Override
   public void startupFileTextfield_mouseClicked()
   {
+    FileFormat fileFormat = FileFormat.valueOf(Cache.getProperty("DEFAULT_FILE_FORMAT"));
     JalviewFileChooser chooser = new JalviewFileChooser(
-            jalview.bin.Cache.getProperty("LAST_DIRECTORY"), new String[] {
+    // fixme push into enum
+            Cache.getProperty("LAST_DIRECTORY"), new String[] {
                 "fa, fasta, fastq", "aln", "pfam", "msf", "pir", "blc",
                 "jar" }, new String[] { "Fasta", "Clustal", "PFAM", "MSF",
                 "PIR", "BLC", "Jalview" },
-            jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
+            fileFormat);
     chooser.setFileView(new JalviewFileView());
     chooser.setDialogTitle(MessageManager
             .getString("label.select_startup_file"));
@@ -699,8 +700,9 @@ public class Preferences extends GPreferences
 
     if (value == JalviewFileChooser.APPROVE_OPTION)
     {
-      jalview.bin.Cache.applicationProperties.setProperty(
-              "DEFAULT_FILE_FORMAT", chooser.getSelectedFormat());
+      Cache.applicationProperties.setProperty("DEFAULT_FILE_FORMAT",
+              chooser
+                      .getSelectedFormat().toString());
       startupFileTextfield.setText(chooser.getSelectedFile()
               .getAbsolutePath());
     }