git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kjvdh/features/PhylogenyViewer_tabbedsupport' into merge/2_11_2/kjvdh...
[jalview.git]
/
src
/
jalview
/
io
/
FileLoader.java
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
4016e71
..
fec0b3a
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-111,7
+111,7
@@
public class FileLoader implements Runnable
this.protocol = protocol;
this.format = format;
this.protocol = protocol;
this.format = format;
- final Thread loader = new Thread(this);
+ final Thread loader = new Thread(this, "LoadFileThread");
SwingUtilities.invokeLater(new Runnable()
{
SwingUtilities.invokeLater(new Runnable()
{
@@
-209,7
+209,6
@@
public class FileLoader implements Runnable
protected AlignFrame _LoadFileWaitTillLoaded()
{
this.run();
protected AlignFrame _LoadFileWaitTillLoaded()
{
this.run();
-
return alignFrame;
}
return alignFrame;
}