X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FNucleotideColourScheme.java;h=39a0d6c9c3f51b9d126e48fd8c7bec03073a75ee;hb=7ebc9696776dd018372c73885706fad8648560c2;hp=0cca608c6dca3563dcd6ebc0ee6e7d22cfc34953;hpb=588042b69abf8e60bcc950b24c283933c7dd422f;p=jalview.git

diff --git a/src/jalview/schemes/NucleotideColourScheme.java b/src/jalview/schemes/NucleotideColourScheme.java
index 0cca608..39a0d6c 100755
--- a/src/jalview/schemes/NucleotideColourScheme.java
+++ b/src/jalview/schemes/NucleotideColourScheme.java
@@ -1,45 +1,88 @@
-/*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-*/
-package jalview.schemes;
-
-import java.awt.*;
-
-
-public class NucleotideColourScheme extends ResidueColourScheme {
-    public NucleotideColourScheme() {
-        super(ResidueProperties.nucleotide, 0);
-    }
-
-    public Color findColour(String n) {
-        // System.out.println("called"); log.debug
-        return colors[((Integer) (ResidueProperties.nucleotideHash.get(n))).intValue()];
-    }
-
-    public Color findColour(String n, int j) {
-        if ((threshold == 0) || aboveThreshold(n, j)) {
-            try {
-                return colors[((Integer) (ResidueProperties.nucleotideHash.get(n))).intValue()];
-            } catch (Exception ex) {
-                return Color.white;
-            }
-        } else {
-            return Color.white;
-        }
-    }
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
+ * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+package jalview.schemes;
+
+import java.awt.*;
+
+/**
+ * DOCUMENT ME!
+ * 
+ * @author $author$
+ * @version $Revision$
+ */
+public class NucleotideColourScheme extends ResidueColourScheme
+{
+  /**
+   * Creates a new NucleotideColourScheme object.
+   */
+  public NucleotideColourScheme()
+  {
+    super(ResidueProperties.nucleotide, 0);
+  }
+
+  /**
+   * DOCUMENT ME!
+   * 
+   * @param n
+   *                DOCUMENT ME!
+   * 
+   * @return DOCUMENT ME!
+   */
+  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!
+   */
+  public Color findColour(char c, int j)
+  {
+    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;
+  }
+}