X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FOOMWarning.java;h=dc5d0f5232ae2e8997c001476fd88b3a76f226f5;hb=f921e30703a13008f5231ef5290426739c102aab;hp=eb4425e1b59dbb848f99220bd1f42d3ac83a40e1;hpb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;p=jalview.git

diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java
index eb4425e..dc5d0f5 100644
--- a/src/jalview/gui/OOMWarning.java
+++ b/src/jalview/gui/OOMWarning.java
@@ -56,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
         {
@@ -72,18 +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,
-            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.
   }
 
 }