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 'develop' into trialMerge
[jalview.git]
/
src
/
jalview
/
io
/
FileLoader.java
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
2a18b0b
..
3afbaad
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-193,6
+193,9
@@
public class FileLoader implements Runnable
Thread.sleep(500);
} catch (Exception ex)
{
Thread.sleep(500);
} catch (Exception ex)
{
+ System.out.println(
+ "Exception caught while waiting for FileLoader thread");
+ ex.printStackTrace();
}
}
}
}
@@
-440,7
+443,7
@@
public class FileLoader implements Runnable
alignFrame.getViewport()
.applyFeaturesStyle(proxyColourScheme);
}
alignFrame.getViewport()
.applyFeaturesStyle(proxyColourScheme);
}
- alignFrame.statusBar.setText(MessageManager.formatMessage(
+ alignFrame.setStatus(MessageManager.formatMessage(
"label.successfully_loaded_file", new String[]
{ title }));
"label.successfully_loaded_file", new String[]
{ title }));