X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOOMWarning.java;h=2bb01eea5c626149b16ee6af3b2c4121b1061069;hb=8720298d1b7d5fa13b95e0769b9370d21673d56d;hp=319c28376fcd2816728a7ab429cbe6006e3fb41b;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java index 319c283..2bb01ee 100644 --- a/src/jalview/gui/OOMWarning.java +++ b/src/jalview/gui/OOMWarning.java @@ -20,6 +20,7 @@ */ package jalview.gui; +import jalview.bin.Console; import jalview.util.MessageManager; import java.awt.Component; @@ -54,16 +55,7 @@ public class OOMWarning implements Runnable 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(); - } + Console.error("Out of Memory when " + action, oomex); } javax.swing.SwingUtilities.invokeLater(this); System.gc(); @@ -75,16 +67,15 @@ public class OOMWarning implements Runnable this(string, oomerror, Desktop.desktop); } + @Override 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; + 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. } }