Merge remote-tracking branch 'origin/merge/JAL-845_JAL-1640' into

[jalview.git] / src / jalview / renderer / AnnotationRenderer.java

diff --git a/src/jalview/renderer/AnnotationRenderer.java b/src/jalview/renderer/AnnotationRenderer.java
index d5b2f49..448bcd2 100644 (file)
--- a/src/jalview/renderer/AnnotationRenderer.java
+++ b/src/jalview/renderer/AnnotationRenderer.java
@@ -302,7 +302,7 @@ public class AnnotationRenderer
     columnSelection = av.getColumnSelection();
     hconsensus = av.getSequenceConsensusHash();// hconsensus;
     hStrucConsensus = av.getRnaStructureConsensusHash(); // hStrucConsensus;
-    av_ignoreGapsConsensus = av.getIgnoreGapsConsensus();
+    av_ignoreGapsConsensus = av.isIgnoreGapsConsensus();
   }
 
   public int[] getProfileFor(AlignmentAnnotation aa, int column)
@@ -400,8 +400,7 @@ public class AnnotationRenderer
     boolean validRes = false;
     boolean validEnd = false;
     boolean labelAllCols = false;
-    boolean centreColLabels, centreColLabelsDef = av
-            .getCentreColumnLabels();
+    boolean centreColLabels, centreColLabelsDef = av.isCentreColumnLabels();
     boolean scaleColLabel = false;
     AlignmentAnnotation consensusAnnot = av
             .getAlignmentConsensusAnnotation(), structConsensusAnnot = av