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

diff --git a/src/jalview/schemes/NucleotideColourScheme.java b/src/jalview/schemes/NucleotideColourScheme.java
index 8785954..4977107 100755
--- a/src/jalview/schemes/NucleotideColourScheme.java
+++ b/src/jalview/schemes/NucleotideColourScheme.java
@@ -1,79 +1,64 @@
-/*
-* 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.*;
-
-
-/**
- * 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(String n)
-    {
-        // System.out.println("called"); log.debug
-        return colors[((Integer) (ResidueProperties.nucleotideHash.get(n))).intValue()];
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @param n DOCUMENT ME!
-     * @param j DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview 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 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview 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 Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.schemes;
+
+import jalview.api.AlignViewportI;
+import jalview.datamodel.AnnotatedCollectionI;
+
+/**
+ * DOCUMENT ME!
+ * 
+ * @author $author$
+ * @version $Revision$
+ */
+public class NucleotideColourScheme extends ResidueColourScheme
+{
+  /**
+   * Creates a new NucleotideColourScheme object.
+   */
+  public NucleotideColourScheme()
+  {
+    super(ResidueProperties.nucleotideIndex, ResidueProperties.nucleotide);
+  }
+
+  @Override
+  public boolean isNucleotideSpecific()
+  {
+    return true;
+  }
+
+  @Override
+  public String getSchemeName()
+  {
+    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();
+  }
+}