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
Show hide cols and rows
[jalview.git]
/
src
/
jalview
/
io
/
FileLoader.java
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
7db0b90
..
67c72c2
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-167,11
+167,6
@@
public class FileLoader
Desktop.addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH,
\r
AlignFrame.NEW_WINDOW_HEIGHT);
\r
\r
Desktop.addInternalFrame(af, file, AlignFrame.NEW_WINDOW_WIDTH,
\r
AlignFrame.NEW_WINDOW_HEIGHT);
\r
\r
- if(jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false))
\r
- {
\r
- af.wrapMenuItem.setSelected(true);
\r
- af.wrapMenuItem_actionPerformed(null);
\r
- }
\r
try
\r
{
\r
af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
\r
try
\r
{
\r
af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
\r
@@
-184,6
+179,8
@@
public class FileLoader
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
+ Desktop.instance.stopLoading();
\r
+
\r
JOptionPane.showInternalMessageDialog(Desktop.desktop,
\r
"Couldn't load file " + file +
\r
"\n"
\r
JOptionPane.showInternalMessageDialog(Desktop.desktop,
\r
"Couldn't load file " + file +
\r
"\n"
\r
@@
-199,6
+196,7
@@
public class FileLoader
}
\r
\r
Desktop.instance.stopLoading();
\r
}
\r
\r
Desktop.instance.stopLoading();
\r
+
\r
}
\r
}
\r
\r
}
\r
}
\r
\r