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:
1e82ec9
)
JAL-1173 try to catch OOMs when loading annotation onto alignment (need JAL-1176...
author
jprocter
<jprocter@compbio.dundee.ac.uk>
Tue, 25 Sep 2012 10:19:15 +0000
(11:19 +0100)
committer
jprocter
<jprocter@compbio.dundee.ac.uk>
Tue, 25 Sep 2012 10:19:15 +0000
(11:19 +0100)
src/jalview/gui/AlignFrame.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
97829d4
..
8396e6a
100755
(executable)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-4976,6
+4976,13
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
{
ex.printStackTrace();
}
+ catch (OutOfMemoryError oom)
+ {
+ try {
+ System.gc();
+ } catch (Exception x){};
+ new OOMWarning("loading data "+(protocol!=null ? (protocol.equals(FormatAdapter.PASTE) ? "from clipboard." : "using "+protocol+" from "+file) : ".")+(format!=null ? "(parsing as '"+format+"' file)" :""), oom, Desktop.desktop);
+ }
}
@Override