spelling err

[jalview.git] / src / jalview / io / FileLoader.java

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 26aff08..a3ef237 100755 (executable)
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -74,13 +74,20 @@ public class FileLoader
 \r
     if (format.equalsIgnoreCase("Jalview"))\r
     {\r
-      af = Jalview2XML.LoadJalviewAlign(file);\r
+      af = new Jalview2XML().LoadJalviewAlign(file);\r
     }\r
     else\r
     {\r
+      String errorMessage = AppletFormatAdapter.SUPPORTED_FORMATS;\r
+\r
       if (FormatAdapter.formats.contains(format))\r
       {\r
-        sequences = new FormatAdapter().readFile(file, protocol, format);\r
+        try{\r
+          sequences = new FormatAdapter().readFile(file, protocol, format);\r
+        }catch(java.io.IOException ex)\r
+        {\r
+          errorMessage = ex.getMessage();\r
+        }\r
       }\r
 \r
       if ( (sequences != null) && (sequences.length > 0))\r
@@ -104,10 +111,9 @@ public class FileLoader
       else\r
       {\r
         JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
-                                              "Couldn't open file.\n" +\r
-                                              "Formats currently supported are\n" +\r
-                                              "Fasta, MSF, Clustal, BLC, PIR, MSP, and PFAM" // JBPNote - message should be generated through FormatAdapter!\r
-                                              , "Error loading file",\r
+                                              "Couldn't load file "+file+"\n"\r
+                                              +errorMessage,\r
+                                              "Error loading file",\r
                                               JOptionPane.WARNING_MESSAGE);\r
       }\r
     }\r