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
/
gui
/
AlignViewportTest.java
diff --git
a/test/jalview/gui/AlignViewportTest.java
b/test/jalview/gui/AlignViewportTest.java
index
977e901
..
bd36a08
100644
(file)
--- a/
test/jalview/gui/AlignViewportTest.java
+++ b/
test/jalview/gui/AlignViewportTest.java
@@
-28,6
+28,14
@@
import static org.testng.AssertJUnit.assertSame;
import static org.testng.AssertJUnit.assertTrue;
import jalview.api.AlignViewportI;
import static org.testng.AssertJUnit.assertTrue;
import jalview.api.AlignViewportI;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.testng.Assert;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
import jalview.bin.Cache;
import jalview.bin.Jalview;
import jalview.datamodel.AlignedCodonFrame;
import jalview.bin.Cache;
import jalview.bin.Jalview;
import jalview.datamodel.AlignedCodonFrame;
@@
-50,14
+58,6
@@
import jalview.util.MapList;
import jalview.viewmodel.AlignmentViewport;
import jalview.viewmodel.ViewportRanges;
import jalview.viewmodel.AlignmentViewport;
import jalview.viewmodel.ViewportRanges;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.testng.Assert;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
public class AlignViewportTest
{
public class AlignViewportTest
{
@@
-301,7
+301,7
@@
public class AlignViewportTest
AlignViewport viewport = af.getViewport();
synchronized (this)
{
AlignViewport viewport = af.getViewport();
synchronized (this)
{
- while (viewport.getAlignmentConservationAnnotation() != null)
+ while (viewport.getCalcManager().isWorking())
{
try
{
{
try
{