JAL-2360 ColourSchemes holds configured schemes, AlignFrame colour menu

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

diff --git a/src/jalview/schemes/ResidueColourScheme.java b/src/jalview/schemes/ResidueColourScheme.java
index 38ab622..9cc4bd1 100755 (executable)
--- a/src/jalview/schemes/ResidueColourScheme.java
+++ b/src/jalview/schemes/ResidueColourScheme.java
@@ -29,7 +29,6 @@ import jalview.datamodel.SequenceCollectionI;
 import jalview.datamodel.SequenceI;
 import jalview.util.ColorUtils;
 import jalview.util.Comparison;
-import jalview.util.MessageManager;
 
 import java.awt.Color;
 import java.util.Map;
@@ -37,7 +36,7 @@ import java.util.Map;
 /**
  * Base class for residue-based colour schemes
  */
-public class ResidueColourScheme implements ColourSchemeI
+public abstract class ResidueColourScheme implements ColourSchemeI
 {
   public static final String NONE = "None";
 
@@ -117,6 +116,7 @@ public class ResidueColourScheme implements ColourSchemeI
   @Override
   public Color findColour()
   {
+    // TODO delete this method in favour of ColorUtils.parseColourString()?
     return findColour('A');
   }
 
@@ -346,24 +346,9 @@ public class ResidueColourScheme implements ColourSchemeI
   {
   }
 
-  @Override
-  public ColourSchemeI applyTo(AnnotatedCollectionI sg,
-          Map<SequenceI, SequenceCollectionI> hiddenRepSequences)
-  {
-    try
-    {
-      return getClass().newInstance();
-    } catch (Exception q)
-    {
-      throw new Error(MessageManager.formatMessage(
-              "error.implementation_error_cannot_duplicate_colour_scheme",
-              new String[] { getClass().getName() }), q);
-    }
-  }
-
   /**
    * Answers false if the colour scheme is nucleotide or peptide specific, and
-   * the data does not match, else false. Override to modify or extend this test
+   * the data does not match, else true. Override to modify or extend this test
    * as required.
    */
   @Override
@@ -426,10 +411,4 @@ public class ResidueColourScheme implements ColourSchemeI
   {
     return false;
   }
-
-  @Override
-  public String getSchemeName()
-  {
-    return "Residue";
-  }
 }