X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fschemes%2FPIDColourSchemeTest.java;h=dff19cd65228c4be92aed3937c7d3a830157ee8e;hb=1140532d01b32b648e7e5b17ea717ae790625f8f;hp=fa4b5d922614ae6f7d0a6d821515aa6d63d0bdd9;hpb=301bcabf2b63d653ab9f5ce7102c1ea8951d6d75;p=jalview.git

diff --git a/test/jalview/schemes/PIDColourSchemeTest.java b/test/jalview/schemes/PIDColourSchemeTest.java
index fa4b5d9..dff19cd 100644
--- a/test/jalview/schemes/PIDColourSchemeTest.java
+++ b/test/jalview/schemes/PIDColourSchemeTest.java
@@ -1,17 +1,37 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.schemes;
 
 import static org.testng.Assert.assertEquals;
 
+import java.awt.Color;
+
+import org.testng.annotations.Test;
+
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignFrame;
 import jalview.gui.AlignViewport;
 import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
 
-import java.awt.Color;
-
-import org.testng.annotations.Test;
-
 public class PIDColourSchemeTest
 {
   static final Color white = Color.white;
@@ -85,18 +105,15 @@ public class PIDColourSchemeTest
             DataSourceType.PASTE);
     AlignViewport viewport = af.getViewport();
     viewport.setIgnoreGapsConsensus(false, af.alignPanel);
-    while (viewport.getConsensusSeq() == null)
+    do
     {
-      synchronized (this)
+      try
+      {
+        Thread.sleep(50);
+      } catch (InterruptedException x)
       {
-        try
-        {
-          wait(50);
-        } catch (InterruptedException e)
-        {
-        }
       }
-    }
+    } while (af.getViewport().getCalcManager().isWorking());
     af.changeColour_actionPerformed(JalviewColourScheme.PID.toString());
 
     SequenceI seq = viewport.getAlignment().getSequenceAt(0);
@@ -104,16 +121,14 @@ public class PIDColourSchemeTest
     /*
      * including gaps, A should be coloured for 50% consensus
      */
-    Color c = viewport
-            .getResidueShading().findColour('A', 0, seq);
+    Color c = viewport.getResidueShading().findColour('A', 0, seq);
     assertEquals(c, over40);
 
     /*
      * now choose to ignore gaps; colour should be for 67%
      */
     viewport.setIgnoreGapsConsensus(true, af.alignPanel);
-    c = viewport
-            .getResidueShading().findColour('A', 0, seq);
+    c = viewport.getResidueShading().findColour('A', 0, seq);
     assertEquals(c, over60);
   }
 }