From f2f5f5042c12fd349d3e6a9aee320bf3a2b43549 Mon Sep 17 00:00:00 2001 From: jprocter Date: Thu, 26 Apr 2007 11:23:18 +0000 Subject: [PATCH] fixed bug in prefix extraction for application --- src/jalview/io/FileParse.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java index 40bc005..eb10375 100755 --- a/src/jalview/io/FileParse.java +++ b/src/jalview/io/FileParse.java @@ -51,6 +51,7 @@ public class FileParse * @return this.error (true if the source was invalid) */ private boolean checkFileSource(String fileStr) throws IOException { + error=false; this.inFile = new File(fileStr); // check to see if it's a Jar file in disguise. if (!inFile.exists()) { @@ -111,11 +112,16 @@ public class FileParse { if (checkFileSource(fileStr)) { String suffixLess = extractSuffix(fileStr); - if (suffixLess!=null && checkFileSource(suffixLess)) + if (suffixLess!=null) + { + if (checkFileSource(suffixLess)) + { + throw new IOException("Problem opening "+inFile+" (also tried "+suffixLess+") : "+errormessage); + } + } else { - throw new IOException("Problem opening "+inFile+" (also tried "+fileStr+") : "+errormessage); + throw new IOException("Problem opening "+inFile+" : "+errormessage); } - throw new IOException("Problem opening "+inFile+" : "+errormessage); } } else if (type.equals(AppletFormatAdapter.URL)) -- 1.7.10.2