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
JAL-2371 CollectionColourScheme wraps ColourSchemeI
[jalview.git]
/
src
/
jalview
/
gui
/
UserDefinedColours.java
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
012edb6
..
8af0af0
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-109,7
+109,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
if (seqGroup != null)
{
if (seqGroup != null)
{
- oldColourScheme = seqGroup.cs;
+ oldColourScheme = seqGroup.getColourScheme();
}
else
{
}
else
{
@@
-521,7
+521,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
if (seqGroup != null)
{
if (seqGroup != null)
{
- seqGroup.cs = ucs;
+ seqGroup.setColourScheme(ucs);
ap.paintAlignment(true);
}
else if (ap != null)
ap.paintAlignment(true);
}
else if (ap != null)
@@
-585,10
+585,10
@@
public class UserDefinedColours extends GUserDefinedColours implements
ucs.setLowerCaseColours(newColours);
}
ucs.setLowerCaseColours(newColours);
}
- if (ap != null)
- {
- ucs.setThreshold(0, ap.av.isIgnoreGapsConsensus());
- }
+ // if (ap != null)
+ // {
+ // ucs.setThreshold(0, ap.av.isIgnoreGapsConsensus());
+ // }
return ucs;
}
return ucs;
}
@@
-820,7
+820,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
{
if (seqGroup != null)
{
{
if (seqGroup != null)
{
- seqGroup.cs = oldColourScheme;
+ seqGroup.setColourScheme(oldColourScheme);
}
else
{
}
else
{