X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=7a5d6933f14e8d2d952baea9d82d1366c496b0f4;hb=4a3def9f59cefe629c9a33d87483283aee085928;hp=2b85141b9052478d3af5bd20b84d7841597cf946;hpb=6da8d6719f9cce1221134697277c3cdc7d560d0b;p=jalview.git

diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index 2b85141..7a5d693 100644
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -20,9 +20,7 @@
  */
 package jalview.gui;
 
-import jalview.jbgui.GWebserviceInfo;
-import jalview.util.MessageManager;
-import jalview.ws.WSClientI;
+import java.util.Locale;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -46,9 +44,16 @@ import javax.swing.JTabbedPane;
 import javax.swing.JTextArea;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
+import javax.swing.event.InternalFrameAdapter;
+import javax.swing.event.InternalFrameEvent;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
 
+import jalview.jbgui.GWebserviceInfo;
+import jalview.util.ChannelProperties;
+import jalview.util.MessageManager;
+import jalview.ws.WSClientI;
+
 /**
  * Base class for web service client thread and gui TODO: create StAX parser to
  * extract html body content reliably when preparing html formatted job statuses
@@ -82,7 +87,7 @@ public class WebserviceInfo extends GWebserviceInfo
 
   Image image;
 
-  int angle = 0;
+  float angle = 0f;
 
   String title = "";
 
@@ -99,7 +104,7 @@ public class WebserviceInfo extends GWebserviceInfo
   {
     super.setVisible(aFlag);
     frame.setVisible(aFlag);
-  };
+  }
 
   JTabbedPane subjobs = null;
 
@@ -328,9 +333,7 @@ public class WebserviceInfo extends GWebserviceInfo
     this.title = title;
     setInfoText(info);
 
-    java.net.URL url = getClass()
-            .getResource("/images/Jalview_Logo_small_with_border.png");
-    image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
+    image = ChannelProperties.getImage("rotatable_logo.48");
 
     MediaTracker mt = new MediaTracker(this);
     mt.addImage(image, 0);
@@ -348,24 +351,22 @@ public class WebserviceInfo extends GWebserviceInfo
     titlePanel.add(titleText, BorderLayout.CENTER);
     setStatus(currentStatus);
 
-    Thread thread = new Thread(ap);
+    Thread thread = new Thread(ap, "AnimatedPanel");
     thread.start();
     final WebserviceInfo thisinfo = this;
-    frame.addInternalFrameListener(
-            new javax.swing.event.InternalFrameAdapter()
-            {
-              @Override
-			public void internalFrameClosed(
-                      javax.swing.event.InternalFrameEvent evt)
-              {
-                // System.out.println("Shutting down webservice client");
-                WSClientI service = thisinfo.getthisService();
-                if (service != null && service.isCancellable())
-                {
-                  service.cancelJob();
-                }
-              };
-            });
+    frame.addInternalFrameListener(new InternalFrameAdapter()
+    {
+      @Override
+      public void internalFrameClosed(InternalFrameEvent evt)
+      {
+        // System.out.println("Shutting down webservice client");
+        WSClientI service = thisinfo.getthisService();
+        if (service != null && service.isCancellable())
+        {
+          service.cancelJob();
+        }
+      }
+    });
     frame.validate();
 
   }
@@ -546,7 +547,7 @@ public class WebserviceInfo extends GWebserviceInfo
     {
       return null;
     }
-    String lowertxt = text.toLowerCase();
+    String lowertxt = text.toLowerCase(Locale.ROOT);
     int htmlpos = leaveFirst ? -1 : lowertxt.indexOf("<body");
 
     int htmlend = leaveLast ? -1 : lowertxt.indexOf("</body");
@@ -575,7 +576,7 @@ public class WebserviceInfo extends GWebserviceInfo
     {
       return "";
     }
-    String lowertxt = text.toLowerCase();
+    String lowertxt = text.toLowerCase(Locale.ROOT);
     int htmlpos = lowertxt.indexOf("<body");
     int htmlend = lowertxt.indexOf("</body");
     int doctype = lowertxt.indexOf("<!doctype");
@@ -711,7 +712,7 @@ public class WebserviceInfo extends GWebserviceInfo
    *          DOCUMENT ME!
    */
   @Override
-protected void cancel_actionPerformed(ActionEvent e)
+  protected void cancel_actionPerformed(ActionEvent e)
   {
     if (!serviceIsCancellable)
     {
@@ -743,7 +744,7 @@ protected void cancel_actionPerformed(ActionEvent e)
     javax.swing.SwingUtilities.invokeLater(new Runnable()
     {
       @Override
-	public void run()
+      public void run()
       {
         JvOptionPane.showInternalMessageDialog(Desktop.desktop, message,
                 title, JvOptionPane.WARNING_MESSAGE);
@@ -797,24 +798,27 @@ protected void cancel_actionPerformed(ActionEvent e)
     {
       startTime = System.currentTimeMillis();
 
-      float invSpeed = 30f;
+      float invSpeed = 15f;
+      float factor = 1f;
       while (currentStatus < STATE_STOPPED_OK)
       {
         if (currentStatus == STATE_QUEUING)
         {
           invSpeed = 25f;
+          factor = 1f;
         }
         else if (currentStatus == STATE_RUNNING)
         {
           invSpeed = 10f;
+          factor = (float) (0.5 + 1.5
+                  * (0.5 - (0.5 * Math.sin(3.14159 / 180 * (angle + 45)))));
         }
         try
         {
           Thread.sleep(50);
 
-          int units = (int) ((System.currentTimeMillis() - startTime)
-                  / invSpeed);
-          angle += units;
+          float delta = (System.currentTimeMillis() - startTime) / invSpeed;
+          angle += delta * factor;
           angle %= 360;
           startTime = System.currentTimeMillis();
 
@@ -839,13 +843,14 @@ protected void cancel_actionPerformed(ActionEvent e)
 
       while (angle < 360)
       {
+        float invSpeed = 5f;
+        float factor = 1f;
         try
         {
           Thread.sleep(25);
 
-          int units = (int) ((System.currentTimeMillis() - startTime)
-                  / 5f);
-          angle += units;
+          float delta = (System.currentTimeMillis() - startTime) / invSpeed;
+          angle += delta * factor;
           startTime = System.currentTimeMillis();
 
           if (angle >= 360)
@@ -885,14 +890,14 @@ protected void cancel_actionPerformed(ActionEvent e)
       if (image != null)
       {
         int x = image.getWidth(this) / 2, y = image.getHeight(this) / 2;
-        g.rotate(Math.toRadians(angle), x, y);
+        g.rotate(3.14159 / 180 * (angle), x, y);
         g.drawImage(image, 0, 0, this);
-        g.rotate(-Math.toRadians(angle), x, y);
+        g.rotate(-3.14159 / 180 * (angle), x, y);
       }
     }
 
     @Override
-	public void paintComponent(Graphics g1)
+    public void paintComponent(Graphics g1)
     {
       drawPanel();
 
@@ -908,7 +913,7 @@ protected void cancel_actionPerformed(ActionEvent e)
   }
 
   @Override
-public void hyperlinkUpdate(HyperlinkEvent e)
+  public void hyperlinkUpdate(HyperlinkEvent e)
   {
     Desktop.hyperlinkUpdate(e);
   }