JAL-3949 Complete new abstracted logging framework in jalview.log. Updated log calls...

[jalview.git] / src / jalview / gui / OOMWarning.java

diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java
index 2a94235..90d5411 100644 (file)
--- a/src/jalview/gui/OOMWarning.java
+++ b/src/jalview/gui/OOMWarning.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * 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.
  * 
@@ -20,6 +20,7 @@
  */
 package jalview.gui;
 
+import jalview.bin.Cache;
 import jalview.util.MessageManager;
 
 import java.awt.Component;
@@ -54,16 +55,8 @@ 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();
-        }
+        Cache.error("Out of Memory when " + action,
+                  oomex);
       }
       javax.swing.SwingUtilities.invokeLater(this);
       System.gc();
@@ -75,16 +68,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.
   }
 
 }