X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=7eeee9a8794e8949a2a973c9322ab2a77d26d97c;hb=4b7d3640209c4434d569c746672cf9eed4250ace;hp=5240eea7f294190099460fbb88c6a1f12b8290cb;hpb=441f6e97f601ab3b0ee1dbfa62e9a6fbb2fe3c3a;p=jalview.git

diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index 5240eea..7eeee9a 100644
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -20,10 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.jbgui.GWebserviceInfo;
-import jalview.util.MessageManager;
-import jalview.ws.WSClientI;
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -35,6 +31,7 @@ import java.awt.MediaTracker;
 import java.awt.RenderingHints;
 import java.awt.event.ActionEvent;
 import java.awt.image.BufferedImage;
+import java.util.Locale;
 import java.util.Vector;
 
 import javax.swing.JComponent;
@@ -46,9 +43,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
@@ -99,7 +103,7 @@ public class WebserviceInfo extends GWebserviceInfo
   {
     super.setVisible(aFlag);
     frame.setVisible(aFlag);
-  };
+  }
 
   JTabbedPane subjobs = null;
 
@@ -319,6 +323,7 @@ public class WebserviceInfo extends GWebserviceInfo
           boolean makeVisible)
   {
     frame = new JInternalFrame();
+    frame.setFrameIcon(null);
     frame.setContentPane(this);
     Desktop.addInternalFrame(frame, title, makeVisible, width, height);
     frame.setClosable(false);
@@ -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);
@@ -351,21 +354,19 @@ public class WebserviceInfo extends GWebserviceInfo
     Thread thread = new Thread(ap);
     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);
@@ -848,8 +849,6 @@ protected void cancel_actionPerformed(ActionEvent e)
         {
           Thread.sleep(25);
 
-          int units = (int) ((System.currentTimeMillis() - startTime)
-                  / 5f);
           float delta = (System.currentTimeMillis() - startTime) / invSpeed;
           angle += delta * factor;
           startTime = System.currentTimeMillis();
@@ -898,7 +897,7 @@ protected void cancel_actionPerformed(ActionEvent e)
     }
 
     @Override
-	public void paintComponent(Graphics g1)
+    public void paintComponent(Graphics g1)
     {
       drawPanel();
 
@@ -914,7 +913,7 @@ protected void cancel_actionPerformed(ActionEvent e)
   }
 
   @Override
-public void hyperlinkUpdate(HyperlinkEvent e)
+  public void hyperlinkUpdate(HyperlinkEvent e)
   {
     Desktop.hyperlinkUpdate(e);
   }