JAL-2089 patch broken merge to master for Release 2.10.0b1

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

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 117f103..8dbe5e2 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -369,7 +369,6 @@ public class Preferences extends GPreferences
     /*
      * Set Output tab defaults
      */
-
     epsRendering.addItem(promptEachTimeOpt);
     epsRendering.addItem(lineArtOpt);
     epsRendering.addItem(textOpt);
@@ -385,8 +384,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());
@@ -538,8 +536,8 @@ public class Preferences extends GPreferences
     /*
      * Save Output settings
      */
-      Cache.applicationProperties.setProperty("EPS_RENDERING",
-              ((OptionsParam) epsRendering.getSelectedItem()).getCode());
+    Cache.applicationProperties.setProperty("EPS_RENDERING",
+            ((OptionsParam) epsRendering.getSelectedItem()).getCode());
 
     /*
      * Save Connections settings
@@ -1048,7 +1046,8 @@ public class Preferences extends GPreferences
     }
 
     @Override
-    public int hashCode(){
+    public int hashCode()
+    {
       return name.hashCode() + code.hashCode();
     }
   }