Remember fileName in alignFrame
authoramwaterhouse <Andrew Waterhouse>
Mon, 6 Nov 2006 14:00:42 +0000 (14:00 +0000)
committeramwaterhouse <Andrew Waterhouse>
Mon, 6 Nov 2006 14:00:42 +0000 (14:00 +0000)
src/jalview/bin/Jalview.java
src/jalview/io/FileLoader.java

index 5bc98b1..1116fe4 100755 (executable)
@@ -280,13 +280,15 @@ public class Jalview
 \r
             if (file.endsWith(".jar"))\r
             {\r
-              new Jalview2XML().LoadJalviewAlign(file);\r
+              format = "Jalview";\r
             }\r
             else\r
             {\r
               format = new jalview.io.IdentifyFile().Identify(file, protocol);\r
-              new jalview.io.FileLoader().LoadFile(file, protocol, format);\r
             }\r
+\r
+            fileLoader.LoadFile(file, protocol, format);\r
+\r
           }\r
     }\r
 }\r
index 7fa4fda..0897207 100755 (executable)
@@ -214,6 +214,8 @@ public class FileLoader implements Runnable
 \r
         if (alignFrame != null)\r
         {\r
+         alignFrame.fileName = file;\r
+         alignFrame.currentFileFormat = format;\r
          updateRecentlyOpened();\r
         }\r
       }\r