X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FPurinePyrimidineColourScheme.java;h=1b36f3040f5c6fd0d5c7b4f9bf4fbc11674d66ea;hb=7091ed4ecff294623230f96ed93f9a5689ea5938;hp=e451135fcdb3a598dfe00f2c6d65ae0fb804f8b9;hpb=94379c810f9115b8564ee7bac46ed119218d5fd2;p=jalview.git diff --git a/src/jalview/schemes/PurinePyrimidineColourScheme.java b/src/jalview/schemes/PurinePyrimidineColourScheme.java index e451135..1b36f30 100644 --- a/src/jalview/schemes/PurinePyrimidineColourScheme.java +++ b/src/jalview/schemes/PurinePyrimidineColourScheme.java @@ -24,7 +24,6 @@ import jalview.datamodel.AnnotatedCollectionI; import jalview.datamodel.SequenceCollectionI; import jalview.datamodel.SequenceI; -import java.awt.Color; import java.util.Map; /** @@ -40,58 +39,7 @@ public class PurinePyrimidineColourScheme extends ResidueColourScheme public PurinePyrimidineColourScheme() { super(ResidueProperties.purinepyrimidineIndex, - ResidueProperties.purinepyrimidine, 0); - } - - /** - * Finds the corresponding color for the type of character inputed - * - * @param c - * Character in sequence - * - * @return Color from purinepyrimidineIndex in - * jalview.schemes.ResidueProperties - */ - @Override - public Color findColour(char c) - { - return colors[ResidueProperties.purinepyrimidineIndex[c]]; - } - - /** - * Returns color based on conservation - * - * @param c - * Character in sequence - * @param j - * Threshold - * - * @return Color in RGB - */ - public Color findColour(char c, int j) - { - Color currentColour; - if ((threshold == 0) || aboveThreshold(c, j)) - { - try - { - currentColour = colors[ResidueProperties.purinepyrimidineIndex[c]]; - } catch (Exception ex) - { - return Color.white; - } - } - else - { - return Color.white; - } - - if (conservationColouring) - { - currentColour = applyConservation(currentColour, j); - } - - return currentColour; + ResidueProperties.purinepyrimidine); } @Override