/*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
}
if (currentSequenceGroup.getShowNonconserved())
{
- s = getDisplayChar(srep, i, s,
- '.');
+ s = getDisplayChar(srep, i, s, '.');
}
}
else
}
if (av.getShowUnconserved())
{
- s = getDisplayChar(srep, i, s,
- '.');
+ s = getDisplayChar(srep, i, s, '.');
}
}
}
- private char getDisplayChar(final boolean usesrep, int position,
- char s, char c)
+ private char getDisplayChar(final boolean usesrep, int position, char s,
+ char c)
{
- // TODO - use currentSequenceGroup rather than alignemnt
+ // TODO - use currentSequenceGroup rather than alignment
// currentSequenceGroup.getConsensus()
- char conschar = (usesrep) ? av.getAlignment().getSeqrep().getCharAt(position) : av.getAlignmentConsensusAnnotation().annotations[position].displayCharacter
- .charAt(0);
- if (conschar != '-' && s == conschar)
+ char conschar = (usesrep) ? av.getAlignment().getSeqrep()
+ .getCharAt(position)
+ : av.getAlignmentConsensusAnnotation().annotations[position].displayCharacter
+ .charAt(0);
+ if (!jalview.util.Comparison.isGap(conschar) && s == conschar)
{
s = c;
}