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 remote-tracking branch 'origin/develop' into features/JAL-2316
[jalview.git]
/
test
/
jalview
/
schemes
/
FeatureColourTest.java
diff --git
a/test/jalview/schemes/FeatureColourTest.java
b/test/jalview/schemes/FeatureColourTest.java
index
47613a1
..
c16d541
100644
(file)
--- a/
test/jalview/schemes/FeatureColourTest.java
+++ b/
test/jalview/schemes/FeatureColourTest.java
@@
-27,6
+27,7
@@
import static org.testng.AssertJUnit.fail;
import jalview.datamodel.SequenceFeature;
import jalview.gui.JvOptionPane;
import jalview.datamodel.SequenceFeature;
import jalview.gui.JvOptionPane;
+import jalview.util.ColorUtils;
import jalview.util.Format;
import java.awt.Color;
import jalview.util.Format;
import java.awt.Color;
@@
-146,7
+147,7
@@
public class FeatureColourTest
fc.setColourByLabel(true);
SequenceFeature sf = new SequenceFeature("type", "desc", 0, 20, 1f,
null);
fc.setColourByLabel(true);
SequenceFeature sf = new SequenceFeature("type", "desc", 0, 20, 1f,
null);
- Color expected = UserColourScheme.createColourFromName("desc");
+ Color expected = ColorUtils.createColourFromName("desc");
assertEquals(expected, fc.getColor(sf));
}
assertEquals(expected, fc.getColor(sf));
}