From: jprocter <Jim Procter>
Date: Fri, 29 Aug 2008 11:04:04 +0000 (+0000)
Subject: always output to stderr for out of memory - (no dependence on OOM dialog here (for... 
X-Git-Tag: Release_2_4_0~8
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=257122218808f36ca2bb443d80738d50f8ae51d3;p=jalview.git

always output to stderr for out of memory - (no dependence on OOM dialog here (for sake of modularity))
---

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index f185205..2879f50 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -397,13 +397,11 @@ public class FileLoader implements Runnable
           }
         });
       }
-      else
-      {
-        System.err.println("Out of memory loading file " + file + "!!");
-      }
+      System.err.println("Out of memory loading file " + file + "!!");
+      
     }
     loadtime += System.currentTimeMillis();
-
+    // TODO: Estimate percentage of memory used by a newly loaded alignment - warn if more memory will be needed to work with it
     // System.gc();
     memused = memused - (rt.maxMemory() - rt.totalMemory() + rt.freeMemory()); // difference in free memory after load
     if (Desktop.desktop != null && Desktop.desktop.isShowMemoryUsage())