X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileLoader.java;h=2879f50ea35aa05c02bbb53b4af8831a567c32d7;hb=257122218808f36ca2bb443d80738d50f8ae51d3;hp=3a77b7301e5f7754f7b08e7068dced0bc40c5238;hpb=b92eeace1b8b5237b3719a4d5b42e8a60af015e9;p=jalview.git

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 3a77b73..2879f50 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -1,22 +1,21 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
+ * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
-
 package jalview.io;
 
 import java.util.*;
@@ -398,22 +397,16 @@ 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();
-
-    if (Desktop.instance != null)
-    {
-      Desktop.instance.stopLoading();
-    }
+    // 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 (alignFrame != null)
+    if (Desktop.desktop != null && Desktop.desktop.isShowMemoryUsage())
     {
-      if (Desktop.desktop != null && Desktop.desktop.isShowMemoryUsage())
+      if (alignFrame != null)
       {
         AlignmentI al = alignFrame.getViewport().getAlignment();
 
@@ -421,8 +414,18 @@ public class FileLoader implements Runnable
                 + (loadtime / 1000.0) + "s, took an additional "
                 + (1.0 * memused / (1024.0 * 1024.0)) + " MB ("
                 + al.getHeight() + " seqs by " + al.getWidth() + " cols)");
+      } else {
+        // report that we didn't load anything probably due to an out of memory error
+        System.out.println("Failed to load '"+title+"' in "
+                + (loadtime / 1000.0) + "s, took an additional "
+                + (1.0 * memused / (1024.0 * 1024.0)) + " MB (alignment is null)");
       }
     }
+    // remove the visual delay indicator
+    if (Desktop.instance != null)
+    {
+      Desktop.instance.stopLoading();
+    }
 
   }