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 alpha/JAL-3362_Jalview_212_alpha
[jalview.git]
/
test
/
jalview
/
renderer
/
ResidueColourFinderTest.java
diff --git
a/test/jalview/renderer/ResidueColourFinderTest.java
b/test/jalview/renderer/ResidueColourFinderTest.java
index
81fb2c0
..
da50e8f
100644
(file)
--- a/
test/jalview/renderer/ResidueColourFinderTest.java
+++ b/
test/jalview/renderer/ResidueColourFinderTest.java
@@
-22,6
+22,7
@@
package jalview.renderer;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertEquals;
+import jalview.api.AlignViewportI;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Sequence;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Sequence;
@@
-30,7
+31,6
@@
import jalview.gui.AlignViewport;
import jalview.gui.JvOptionPane;
import jalview.schemes.UserColourScheme;
import jalview.schemes.ZappoColourScheme;
import jalview.gui.JvOptionPane;
import jalview.schemes.UserColourScheme;
import jalview.schemes.ZappoColourScheme;
-
import java.awt.Color;
import org.testng.annotations.BeforeClass;
import java.awt.Color;
import org.testng.annotations.BeforeClass;
@@
-51,7
+51,7
@@
public class ResidueColourFinderTest
{
SequenceI seq = new Sequence("name", "MATVLGSPRAPAFF"); // FER1_MAIZE...
AlignmentI al = new Alignment(new SequenceI[] { seq });
{
SequenceI seq = new Sequence("name", "MATVLGSPRAPAFF"); // FER1_MAIZE...
AlignmentI al = new Alignment(new SequenceI[] { seq });
- final AlignViewport av = new AlignViewport(al);
+ final AlignViewportI av = new AlignViewport(al);
ResidueColourFinder rcf = new ResidueColourFinder();
av.setGlobalColourScheme(new ZappoColourScheme());
ResidueColourFinder rcf = new ResidueColourFinder();
av.setGlobalColourScheme(new ZappoColourScheme());
@@
-86,7
+86,7
@@
public class ResidueColourFinderTest
{
SequenceI seq = new Sequence("name", "MA--TVLGSPRAPAFF");
AlignmentI al = new Alignment(new SequenceI[] { seq });
{
SequenceI seq = new Sequence("name", "MA--TVLGSPRAPAFF");
AlignmentI al = new Alignment(new SequenceI[] { seq });
- final AlignViewport av = new AlignViewport(al);
+ final AlignViewportI av = new AlignViewport(al);
ResidueColourFinder rcf = new ResidueColourFinder();
assertEquals(Color.white,
ResidueColourFinder rcf = new ResidueColourFinder();
assertEquals(Color.white,
@@
-109,7
+109,7
@@
public class ResidueColourFinderTest
SequenceI seq = new Sequence("name", "MAT--GSPRAPAFF"); // FER1_MAIZE... + a
// gap
AlignmentI al = new Alignment(new SequenceI[] { seq });
SequenceI seq = new Sequence("name", "MAT--GSPRAPAFF"); // FER1_MAIZE... + a
// gap
AlignmentI al = new Alignment(new SequenceI[] { seq });
- final AlignViewport av = new AlignViewport(al);
+ final AlignViewportI av = new AlignViewport(al);
ResidueColourFinder rcf = new ResidueColourFinder();
Color[] newColours = new Color[24];
ResidueColourFinder rcf = new ResidueColourFinder();
Color[] newColours = new Color[24];