fixes bug 0013013 but reveals lack of a 'features retrieved' flag that should be...

[jalview.git] / src / jalview / appletgui / AlignFrame.java

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 6d70bf7..03c0db9 100755 (executable)
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -140,13 +140,23 @@ public class AlignFrame extends Frame implements ActionListener,
 \r
   public void parseFeaturesFile(String file)\r
   {\r
+    String line = null;\r
     try\r
     {\r
-      URL url = new URL(file);\r
+      BufferedReader in = null;\r
+      java.io.InputStream is = getClass().getResourceAsStream("/" + file);\r
+      if (is != null)\r
+      {\r
+        in = new BufferedReader(new java.io.InputStreamReader(is));\r
+      }\r
+      else\r
+      {\r
+        URL url = new URL(file);\r
+        in = new BufferedReader(new InputStreamReader(url.openStream()));\r
+      }\r
 \r
-      BufferedReader in =  new BufferedReader(new InputStreamReader(url.openStream()));\r
       SequenceI seq = null;\r
-      String line, type, desc, token;\r
+      String type, desc, token;\r
 \r
       int index, start, end;\r
       StringTokenizer st;\r
@@ -228,7 +238,7 @@ public class AlignFrame extends Frame implements ActionListener,
     catch (Exception ex)\r
     {\r
       ex.printStackTrace();\r
-      System.out.println("Error parsing groups file: " + ex);\r
+      System.out.println("Error parsing groups file: " + ex +"\n"+line);\r
     }\r
   }\r
 \r