JAL-3253 temporary branch SwingJS upgrade with testNG fixes Java 8

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 2371be3..e44ccdc 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -1121,7 +1121,7 @@ public class AlignFrame extends GAlignFrame
         // need to refactor Desktop.addFrame
         newframe.featureSettings_actionPerformed(null);
         final FeatureSettings nfs = newframe.featureSettings;
-        SwingUtilities.invokeLater(new Runnable()
+        Jalview.execRunnable(new Runnable()
         {
           @Override
           public void run()
@@ -4167,6 +4167,10 @@ public class AlignFrame extends GAlignFrame
    */
   public void BuildWebServiceMenu()
   {
+    if (Jalview.isSynchronous())
+    {
+      return;
+    }
     while (buildingMenu)
     {
       try
@@ -5156,12 +5160,12 @@ public class AlignFrame extends GAlignFrame
 
     });
     rfetch.add(fetchr);
-    new Thread(new Runnable()
+    Jalview.execThread(new Thread(new Runnable()
     {
       @Override
       public void run()
       {
-        javax.swing.SwingUtilities.invokeLater(new Runnable()
+        Jalview.execRunnable(new Runnable()
         {
           @Override
           public void run()
@@ -5380,7 +5384,7 @@ public class AlignFrame extends GAlignFrame
           }
         });
       }
-    }).start();
+    }));
 
   }