Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD

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

diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index ab9444e..7eabfab 100644 (file)
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -22,6 +22,7 @@ package jalview.gui;
 
 import jalview.jbgui.GWebserviceInfo;
 import jalview.util.MessageManager;
+import jalview.util.Platform;
 import jalview.ws.WSClientI;
 
 import java.awt.BorderLayout;
@@ -35,6 +36,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;
@@ -331,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,8 +351,12 @@ public class WebserviceInfo extends GWebserviceInfo
     titlePanel.add(titleText, BorderLayout.CENTER);
     setStatus(currentStatus);
 
-    Thread thread = new Thread(ap);
-    thread.start();
+    if (!Platform.isJS())
+    {
+      // No animation for the moment//
+      Thread thread = new Thread(ap);
+      thread.start();
+    }
     final WebserviceInfo thisinfo = this;
     frame.addInternalFrameListener(
             new InternalFrameAdapter()
@@ -548,7 +552,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");
@@ -577,7 +581,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");
@@ -898,7 +902,7 @@ public class WebserviceInfo extends GWebserviceInfo
     }
 
     @Override
-       public void paintComponent(Graphics g1)
+    public void paintComponent(Graphics g1)
     {
       drawPanel();
 
@@ -914,7 +918,7 @@ public class WebserviceInfo extends GWebserviceInfo
   }
 
   @Override
-public void hyperlinkUpdate(HyperlinkEvent e)
+  public void hyperlinkUpdate(HyperlinkEvent e)
   {
     Desktop.hyperlinkUpdate(e);
   }
@@ -929,6 +933,12 @@ public void hyperlinkUpdate(HyperlinkEvent e)
   {
     progressBar.setProgressBar(message, id);
   }
+  
+  @Override
+  public void removeProgressBar(long id)
+  {
+    progressBar.removeProgressBar(id);
+  }
 
   @Override
   public void registerHandler(final long id,