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
Check conensus is not null
[jalview.git]
/
src
/
jalview
/
schemes
/
ResidueColourScheme.java
diff --git
a/src/jalview/schemes/ResidueColourScheme.java
b/src/jalview/schemes/ResidueColourScheme.java
index
7c36208
..
64fd62e
100755
(executable)
--- a/
src/jalview/schemes/ResidueColourScheme.java
+++ b/
src/jalview/schemes/ResidueColourScheme.java
@@
-153,14
+153,16
@@
public class ResidueColourScheme implements ColourSchemeI
s = String.valueOf(c);
\r
}
\r
\r
s = String.valueOf(c);
\r
}
\r
\r
+ if (consensus == null || consensus[j] == null)
\r
+ return false;
\r
\r
\r
- if ((((Integer) consensus[j].get(AAFrequency.MAXCOUNT)).intValue() != -1) &&
\r
- consensus[j].contains(s))
\r
+ if ( ( ( (Integer) consensus[j].get(AAFrequency.MAXCOUNT)).intValue() != -1) &&
\r
+ consensus[j].contains(s))
\r
{
\r
{
\r
- if (((Float)consensus[j].get(ignoreGaps)).floatValue() >= threshold)
\r
- {
\r
- return true;
\r
- }
\r
+ if ( ( (Float) consensus[j].get(ignoreGaps)).floatValue() >= threshold)
\r
+ {
\r
+ return true;
\r
+ }
\r
}
\r
\r
return false;
\r
}
\r
\r
return false;
\r