X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOOMWarning.java;h=dc5d0f5232ae2e8997c001476fd88b3a76f226f5;hb=87256ba36fb105a1115067ffe2563412e9281d2d;hp=3f2b5a8f058657d6e7c1aaec7bed12934e4e281b;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java
index 3f2b5a8..dc5d0f5 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.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
- *
- * 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 .
- */
-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(final String action, final OutOfMemoryError oomex,
- final 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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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 .
+ * 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.getDesktopPane());
+ }
+
+ @Override
+ public void run()
+ {
+ oomInprogress = false;
+ JvOptionPane.showInternalMessageDialog(desktop, MessageManager
+ .formatMessage("warn.out_of_memory_when_action", new String[]
+ { action }), MessageManager.getString("label.out_of_memory"),
+ JvOptionPane.WARNING_MESSAGE);
+ // hope that there's enough memory left that no more appear.
+ }
+
+}