From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 31 Mar 2020 13:42:09 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~21^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=8e75819afe8c00b2046fff54c2ff21175ec7d7a1;hp=290d1c0638e869b08d5f2729472197873fa06af0;p=jalview.git

Merge branch 'develop' into Jalview-JS/develop
---

diff --git a/test/jalview/gui/AlignViewportTest.java b/test/jalview/gui/AlignViewportTest.java
index 959abb0..4e15dba 100644
--- a/test/jalview/gui/AlignViewportTest.java
+++ b/test/jalview/gui/AlignViewportTest.java
@@ -27,6 +27,14 @@ import static org.testng.AssertJUnit.assertNotSame;
 import static org.testng.AssertJUnit.assertSame;
 import static org.testng.AssertJUnit.assertTrue;
 
+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;
@@ -48,14 +56,6 @@ import jalview.structure.StructureSelectionManager;
 import jalview.util.MapList;
 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
 {
 
@@ -299,7 +299,7 @@ public class AlignViewportTest
     AlignViewport viewport = af.getViewport();
     synchronized (this)
     {
-      while (viewport.getAlignmentConservationAnnotation() != null)
+      while (viewport.getCalcManager().isWorking())
       {
         try
         {