X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FIdentifyFile.java;h=f4beccb42d77ccad84cbd77cd53c9c17d981fe59;hb=2f1b1f33d31e1b068cea66d66f0bed29a4585cf7;hp=dbee007fd4b5289f88228d71db3e61c4416f22ab;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git diff --git a/src/jalview/io/IdentifyFile.java b/src/jalview/io/IdentifyFile.java index dbee007..f4beccb 100755 --- a/src/jalview/io/IdentifyFile.java +++ b/src/jalview/io/IdentifyFile.java @@ -42,25 +42,25 @@ public class IdentifyFile public static String Identify(String file, String protocol) { String reply = "PFAM"; + String error = "FILE NOT FOUND"; try { BufferedReader reader = null; - if (protocol.equals("File")) + if (protocol.equalsIgnoreCase("File")) { reader = new BufferedReader(new FileReader(file)); } - else if (protocol.equals("URL")) + else if (protocol.equalsIgnoreCase("URL")) { - reply = "URL NOT FOUND"; - + error = "URL NOT FOUND"; URL url = new URL(file); reader = new BufferedReader(new InputStreamReader( url.openStream())); - reply = "error"; + } - else if (protocol.equals("Paste")) + else if (protocol.equalsIgnoreCase("Paste")) { reader = new BufferedReader(new StringReader(file)); } @@ -110,7 +110,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"; } @@ -128,8 +128,8 @@ public class IdentifyFile catch (Exception ex) { System.err.println("File Identification failed!\n" + ex); + return error; } - return reply; } }