JAL-1753 JAL-1596 JAL-1933 ensure AWT updates are on AWT thread

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

diff --git a/src/jalview/gui/JalviewChimeraBindingModel.java b/src/jalview/gui/JalviewChimeraBindingModel.java
index 6b02bf5..bd890d9 100644 (file)
--- a/src/jalview/gui/JalviewChimeraBindingModel.java
+++ b/src/jalview/gui/JalviewChimeraBindingModel.java
@@ -21,11 +21,15 @@
 package jalview.gui;
 
 import jalview.api.AlignmentViewPanel;
+import jalview.api.structures.JalviewStructureDisplayI;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 import jalview.ext.rbvi.chimera.JalviewChimeraBinding;
+import jalview.io.DataSourceType;
 import jalview.structure.StructureSelectionManager;
 
+import javax.swing.SwingUtilities;
+
 public class JalviewChimeraBindingModel extends JalviewChimeraBinding
 {
   private ChimeraViewFrame cvf;
@@ -35,7 +39,7 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding
 
   public JalviewChimeraBindingModel(ChimeraViewFrame chimeraViewFrame,
           StructureSelectionManager ssm, PDBEntry[] pdbentry,
-          SequenceI[][] sequenceIs, String protocol)
+          SequenceI[][] sequenceIs, DataSourceType protocol)
   {
     super(ssm, pdbentry, sequenceIs, protocol);
     cvf = chimeraViewFrame;
@@ -120,17 +124,13 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding
   protected void sendAsynchronousCommand(final String command,
           final String progressMsg)
   {
-    Thread thread = new Thread(new Runnable()
+    final long handle = progressMsg == null ? 0 : cvf
+            .startProgressBar(progressMsg);
+    SwingUtilities.invokeLater(new Runnable()
     {
-
       @Override
       public void run()
       {
-        long handle = 0;
-        if (progressMsg != null)
-        {
-          handle = cvf.startProgressBar(progressMsg);
-        }
         try
         {
           sendChimeraCommand(command, false);
@@ -143,9 +143,11 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding
         }
       }
     });
-    thread.start();
-
   }
 
-
+  @Override
+  public JalviewStructureDisplayI getViewer()
+  {
+    return cvf;
+  }
 }