X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOOMWarning.java;h=e37dd07736e110bd7fe70c43adb0f39e2da93996;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=9b698254c678f8fd3563471b43eb3af1de660da5;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git

diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java
index 9b69825..e37dd07 100644
--- a/src/jalview/gui/OOMWarning.java
+++ b/src/jalview/gui/OOMWarning.java
@@ -1,79 +1,89 @@
-/*
- * 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.gui;
-
-import java.awt.Component;
-
-public class OOMWarning implements Runnable
-{
-  String action = null;
-
-  String instructions = "";
-
-  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.
-   */
-  OOMWarning(String action, OutOfMemoryError oomex, Component instance)
-  {
-    this.action = action;
-    desktop = instance;
-    if (oomex != null)
-    {
-      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();
-  }
-
-  public OOMWarning(String string, OutOfMemoryError oomerror)
-  {
-    this(string, oomerror, Desktop.desktop);
-  }
-
-  public void run()
-  {
-    javax.swing.JOptionPane
-            .showInternalMessageDialog(
-                    desktop,
-                    "Out of memory when "
-                            + action
-                            + "!!"
-                            + "\nSee help files for increasing Java Virtual Machine memory.",
-                    "Out of memory",
-                    javax.swing.JOptionPane.WARNING_MESSAGE);
-  }
-
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * 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.
+ *  
+ * 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.gui;
+
+import jalview.util.MessageManager;
+
+import java.awt.Component;
+
+public class OOMWarning implements Runnable
+{
+  String action = null;
+
+  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.
+   */
+  OOMWarning(final String action, final OutOfMemoryError oomex,
+          final Component instance)
+  {
+    if (!oomInprogress)
+    {
+      oomInprogress = true;
+      this.action = action;
+      desktop = instance;
+      if (oomex != null)
+      {
+        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();
+    }
+  }
+
+  public OOMWarning(String string, OutOfMemoryError oomerror)
+  {
+    this(string, oomerror, Desktop.desktop);
+  }
+
+  public void run()
+  {
+    javax.swing.JOptionPane.showInternalMessageDialog(desktop,
+            MessageManager.formatMessage("warn.out_of_memory_when_action",
+                    new String[] { action }), MessageManager
+                    .getString("label.out_of_memory"),
+            javax.swing.JOptionPane.WARNING_MESSAGE);
+    // hope that there's enough memory left that no more appear.
+    oomInprogress = false;
+  }
+
+}