X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOOMWarning.java;h=2bb01eea5c626149b16ee6af3b2c4121b1061069;hb=01f8ff469a507604ed961418f7c80f9b245e60ca;hp=7b9da79cf79a651e72883a884633865c6388dd1b;hpb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;p=jalview.git diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java index 7b9da79..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(); @@ -78,12 +70,12 @@ public class OOMWarning implements Runnable @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. - oomInprogress = false; } }