X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOOMWarning.java;h=90d54112e0237236f63560a7f34a8dbbabe44b54;hb=a1984b1c8c273ed33c7ce9283039f4027dcae2de;hp=324b307b46777da276b646c0693aacdecf3c7483;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git

diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java
index 324b307..90d5411 100644
--- a/src/jalview/gui/OOMWarning.java
+++ b/src/jalview/gui/OOMWarning.java
@@ -1,88 +1,82 @@
-/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * 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 <http://www.gnu.org/licenses/>.
- */
-package jalview.gui;
-
-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,
-                    "Out of memory when "
-                            + action
-                            + "!!"
-                            + "\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;
-  }
-
-}
+/*
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
+package jalview.gui;
+
+import jalview.bin.Cache;
+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)
+      {
+        Cache.error("Out of Memory when " + action,
+                  oomex);
+      }
+      javax.swing.SwingUtilities.invokeLater(this);
+      System.gc();
+    }
+  }
+
+  public OOMWarning(String string, OutOfMemoryError oomerror)
+  {
+    this(string, oomerror, Desktop.desktop);
+  }
+
+  @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.
+  }
+
+}