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 'spike/relaunch_memsetingds' into spikes/jim
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
3270144
..
f776b27
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-185,7
+185,18
@@
public class Jalview
*/
public static void main(String[] args)
{
*/
public static void main(String[] args)
{
- instance = new Jalview();
+ float ONE_MB = 1048576f;
+ Runtime runtime = Runtime.getRuntime();
+ float maxMemory = runtime.maxMemory() / ONE_MB;
+ if (maxMemory < 1024 * 15)
+ {
+ System.exit();
+ }
+
+ if (System.ge)
+ {
+ instance = new Jalview();
+ }
instance.doMain(args);
}
instance.doMain(args);
}