Merge branch 'develop' into merge/JAL-3127

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

diff --git a/src/jalview/schemes/NucleotideColourScheme.java b/src/jalview/schemes/NucleotideColourScheme.java
index 3e6bd2f..4977107 100755 (executable)
--- a/src/jalview/schemes/NucleotideColourScheme.java
+++ b/src/jalview/schemes/NucleotideColourScheme.java
@@ -20,9 +20,8 @@
  */
 package jalview.schemes;
 
-import jalview.datamodel.SequenceI;
-
-import java.awt.Color;
+import jalview.api.AlignViewportI;
+import jalview.datamodel.AnnotatedCollectionI;
 
 /**
  * DOCUMENT ME!
@@ -37,60 +36,7 @@ public class NucleotideColourScheme extends ResidueColourScheme
    */
   public NucleotideColourScheme()
   {
-    super(ResidueProperties.nucleotideIndex, ResidueProperties.nucleotide,
-            0);
-  }
-
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param n
-   *          DOCUMENT ME!
-   * 
-   * @return DOCUMENT ME!
-   */
-  @Override
-  public Color findColour(char c)
-  {
-    // System.out.println("called"); log.debug
-    return colors[ResidueProperties.nucleotideIndex[c]];
-  }
-
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param n
-   *          DOCUMENT ME!
-   * @param j
-   *          DOCUMENT ME!
-   * 
-   * @return DOCUMENT ME!
-   */
-  @Override
-  public Color findColour(char c, int j, SequenceI seq)
-  {
-    Color currentColour;
-    if ((threshold == 0) || aboveThreshold(c, j))
-    {
-      try
-      {
-        currentColour = colors[ResidueProperties.nucleotideIndex[c]];
-      } catch (Exception ex)
-      {
-        return Color.white;
-      }
-    }
-    else
-    {
-      return Color.white;
-    }
-
-    if (conservationColouring)
-    {
-      currentColour = applyConservation(currentColour, j);
-    }
-
-    return currentColour;
+    super(ResidueProperties.nucleotideIndex, ResidueProperties.nucleotide);
   }
 
   @Override
@@ -104,4 +50,15 @@ public class NucleotideColourScheme extends ResidueColourScheme
   {
     return JalviewColourScheme.Nucleotide.toString();
   }
+
+  /**
+   * Returns a new instance of this colour scheme with which the given data may
+   * be coloured
+   */
+  @Override
+  public ColourSchemeI getInstance(AlignViewportI view,
+          AnnotatedCollectionI coll)
+  {
+    return new NucleotideColourScheme();
+  }
 }