git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'JAL-3878_ws-overhaul-3' into with_ws_overhaul-3
[jalview.git]
/
src
/
jalview
/
gui
/
WebserviceInfo.java
diff --git
a/src/jalview/gui/WebserviceInfo.java
b/src/jalview/gui/WebserviceInfo.java
index
15d0055
..
c0e8592
100644
(file)
--- a/
src/jalview/gui/WebserviceInfo.java
+++ b/
src/jalview/gui/WebserviceInfo.java
@@
-23,6
+23,7
@@
package jalview.gui;
import jalview.jbgui.GWebserviceInfo;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.jbgui.GWebserviceInfo;
import jalview.util.MessageManager;
import jalview.util.Platform;
+import jalview.util.ChannelProperties;
import jalview.ws.WSClientI;
import java.awt.BorderLayout;
import jalview.ws.WSClientI;
import java.awt.BorderLayout;
@@
-36,6
+37,7
@@
import java.awt.MediaTracker;
import java.awt.RenderingHints;
import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage;
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;
import java.util.Vector;
import javax.swing.JComponent;
@@
-332,9
+334,7
@@
public class WebserviceInfo extends GWebserviceInfo
this.title = title;
setInfoText(info);
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);
MediaTracker mt = new MediaTracker(this);
mt.addImage(image, 0);
@@
-351,6
+351,7
@@
public class WebserviceInfo extends GWebserviceInfo
titlePanel.add(ap, BorderLayout.WEST);
titlePanel.add(titleText, BorderLayout.CENTER);
setStatus(currentStatus);
titlePanel.add(ap, BorderLayout.WEST);
titlePanel.add(titleText, BorderLayout.CENTER);
setStatus(currentStatus);
+
if (!Platform.isJS())
{
// No animation for the moment//
if (!Platform.isJS())
{
// No animation for the moment//
@@
-552,7
+553,7
@@
public class WebserviceInfo extends GWebserviceInfo
{
return null;
}
{
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");
int htmlpos = leaveFirst ? -1 : lowertxt.indexOf("<body");
int htmlend = leaveLast ? -1 : lowertxt.indexOf("</body");
@@
-581,7
+582,7
@@
public class WebserviceInfo extends GWebserviceInfo
{
return "";
}
{
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");
int htmlpos = lowertxt.indexOf("<body");
int htmlend = lowertxt.indexOf("</body");
int doctype = lowertxt.indexOf("<!doctype");
@@
-902,7
+903,7
@@
public class WebserviceInfo extends GWebserviceInfo
}
@Override
}
@Override
- public void paintComponent(Graphics g1)
+ public void paintComponent(Graphics g1)
{
drawPanel();
{
drawPanel();
@@
-918,7
+919,7
@@
public class WebserviceInfo extends GWebserviceInfo
}
@Override
}
@Override
-public void hyperlinkUpdate(HyperlinkEvent e)
+ public void hyperlinkUpdate(HyperlinkEvent e)
{
Desktop.hyperlinkUpdate(e);
}
{
Desktop.hyperlinkUpdate(e);
}