setDefaultFileFormat

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 725ffe9..ac9aa91 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -78,6 +78,7 @@ public class AlignFrame extends GAlignFrame
     if(value == JalviewFileChooser.APPROVE_OPTION)
     {
       currentFileFormat  = chooser.getSelectedFormat();
+      jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", currentFileFormat);
 
       if (currentFileFormat.equals("Jalview"))
       {

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 89b1c52..2753652 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -190,16 +190,17 @@ this.setDropTarget(new java.awt.dnd.DropTarget(desktop, this));
    int value = chooser.showOpenDialog(this);\r
    if(value == JalviewFileChooser.APPROVE_OPTION)\r
    {\r
-     jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", chooser.getSelectedFormat());\r
      String choice =  chooser.getSelectedFile().getPath();\r
      jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser.getSelectedFile().getParent());\r
      if(chooser.getSelectedFormat().equals("Jalview"))\r
      {\r
+       jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", "Jalivew");\r
        Jalview2XML.LoadJalviewAlign(choice);\r
      }\r
      else\r
      {\r
        String format = IdentifyFile.Identify(choice, "File");\r
+       jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", format);\r
        LoadFile(choice, "File", format);\r
      }\r
    }\r