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-1645 Version-Rel Version 2.9 Year-Rel 2015 Licensing glob
[jalview.git]
/
src
/
jalview
/
gui
/
SequenceRenderer.java
diff --git
a/src/jalview/gui/SequenceRenderer.java
b/src/jalview/gui/SequenceRenderer.java
index
21286ad
..
8c4ead8
100755
(executable)
--- a/
src/jalview/gui/SequenceRenderer.java
+++ b/
src/jalview/gui/SequenceRenderer.java
@@
-1,6
+1,6
@@
/*
/*
- * 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.
*
*
* This file is part of Jalview.
*
@@
-217,7
+217,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
int y1)
{
if (seq == null)
int y1)
{
if (seq == null)
- {
+ {
return; // fix for racecondition
}
int i = start;
return; // fix for racecondition
}
int i = start;
@@
-425,8
+425,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
charOffset = (av.getCharWidth() - fm.charWidth(s)) / 2;
graphics.drawString(String.valueOf(s),
charOffset = (av.getCharWidth() - fm.charWidth(s)) / 2;
graphics.drawString(String.valueOf(s),
- charOffset + av.getCharWidth()
- * (i - start), y1);
+ charOffset + av.getCharWidth() * (i - start), y1);
}
}
}
}
@@
-458,7
+457,7
@@
public class SequenceRenderer implements jalview.api.SequenceRenderer
.charAt(0)
: av.getAlignmentConsensusAnnotation().annotations[position].displayCharacter
.charAt(0);
.charAt(0)
: av.getAlignmentConsensusAnnotation().annotations[position].displayCharacter
.charAt(0);
- if (conschar != '-'
+ if (!jalview.util.Comparison.isGap(conschar)
&& (sequenceChar == conschar || sequenceChar + CHAR_TO_UPPER == conschar))
{
sequenceChar = conservedChar;
&& (sequenceChar == conschar || sequenceChar + CHAR_TO_UPPER == conschar))
{
sequenceChar = conservedChar;