JAL-1492 JAL-1397 JAL-643 JAL-969 modifiable flag on colourscheme indicating conserva...

diff --git a/src/jalview/schemes/ColourSchemeI.java b/src/jalview/schemes/ColourSchemeI.java
index 65c24c1..3f73fc9 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeI.java
+++ b/src/jalview/schemes/ColourSchemeI.java
@@ -57,6 +57,11 @@ public interface ColourSchemeI
   public void setConservation(jalview.analysis.Conservation c);
 
   /**
+   * enable or disable conservation shading for this colourscheme
+   * @param conservationApplied 
+   */
+  public void setConservationApplied(boolean conservationApplied);
+  /**
    * 
    * @return true if conservation shading is enabled for this colourscheme
    */

diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index 943d2fa..424947c 100755 (executable)
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -194,6 +194,11 @@ public class ResidueColourScheme implements ColourSchemeI
   {
     return conservationColouring;
   }
+  @Override
+  public void setConservationApplied(boolean conservationApplied)
+  {
+    conservationColouring = conservationApplied;
+  }
 
   public void setConservationInc(int i)
   {