git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4c84306
)
JOptionPanes launched in new thread
author
amwaterhouse
<Andrew Waterhouse>
Tue, 21 Nov 2006 12:22:05 +0000
(12:22 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Tue, 21 Nov 2006 12:22:05 +0000
(12:22 +0000)
src/jalview/gui/Jalview2XML_V1.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/Jalview2XML_V1.java
b/src/jalview/gui/Jalview2XML_V1.java
index
491746a
..
b347864
100755
(executable)
--- a/
src/jalview/gui/Jalview2XML_V1.java
+++ b/
src/jalview/gui/Jalview2XML_V1.java
@@
-80,7
+80,7
@@
public class Jalview2XML_V1
*
\r
* @param file DOCUMENT ME!
\r
*/
\r
*
\r
* @param file DOCUMENT ME!
\r
*/
\r
- public AlignFrame LoadJalviewAlign(String file)
\r
+ public AlignFrame LoadJalviewAlign(final String file)
\r
{
\r
\r
jalview.gui.AlignFrame af = null;
\r
{
\r
\r
jalview.gui.AlignFrame af = null;
\r
@@
-138,27
+138,39
@@
public class Jalview2XML_V1
}
\r
while (jarentry != null);
\r
}
\r
}
\r
while (jarentry != null);
\r
}
\r
- catch(java.net.UnknownHostException ex)
\r
+ catch (final java.net.UnknownHostException ex)
\r
{
\r
ex.printStackTrace();
\r
{
\r
ex.printStackTrace();
\r
- System.err.println("Couldn't locate Jalview XML file : " +
\r
- ex + "\n");
\r
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
\r
- "Couldn't locate " + file,
\r
- "URL not found",
\r
- JOptionPane.WARNING_MESSAGE);
\r
+ javax.swing.SwingUtilities.invokeLater(new Runnable()
\r
+ {
\r
+ public void run()
\r
+ {
\r
\r
\r
+ System.err.println("Couldn't locate Jalview XML file : " +
\r
+ ex + "\n");
\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,
\r
+ "Couldn't locate " + file,
\r
+ "URL not found",
\r
+ JOptionPane.WARNING_MESSAGE);
\r
+ }
\r
+ });
\r
}
\r
catch (Exception ex)
\r
{
\r
ex.printStackTrace();
\r
}
\r
catch (Exception ex)
\r
{
\r
ex.printStackTrace();
\r
- System.err.println("Exception whilst loading jalview XML file : " +
\r
- ex + "\n");
\r
- JOptionPane.showInternalMessageDialog(Desktop.desktop,
\r
- "Error loading " + file,
\r
- "Error loading Jalview file",
\r
- JOptionPane.WARNING_MESSAGE);
\r
+ System.err.println("Exception whilst loading jalview XML file : " +
\r
+ ex + "\n");
\r
+ javax.swing.SwingUtilities.invokeLater(new Runnable()
\r
+ {
\r
+ public void run()
\r
+ {
\r
\r
\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,
\r
+ "Error loading " + file,
\r
+ "Error loading Jalview file",
\r
+ JOptionPane.WARNING_MESSAGE);
\r
+ }
\r
+ });
\r
}
\r
\r
return af;
\r
}
\r
\r
return af;
\r