X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOOMWarning.java;h=dc5d0f5232ae2e8997c001476fd88b3a76f226f5;hb=0751c58086542f9e0466201b624f84d1efd547bb;hp=2beae9c7c80f633ebda55b1b53777c314647dee1;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java
index 2beae9c..dc5d0f5 100644
--- a/src/jalview/gui/OOMWarning.java
+++ b/src/jalview/gui/OOMWarning.java
@@ -1,23 +1,27 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * 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.
+ * 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 .
+ * 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
@@ -52,8 +56,8 @@ public class OOMWarning implements Runnable
{
if (jalview.bin.Cache.log != null)
{
- jalview.bin.Cache.log
- .error("Out of Memory when " + action, oomex);
+ jalview.bin.Cache.log.error("Out of Memory when " + action,
+ oomex);
}
else
{
@@ -68,22 +72,18 @@ public class OOMWarning implements Runnable
public OOMWarning(String string, OutOfMemoryError oomerror)
{
- this(string, oomerror, Desktop.desktop);
+ this(string, oomerror, Desktop.getDesktopPane());
}
+ @Override
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;
+ 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.
}
}