JAL-3597 additional references nulled, bug in test corrected

[jalview.git] / src / jalview / viewmodel / AlignmentViewport.java

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index f2ab8a6..0d26db1 100644 (file)
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -963,6 +963,7 @@ public abstract class AlignmentViewport
     ranges = null;
     currentTree = null;
     selectionGroup = null;
+    colSel = null;
     setAlignment(null);
   }
 
@@ -1323,21 +1324,6 @@ public abstract class AlignmentViewport
    */
   private boolean followHighlight = true;
 
-  private boolean disableFastPaint; // BH 2019.04.18
-
-  /**
-   * BH 2019.04.18 When gap filling is on and a modification is made to fill
-   * those, we need to disallow fast painting for paste just once
-   * 
-   * @return
-   */
-  public boolean isFastPaintDisabled()
-  {
-    boolean ret = disableFastPaint;
-    disableFastPaint = false;
-    return ret;
-  }
-
   /**
    * Property change listener for changes in alignment
    * 
@@ -1872,11 +1858,7 @@ public abstract class AlignmentViewport
   {
     if (isPadGaps())
     {
-      if (alignment.padGaps())
-      {
-        // the new alignment has been modified -- can't fast paint
-        disableFastPaint = true;
-      }
+      alignment.padGaps();
     }
     if (autoCalculateConsensus)
     {
@@ -2286,7 +2268,7 @@ public abstract class AlignmentViewport
   public void clearSequenceColours()
   {
     sequenceColours.clear();
-  };
+  }
 
   @Override
   public AlignViewportI getCodingComplement()
@@ -2739,6 +2721,30 @@ public abstract class AlignmentViewport
     viewStyle.setProteinFontAsCdna(b);
   }
 
+  @Override
+  public void setShowComplementFeatures(boolean b)
+  {
+    viewStyle.setShowComplementFeatures(b);
+  }
+
+  @Override
+  public boolean isShowComplementFeatures()
+  {
+    return viewStyle.isShowComplementFeatures();
+  }
+
+  @Override
+  public void setShowComplementFeaturesOnTop(boolean b)
+  {
+    viewStyle.setShowComplementFeaturesOnTop(b);
+  }
+
+  @Override
+  public boolean isShowComplementFeaturesOnTop()
+  {
+    return viewStyle.isShowComplementFeaturesOnTop();
+  }
+
   /**
    * @return true if view should scroll to show the highlighted region of a
    *         sequence