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
JAL-1517 source formatting
[jalview.git]
/
src
/
jalview
/
io
/
IdentifyFile.java
diff --git
a/src/jalview/io/IdentifyFile.java
b/src/jalview/io/IdentifyFile.java
index
2629896
..
08d4dca
100755
(executable)
--- a/
src/jalview/io/IdentifyFile.java
+++ b/
src/jalview/io/IdentifyFile.java
@@
-134,11
+134,11
@@
public class IdentifyFile
break;
}
break;
}
-
+
if ((data.indexOf("<") > -1))
{
reply = "RNAML";
if ((data.indexOf("<") > -1))
{
reply = "RNAML";
-
+
break;
}
break;
}
@@
-169,8
+169,7
@@
public class IdentifyFile
break;
}
break;
}
-
-
+
else if (data.indexOf(">") > -1)
{
// FASTA, PIR file or BLC file
else if (data.indexOf(">") > -1)
{
// FASTA, PIR file or BLC file
@@
-199,13
+198,16
@@
public class IdentifyFile
starterm = (data1 != null && data1.indexOf("*") > -1)
|| (data2 != null && data2.indexOf("*") > -1);
}
starterm = (data1 != null && data1.indexOf("*") > -1)
|| (data2 != null && data2.indexOf("*") > -1);
}
- if (data2 != null && (c1=data.indexOf("*")) > -1)
+ if (data2 != null && (c1 = data.indexOf("*")) > -1)
{
{
- if (c1==0 && c1 == data2.indexOf("*"))
+ if (c1 == 0 && c1 == data2.indexOf("*"))
{
reply = "BLC";
{
reply = "BLC";
- } else {
- reply = "FASTA"; // possibly a bad choice - may be recognised as PIR
+ }
+ 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
}