git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix for JAL-1494 tweaked logic to fix NPEs and modify settings for both background...
[jalview.git]
/
src
/
jalview
/
io
/
IdentifyFile.java
diff --git
a/src/jalview/io/IdentifyFile.java
b/src/jalview/io/IdentifyFile.java
index
63d8d63
..
93f9a98
100755
(executable)
--- a/
src/jalview/io/IdentifyFile.java
+++ b/
src/jalview/io/IdentifyFile.java
@@
-182,16
+182,19
@@
public class IdentifyFile
// Is this a single line BLC file?
String data1 = source.nextLine();
String data2 = source.nextLine();
// Is this a single line BLC file?
String data1 = source.nextLine();
String data2 = source.nextLine();
+ int c1;
if (checkPIR)
{
starterm = (data1 != null && data1.indexOf("*") > -1)
|| (data2 != null && data2.indexOf("*") > -1);
}
if (checkPIR)
{
starterm = (data1 != null && data1.indexOf("*") > -1)
|| (data2 != null && data2.indexOf("*") > -1);
}
- if (data2 != null && data.indexOf("*") > -1)
+ if (data2 != null && (c1=data.indexOf("*")) > -1)
{
{
- if (data.indexOf("*") == data2.indexOf("*"))
+ if (c1==0 && c1 == data2.indexOf("*"))
{
reply = "BLC";
{
reply = "BLC";
+ } else {
+ reply = "FASTA"; // possibly a bad choice - may be recognised as PIR
}
// otherwise can still possibly be a PIR file
}
}
// otherwise can still possibly be a PIR file
}