JAL-2446 merged to spike branch

[jalview.git] / src / jalview / schemes / FollowerColourScheme.java

diff --git a/src/jalview/schemes/FollowerColourScheme.java b/src/jalview/schemes/FollowerColourScheme.java
index 35be31b..57c19e5 100644 (file)
--- a/src/jalview/schemes/FollowerColourScheme.java
+++ b/src/jalview/schemes/FollowerColourScheme.java
@@ -20,8 +20,11 @@
  */
 package jalview.schemes;
 
-import jalview.analysis.Conservation;
-import jalview.datamodel.ProfilesI;
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.SequenceCollectionI;
+import jalview.datamodel.SequenceI;
+
+import java.util.Map;
 
 /**
  * Colourscheme that takes its colours from some other colourscheme
@@ -32,7 +35,7 @@ import jalview.datamodel.ProfilesI;
 public class FollowerColourScheme extends ResidueColourScheme
 {
 
-  protected ColourSchemeI colourScheme;
+  private ColourSchemeI colourScheme;
 
   public ColourSchemeI getBaseColour()
   {
@@ -40,30 +43,30 @@ public class FollowerColourScheme extends ResidueColourScheme
   }
 
   @Override
-  public void setConsensus(ProfilesI consensus)
+  public String getSchemeName()
   {
-    if (colourScheme != null)
-    {
-      colourScheme.setConsensus(consensus);
-    }
+    return "Follower";
   }
 
+  /**
+   * Returns a new instance of this colour scheme with which the given data may
+   * be coloured
+   */
   @Override
-  public void setConservation(Conservation cons)
+  public ColourSchemeI getInstance(AnnotatedCollectionI coll,
+          Map<SequenceI, SequenceCollectionI> hrs)
   {
-    if (colourScheme != null)
-    {
-      colourScheme.setConservation(cons);
-    }
+    return new FollowerColourScheme();
   }
 
-  @Override
-  public void setConservationInc(int i)
+  protected ColourSchemeI getColourScheme()
+  {
+    return colourScheme;
+  }
+
+  protected void setColourScheme(ColourSchemeI colourScheme)
   {
-    if (colourScheme != null)
-    {
-      colourScheme.setConservationInc(i);
-    }
+    this.colourScheme = colourScheme;
   }
 
 }