X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSequenceRenderer.java;h=8c4ead82acfd5011b37a51746463066c85e2e758;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=21286ada1ad4448cfdd139502b50b435a57ff4c0;hpb=6966b639be33cdd34480c877fffbc45810ea1534;p=jalview.git diff --git a/src/jalview/gui/SequenceRenderer.java b/src/jalview/gui/SequenceRenderer.java index 21286ad..8c4ead8 100755 --- 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. * @@ -217,7 +217,7 @@ public class SequenceRenderer implements jalview.api.SequenceRenderer int y1) { if (seq == null) - { + { 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() - * (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); - if (conschar != '-' + if (!jalview.util.Comparison.isGap(conschar) && (sequenceChar == conschar || sequenceChar + CHAR_TO_UPPER == conschar)) { sequenceChar = conservedChar;