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 479cfc9..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
@@ -239,6 +254,7 @@ public class WebserviceInfo extends GWebserviceInfo
         public void run()\r
         {\r
             startTime = System.currentTimeMillis();\r
+            Graphics2D g = null;\r
 \r
             while (currentStatus < STATE_STOPPED_OK)\r
             {\r
@@ -246,7 +262,8 @@ public class WebserviceInfo extends GWebserviceInfo
                 {\r
                     Thread.sleep(50);\r
 \r
-                    int units = (int) ((System.currentTimeMillis() - startTime) / 10f);\r
+                    int units = (int) ( (System.currentTimeMillis() - startTime) /\r
+                                       10f);\r
                     angle += units;\r
                     angle %= 360;\r
                     startTime = System.currentTimeMillis();\r
@@ -255,20 +272,13 @@ public class WebserviceInfo extends GWebserviceInfo
                         || offscreen.getHeight(this) != getHeight())\r
                     {\r
                       offscreen = new BufferedImage(getWidth(), getHeight(),\r
-                                                    BufferedImage.TYPE_INT_RGB);\r
+                                                    BufferedImage.TYPE_INT_ARGB);\r
+                      g = (Graphics2D) offscreen.getGraphics();\r
                     }\r
 \r
-                    Graphics2D g = (Graphics2D) offscreen.getGraphics();\r
                     g.setColor(Color.white);\r
                     g.fillRect(0, 0, getWidth(), getHeight());\r
 \r
-                    if (image != null)\r
-                    {\r
-                      g.rotate(Math.toRadians(angle), 28, 28);\r
-                      g.drawImage(image, 10, 10, this);\r
-                      g.rotate( -Math.toRadians(angle), 28, 28);\r
-                    }\r
-\r
                     g.setFont(new Font("Arial", Font.BOLD, 12));\r
                     g.setColor(Color.black);\r
 \r
@@ -307,6 +317,18 @@ public class WebserviceInfo extends GWebserviceInfo
                         break;\r
                     }\r
 \r
+\r
+                    if (currentStatus >= STATE_STOPPED_OK)\r
+                      angle = 0;\r
+\r
+                    if (image != null)\r
+                    {\r
+                      g.rotate(Math.toRadians(angle), 28, 28);\r
+                      g.drawImage(image, 10, 10, this);\r
+                      g.rotate( -Math.toRadians(angle), 28, 28);\r
+                    }\r
+\r
+\r
                     repaint();\r
                 }\r
                 catch (Exception ex)\r
@@ -314,7 +336,6 @@ public class WebserviceInfo extends GWebserviceInfo
                 }\r
             }\r
 \r
-            angle = 0;\r
             cancel.setEnabled(false);\r
         }\r
 \r