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 a260072..9dadee7 100755 (executable)
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -22,6 +22,7 @@ import jalview.jbgui.*;
 \r
 import java.awt.*;\r
 import java.awt.event.*;\r
+import java.awt.image.*;\r
 \r
 import javax.swing.*;\r
 \r
@@ -57,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
@@ -113,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
@@ -226,17 +229,32 @@ 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
+        BufferedImage offscreen;\r
 \r
         public void run()\r
         {\r
             startTime = System.currentTimeMillis();\r
+            Graphics2D g = null;\r
 \r
             while (currentStatus < STATE_STOPPED_OK)\r
             {\r
@@ -244,70 +262,86 @@ 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
-                    repaint();\r
-                }\r
-                catch (Exception ex)\r
-                {\r
-                }\r
-            }\r
 \r
-            angle = 0;\r
-            cancel.setEnabled(false);\r
-        }\r
+                    if (offscreen == null || offscreen.getWidth(this) != getWidth()\r
+                        || offscreen.getHeight(this) != getHeight())\r
+                    {\r
+                      offscreen = new BufferedImage(getWidth(), getHeight(),\r
+                                                    BufferedImage.TYPE_INT_ARGB);\r
+                      g = (Graphics2D) offscreen.getGraphics();\r
+                    }\r
 \r
-        synchronized public void paintComponent(Graphics g1)\r
-        {\r
-            Graphics2D g = (Graphics2D) g1;\r
-            g.setColor(Color.white);\r
-            g.fillRect(0, 0, getWidth(), getHeight());\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
+                    g.setFont(new Font("Arial", Font.BOLD, 12));\r
+                    g.setColor(Color.black);\r
 \r
-            g.setFont(new Font("Arial", Font.BOLD, 12));\r
-            g.setColor(Color.black);\r
+                    switch (currentStatus)\r
+                    {\r
+                      case STATE_QUEUING:\r
+                        g.drawString(title.concat(" - queuing"), 60, 30);\r
 \r
-            switch (currentStatus)\r
-            {\r
-            case STATE_QUEUING:\r
-                g.drawString(title.concat(" - queuing"), 60, 30);\r
+                        break;\r
+\r
+                      case STATE_RUNNING:\r
+                        g.drawString(title.concat(" - running"), 60, 30);\r
+\r
+                        break;\r
+\r
+                      case STATE_STOPPED_OK:\r
+                        g.drawString(title.concat(" - complete"), 60, 30);\r
 \r
-                break;\r
+                        break;\r
 \r
-            case STATE_RUNNING:\r
-                g.drawString(title.concat(" - running"), 60, 30);\r
+                      case STATE_CANCELLED_OK:\r
+                        g.drawString(title.concat(" - job cancelled!"), 60, 30);\r
 \r
-                break;\r
+                        break;\r
 \r
-            case STATE_STOPPED_OK:\r
-                g.drawString(title.concat(" - complete"), 60, 30);\r
+                      case STATE_STOPPED_ERROR:\r
+                        g.drawString(title.concat(" - job error!"), 60, 30);\r
 \r
-                break;\r
+                        break;\r
 \r
-            case STATE_CANCELLED_OK:\r
-                g.drawString(title.concat(" - job cancelled!"), 60, 30);\r
+                      case STATE_STOPPED_SERVERERROR:\r
+                        g.drawString(title.concat(" - Server Error! (try later)"),\r
+                                     60,\r
+                                     30);\r
 \r
-                break;\r
+                        break;\r
+                    }\r
 \r
-            case STATE_STOPPED_ERROR:\r
-                g.drawString(title.concat(" - job error!"), 60, 30);\r
 \r
-                break;\r
+                    if (currentStatus >= STATE_STOPPED_OK)\r
+                      angle = 0;\r
 \r
-            case STATE_STOPPED_SERVERERROR:\r
-                g.drawString(title.concat(" - Server Error! (try later)"), 60,\r
-                    30);\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
-                break;\r
+\r
+                    repaint();\r
+                }\r
+                catch (Exception ex)\r
+                {\r
+                }\r
             }\r
+\r
+            cancel.setEnabled(false);\r
+        }\r
+\r
+        public void paintComponent(Graphics g1)\r
+        {\r
+            g1.drawImage(offscreen, 0,0,this);\r
         }\r
     }\r
 }\r