git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/JAL-2094_colourInterface
[jalview.git]
/
src
/
jalview
/
datamodel
/
SequenceGroup.java
diff --git
a/src/jalview/datamodel/SequenceGroup.java
b/src/jalview/datamodel/SequenceGroup.java
index
046f1e6
..
3199240
100755
(executable)
--- 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.analysis.AAFrequency;
import jalview.analysis.Conservation;
+import jalview.api.ColorI;
+import jalview.schemes.Colour;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ResidueProperties;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ResidueProperties;
@@
-82,15
+84,15
@@
public class SequenceGroup implements AnnotatedCollectionI
// end column (base 0)
int endRes = 0;
// 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 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
/**
* consensus calculation property
@@
-824,7
+826,7
@@
public class SequenceGroup implements AnnotatedCollectionI
*/
public void setOutlineColour(Color c)
{
*/
public void setOutlineColour(Color c)
{
- outlineColour = c;
+ outlineColour = new Colour(c);
}
/**
}
/**
@@
-832,7
+834,7
@@
public class SequenceGroup implements AnnotatedCollectionI
*
* @return DOCUMENT ME!
*/
*
* @return DOCUMENT ME!
*/
- public Color getOutlineColour()
+ public ColorI getOutlineColour()
{
return outlineColour;
}
{
return outlineColour;
}
@@
-905,7
+907,7
@@
public class SequenceGroup implements AnnotatedCollectionI
/**
* @return the idColour
*/
/**
* @return the idColour
*/
- public Color getIdColour()
+ public ColorI getIdColour()
{
return idColour;
}
{
return idColour;
}
@@
-916,7
+918,7
@@
public class SequenceGroup implements AnnotatedCollectionI
*/
public void setIdColour(Color idColour)
{
*/
public void setIdColour(Color idColour)
{
- this.idColour = idColour;
+ this.idColour = new Colour(idColour);
}
/**
}
/**