X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOOMWarning.java;h=2195fb23fadd1dd35ff59502fa98b3f0483e7515;hb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;hp=a2d1ede1833de3b9e97adca18d231263a439bf3e;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git

diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java
index a2d1ede..2195fb2 100644
--- a/src/jalview/gui/OOMWarning.java
+++ b/src/jalview/gui/OOMWarning.java
@@ -1,20 +1,19 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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 file is part of Jalview.
  * 
- * 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.
+ * Jalview 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 3 of the License, or (at your option) any later version.
  * 
- * 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
+ * Jalview 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 Jalview.  If not, see <http://www.gnu.org/licenses/>.
  */
 package jalview.gui;
 
@@ -26,36 +25,44 @@ public class OOMWarning implements Runnable
 
   String instructions = "";
 
+  public static boolean oomInprogress = false;
+
   Component desktop = null;
 
   /**
    * Raise an out of memory error.
    * 
-   * @param action -
-   *                what was going on when OutOfMemory exception occured.
-   * @param instance -
-   *                Window where the dialog will appear
-   * @param oomex -
-   *                the actual exception - to be written to stderr or debugger.
+   * @param action
+   *          - what was going on when OutOfMemory exception occured.
+   * @param instance
+   *          - Window where the dialog will appear
+   * @param oomex
+   *          - the actual exception - to be written to stderr or debugger.
    */
-  OOMWarning(String action, OutOfMemoryError oomex, Component instance)
+  OOMWarning(final String action, final OutOfMemoryError oomex,
+          final Component instance)
   {
-    this.action = action;
-    desktop = instance;
-    if (oomex != null)
+    if (!oomInprogress)
     {
-      if (jalview.bin.Cache.log != null)
-      {
-        jalview.bin.Cache.log.error("Out of Memory when " + action, oomex);
-      }
-      else
+      oomInprogress = true;
+      this.action = action;
+      desktop = instance;
+      if (oomex != null)
       {
-        System.err.println("Out of Memory when " + action);
-        oomex.printStackTrace();
+        if (jalview.bin.Cache.log != null)
+        {
+          jalview.bin.Cache.log
+                  .error("Out of Memory when " + action, oomex);
+        }
+        else
+        {
+          System.err.println("Out of Memory when " + action);
+          oomex.printStackTrace();
+        }
       }
+      javax.swing.SwingUtilities.invokeLater(this);
+      System.gc();
     }
-    javax.swing.SwingUtilities.invokeLater(this);
-    System.gc();
   }
 
   public OOMWarning(String string, OutOfMemoryError oomerror)
@@ -74,6 +81,8 @@ public class OOMWarning implements Runnable
                             + "\nSee help files for increasing Java Virtual Machine memory.",
                     "Out of memory",
                     javax.swing.JOptionPane.WARNING_MESSAGE);
+    // hope that there's enough memory left that no more appear.
+    oomInprogress = false;
   }
 
 }