X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FFollowerColourScheme.java;h=57c19e5edb96d9e9fc9668d0dd126d72679af943;hb=136c0793b90b72b928c4d77dc109dd5c644e00d3;hp=da51e0350910e9568c9d02ee02664d93b0d0759e;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/jalview/schemes/FollowerColourScheme.java b/src/jalview/schemes/FollowerColourScheme.java
index da51e03..57c19e5 100644
--- a/src/jalview/schemes/FollowerColourScheme.java
+++ b/src/jalview/schemes/FollowerColourScheme.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,19 +20,22 @@
  */
 package jalview.schemes;
 
-import jalview.analysis.Conservation;
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.SequenceCollectionI;
+import jalview.datamodel.SequenceI;
 
-import java.util.Hashtable;
+import java.util.Map;
 
 /**
  * Colourscheme that takes its colours from some other colourscheme
+ * 
  * @author jimp
- *
+ * 
  */
 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(Hashtable[] 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;
   }
 
 }