Warn if out of memory

[jalview.git] / src / jalview / ws / MsaWSClient.java

diff --git a/src/jalview/ws/MsaWSClient.java b/src/jalview/ws/MsaWSClient.java
index 7f754e0..0d4b2c1 100755 (executable)
--- a/src/jalview/ws/MsaWSClient.java
+++ b/src/jalview/ws/MsaWSClient.java
@@ -280,8 +280,9 @@ public class MsaWSClient
           {\r
             if (result.getStatus() != null)\r
             {\r
-              wsInfo.setProgressText(OutputHeader + "\n" +\r
-                                     result.getStatus());\r
+              System.out.println("result "+result.getStatus().length());\r
+              wsInfo.setProgressText(OutputHeader + "\n" );\r
+                                //     result.getStatus());\r
             }\r
             if (result.isServerError())\r
             {\r
@@ -325,6 +326,16 @@ public class MsaWSClient
           {\r
           }\r
         }\r
+        catch(OutOfMemoryError er)\r
+        {\r
+          jobComplete = true;\r
+          wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);\r
+          JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
+              "Out of memory handling result!!"\r
+             +"\nSee help files for increasing Java Virtual Machine memory."\r
+             ,"Out of memory", JOptionPane.WARNING_MESSAGE );\r
+          System.out.println("MsaWSClient: "+er);\r
+        }\r
       }\r
 \r
       if (allowedServerExceptions == 0)\r
@@ -425,18 +436,21 @@ public class MsaWSClient
 \r
         if (result.getStatus() != null)\r
         {\r
-          OutputHeader += ("\n" + result.getStatus());\r
+          System.out.println("get status  " +result.getStatus().length());\r
+         // OutputHeader += ("\n" + result.getStatus());\r
         }\r
 \r
         if (result.getMsa() != null)\r
         {\r
-          OutputHeader += "\nAlignment Object Method Notes\n";\r
+          System.out.println("get msa");\r
+       //   OutputHeader += "\nAlignment Object Method Notes\n";\r
 \r
           String[] lines = result.getMsa().getMethod();\r
 \r
+System.out.println("lines "+lines.length);\r
           for (int line = 0; line < lines.length; line++)\r
           {\r
-            OutputHeader += (lines[line] + "\n");\r
+           // OutputHeader += (lines[line] + "\n");\r
           }\r
 \r
           // JBPNote The returned files from a webservice could be hidden behind icons in the monitor window that, when clicked, pop up their corresponding data\r