From e02486484d33e20dedb020a34f31f6024d5720a2 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 13 Apr 2006 13:28:42 +0000
Subject: [PATCH] showInternalMessage jdk1.5 bug

---
 src/jalview/gui/AlignViewport.java   |   39 +++++++++++++++++++++++-----------
 src/jalview/gui/SequenceFetcher.java |   13 ++++++++----
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 3509217..5b5b1f3 100755
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -317,12 +317,19 @@ public class AlignViewport
       }
       catch (OutOfMemoryError error)
       {
-        javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
-            "Out of memory calculating conservation!!"
-            +
-            "\nSee help files for increasing Java Virtual Machine memory."
-            , "Out of memory",
-            javax.swing.JOptionPane.WARNING_MESSAGE);
+        javax.swing.SwingUtilities.invokeLater(new Runnable()
+        {
+          public void run()
+          {
+            javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                "Out of memory calculating conservation!!"
+                +
+                "\nSee help files for increasing Java Virtual Machine memory."
+                , "Out of memory",
+                javax.swing.JOptionPane.WARNING_MESSAGE);
+          }
+        });
+
         System.out.println("Conservation calculation: " + error);
         System.gc();
 
@@ -402,12 +409,20 @@ public class AlignViewport
 
       }catch(OutOfMemoryError error)
       {
-        javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
-            "Out of memory calculating consensus!!"
-            +
-            "\nSee help files for increasing Java Virtual Machine memory."
-            , "Out of memory",
-            javax.swing.JOptionPane.WARNING_MESSAGE);
+        javax.swing.SwingUtilities.invokeLater(new Runnable()
+        {
+          public void run()
+          {
+            javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                "Out of memory calc45ulating consensus!!"
+                +
+                "\nSee help files for increasing Java Virtual Machine memory."
+                , "Out of memory",
+                javax.swing.JOptionPane.WARNING_MESSAGE);
+          }
+        });
+
+
         System.out.println("Consensus calculation: " + error);
         System.gc();
       }
diff --git a/src/jalview/gui/SequenceFetcher.java b/src/jalview/gui/SequenceFetcher.java
index fc8f042..7b25531 100755
--- a/src/jalview/gui/SequenceFetcher.java
+++ b/src/jalview/gui/SequenceFetcher.java
@@ -460,13 +460,18 @@ public class SequenceFetcher
 
   }
 
-  void showErrorMessage(String error)
+  void showErrorMessage(final String error)
   {
     resetDialog();
-    JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                                          error, "Error Retrieving Data",
+    javax.swing.SwingUtilities.invokeLater(new Runnable()
+    {
+      public void run()
+      {
+        JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                              error, "Error Retrieving Data",
                                           JOptionPane.WARNING_MESSAGE);
-    return;
+      }
+    });
   }
 }
 
-- 
1.7.10.2