Merge new frame buttons added

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

diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index 7c5c5e3..9dadee7 100755 (executable)
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -58,6 +58,7 @@ public class WebserviceInfo extends GWebserviceInfo
     String title = "";\r
     jalview.ws.WSClientI thisService;\r
     boolean serviceIsCancellable;\r
+    JInternalFrame frame;\r
 \r
     /**\r
      * Creates a new WebserviceInfo object.\r
@@ -114,9 +115,10 @@ public class WebserviceInfo extends GWebserviceInfo
      */\r
     void init(String title, String info, int width, int height)\r
     {\r
-        JInternalFrame frame = new JInternalFrame();\r
+        frame = new JInternalFrame();\r
         frame.setContentPane(this);\r
         Desktop.addInternalFrame(frame, title, width, height);\r
+        frame.setClosable(false);\r
 \r
         this.title = title;\r
         setInfoText(info);\r
@@ -227,10 +229,23 @@ public class WebserviceInfo extends GWebserviceInfo
         }\r
         else\r
         {\r
+            frame.setClosable(true);\r
             thisService.cancelJob();\r
         }\r
     }\r
 \r
+    public void setResultsReady()\r
+    {\r
+      frame.setClosable(true);\r
+      buttonPanel.remove(cancel);\r
+      buttonPanel.add(showResultsNewFrame);\r
+      buttonPanel.add(mergeResults);\r
+      buttonPanel.setLayout(new GridLayout(2,1,5,5));\r
+      buttonPanel.validate();\r
+      validate();\r
+    }\r
+\r
+\r
     class AnimatedPanel extends JPanel implements Runnable\r
     {\r
         long startTime = 0;\r