X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FPurinePyrimidineColourScheme.java;h=1b36f3040f5c6fd0d5c7b4f9bf4fbc11674d66ea;hb=ff450fad8709ae81919af7a15ea382af7292794c;hp=c7c519c335db18e495fd149a3295d84811e0c179;hpb=b0cee3aaf7d8873910939f97b6acb217d518968d;p=jalview.git

diff --git a/src/jalview/schemes/PurinePyrimidineColourScheme.java b/src/jalview/schemes/PurinePyrimidineColourScheme.java
index c7c519c..1b36f30 100644
--- a/src/jalview/schemes/PurinePyrimidineColourScheme.java
+++ b/src/jalview/schemes/PurinePyrimidineColourScheme.java
@@ -20,7 +20,11 @@
  */
 package jalview.schemes;
 
-import java.awt.Color;
+import jalview.datamodel.AnnotatedCollectionI;
+import jalview.datamodel.SequenceCollectionI;
+import jalview.datamodel.SequenceI;
+
+import java.util.Map;
 
 /**
  * Class is based off of NucleotideColourScheme
@@ -35,58 +39,7 @@ public class PurinePyrimidineColourScheme extends ResidueColourScheme
   public PurinePyrimidineColourScheme()
   {
     super(ResidueProperties.purinepyrimidineIndex,
-            ResidueProperties.purinepyrimidine, 0);
-  }
-
-  /**
-   * Finds the corresponding color for the type of character inputed
-   * 
-   * @param c
-   *          Character in sequence
-   * 
-   * @return Color from purinepyrimidineIndex in
-   *         jalview.schemes.ResidueProperties
-   */
-  @Override
-  public Color findColour(char c)
-  {
-    return colors[ResidueProperties.purinepyrimidineIndex[c]];
-  }
-
-  /**
-   * Returns color based on conservation
-   * 
-   * @param c
-   *          Character in sequence
-   * @param j
-   *          Threshold
-   * 
-   * @return Color in RGB
-   */
-  public Color findColour(char c, int j)
-  {
-    Color currentColour;
-    if ((threshold == 0) || aboveThreshold(c, j))
-    {
-      try
-      {
-        currentColour = colors[ResidueProperties.purinepyrimidineIndex[c]];
-      } catch (Exception ex)
-      {
-        return Color.white;
-      }
-    }
-    else
-    {
-      return Color.white;
-    }
-
-    if (conservationColouring)
-    {
-      currentColour = applyConservation(currentColour, j);
-    }
-
-    return currentColour;
+            ResidueProperties.purinepyrimidine);
   }
 
   @Override
@@ -100,4 +53,15 @@ public class PurinePyrimidineColourScheme extends ResidueColourScheme
   {
     return JalviewColourScheme.PurinePyrimidine.toString();
   }
+
+  /**
+   * Returns a new instance of this colour scheme with which the given data may
+   * be coloured
+   */
+  @Override
+  public ColourSchemeI getInstance(AnnotatedCollectionI coll,
+          Map<SequenceI, SequenceCollectionI> hrs)
+  {
+    return new PurinePyrimidineColourScheme();
+  }
 }