X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2FSequenceGroup.java;h=3199240b9424bfb8a7eec82e483ab8a90e0ae0d7;hb=refs%2Fheads%2Ffeatures%2FJAL-2094_colourInterface;hp=046f1e6cda95f029b3156180e2e2bb94ab037006;hpb=ab4e8d6988969d68d972d308c4159e9b9eb51e84;p=jalview.git diff --git a/src/jalview/datamodel/SequenceGroup.java b/src/jalview/datamodel/SequenceGroup.java index 046f1e6..3199240 100755 --- a/src/jalview/datamodel/SequenceGroup.java +++ b/src/jalview/datamodel/SequenceGroup.java @@ -22,6 +22,8 @@ package jalview.datamodel; import jalview.analysis.AAFrequency; import jalview.analysis.Conservation; +import jalview.api.ColorI; +import jalview.schemes.Colour; import jalview.schemes.ColourSchemeI; import jalview.schemes.ResidueProperties; @@ -82,15 +84,15 @@ public class SequenceGroup implements AnnotatedCollectionI // end column (base 0) int endRes = 0; - public Color outlineColour = Color.black; + public ColorI outlineColour = Colour.black; - public Color idColour = null; + public ColorI idColour = null; public int thresholdTextColour = 0; - public Color textColour = Color.black; + public ColorI textColour = Colour.black; - public Color textColour2 = Color.white; + public ColorI textColour2 = Colour.white; /** * consensus calculation property @@ -824,7 +826,7 @@ public class SequenceGroup implements AnnotatedCollectionI */ public void setOutlineColour(Color c) { - outlineColour = c; + outlineColour = new Colour(c); } /** @@ -832,7 +834,7 @@ public class SequenceGroup implements AnnotatedCollectionI * * @return DOCUMENT ME! */ - public Color getOutlineColour() + public ColorI getOutlineColour() { return outlineColour; } @@ -905,7 +907,7 @@ public class SequenceGroup implements AnnotatedCollectionI /** * @return the idColour */ - public Color getIdColour() + public ColorI getIdColour() { return idColour; } @@ -916,7 +918,7 @@ public class SequenceGroup implements AnnotatedCollectionI */ public void setIdColour(Color idColour) { - this.idColour = idColour; + this.idColour = new Colour(idColour); } /**