Merge branch 'develop' into bug/JAL-4421_customise_volume_name_of_DMG_installers

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 1aca4d4..8336626 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -63,7 +63,6 @@ import java.util.Vector;
 
 import javax.swing.AbstractButton;
 import javax.swing.ButtonGroup;
-import javax.swing.ButtonModel;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JComponent;
 import javax.swing.JEditorPane;
@@ -73,6 +72,7 @@ import javax.swing.JLayeredPane;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JPanel;
+import javax.swing.JProgressBar;
 import javax.swing.JRadioButtonMenuItem;
 import javax.swing.JScrollPane;
 import javax.swing.SwingUtilities;
@@ -997,6 +997,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   }
 
   @Override
+  public JProgressBar getProgressBar(long id)
+  {
+    if (progressBar != null)
+      return progressBar.getProgressBar(id);
+    return null;
+  }
+
+  @Override
   public void registerHandler(final long id,
           final IProgressIndicatorHandler handler)
   {
@@ -3854,12 +3862,19 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     }
     else
     {
-      JInternalFrame frame = new JInternalFrame();
+      new Thread(new Runnable() {
+        @Override
+        public void run()
+        {
+               JInternalFrame frame = new JInternalFrame();
       frame.setFrameIcon(null);
       frame.setContentPane(new PairwiseAlignPanel(viewport));
       Desktop.addInternalFrame(frame,
               MessageManager.getString("action.pairwise_alignment"), 600,
               500);
+        }
+      }).start();
+      
     }
   }