X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=6b32fe1a867d4214efd90b7a08e5943bfedbd72f;hb=56e5bdc625697d50d7d3f422616f0f1b40ca2828;hp=dbee007fd4b5289f88228d71db3e61c4416f22ab;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java
index dbee007..6b32fe1 100755
--- a/src/jalview/io/IdentifyFile.java
+++ b/src/jalview/io/IdentifyFile.java
@@ -39,30 +39,35 @@ public class IdentifyFile
      *
      * @return DOCUMENT ME!
      */
-    public static String Identify(String file, String protocol)
+    public String Identify(String file, String protocol)
     {
         String reply = "PFAM";
-
+        String error =  "FILE NOT FOUND";
         try
         {
             BufferedReader reader = null;
 
-            if (protocol.equals("File"))
+            if (protocol.equals(AppletFormatAdapter.FILE))
             {
-                reader = new BufferedReader(new FileReader(file));
+              reader = new BufferedReader(new FileReader(file));
             }
-            else if (protocol.equals("URL"))
+            else if (protocol.equals(AppletFormatAdapter.URL))
             {
-                reply = "URL NOT FOUND";
+              error = "URL NOT FOUND";
+              URL url = new URL(file);
+              reader = new BufferedReader(new InputStreamReader(
+                  url.openStream()));
 
-                URL url = new URL(file);
-                reader = new BufferedReader(new InputStreamReader(
-                            url.openStream()));
-                reply = "error";
             }
-            else if (protocol.equals("Paste"))
+            else if (protocol.equals(AppletFormatAdapter.PASTE))
+            {
+              reader = new BufferedReader(new StringReader(file));
+            }
+            else if (protocol.equals(AppletFormatAdapter.CLASSLOADER))
             {
-                reader = new BufferedReader(new StringReader(file));
+              java.io.InputStream is = getClass().getResourceAsStream("/" +
+                  file);
+              reader = new BufferedReader(new java.io.InputStreamReader(is));
             }
 
             String data;
@@ -110,7 +115,7 @@ public class IdentifyFile
                     // could be BLC file, read next line to confirm
                     data = reader.readLine();
 
-                    if (data.indexOf(">") > -1)
+                    if (data.indexOf(">") > -1 || data.indexOf("*") >-1 )
                     {
                         reply = "BLC";
                     }
@@ -121,6 +126,12 @@ public class IdentifyFile
 
                     break;
                 }
+                else if (data.indexOf(":")<data.indexOf(",")) //  && data.indexOf(",")<data.indexOf(",", data.indexOf(",")))
+                {
+                  // file looks like a concise JNet file
+                  reply="JnetFile";
+                  break;
+                }
             }
 
             reader.close();
@@ -128,8 +139,8 @@ public class IdentifyFile
         catch (Exception ex)
         {
             System.err.println("File Identification failed!\n" + ex);
+            return error;
         }
-
         return reply;
     }
 }