X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FNucleotideColourScheme.java;h=4977107e656012563ff66ac51672c2997ea0f378;hb=f4990f6e5cedd6d2277cb5edbd1ecd14d9a80184;hp=4f6c2a6abcc1c01423f8ddc1f4fb42b979278766;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git

diff --git a/src/jalview/schemes/NucleotideColourScheme.java b/src/jalview/schemes/NucleotideColourScheme.java
index 4f6c2a6..4977107 100755
--- a/src/jalview/schemes/NucleotideColourScheme.java
+++ b/src/jalview/schemes/NucleotideColourScheme.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * 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,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,59 +36,29 @@ public class NucleotideColourScheme extends ResidueColourScheme
    */
   public NucleotideColourScheme()
   {
-    super(ResidueProperties.nucleotideIndex, ResidueProperties.nucleotide,
-            0);
+    super(ResidueProperties.nucleotideIndex, ResidueProperties.nucleotide);
   }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param n
-   *          DOCUMENT ME!
-   * 
-   * @return DOCUMENT ME!
-   */
   @Override
-  public Color findColour(char c)
+  public boolean isNucleotideSpecific()
   {
-    // System.out.println("called"); log.debug
-    return colors[ResidueProperties.nucleotideIndex[c]];
+    return true;
+  }
+
+  @Override
+  public String getSchemeName()
+  {
+    return JalviewColourScheme.Nucleotide.toString();
   }
 
   /**
-   * DOCUMENT ME!
-   * 
-   * @param n
-   *          DOCUMENT ME!
-   * @param j
-   *          DOCUMENT ME!
-   * 
-   * @return DOCUMENT ME!
+   * Returns a new instance of this colour scheme with which the given data may
+   * be coloured
    */
   @Override
-  public Color findColour(char c, int j, SequenceI seq)
+  public ColourSchemeI getInstance(AlignViewportI view,
+          AnnotatedCollectionI coll)
   {
-    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;
+    return new NucleotideColourScheme();
   }
 }