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 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
gui
/
WebserviceInfo.java
diff --git
a/src/jalview/gui/WebserviceInfo.java
b/src/jalview/gui/WebserviceInfo.java
index
0773a7b
..
961caa7
100644
(file)
--- a/
src/jalview/gui/WebserviceInfo.java
+++ b/
src/jalview/gui/WebserviceInfo.java
@@
-31,6
+31,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;
@@
-322,6
+323,7
@@
public class WebserviceInfo extends GWebserviceInfo
boolean makeVisible)
{
frame = new JInternalFrame();
boolean makeVisible)
{
frame = new JInternalFrame();
+ frame.setFrameIcon(null);
frame.setContentPane(this);
Desktop.addInternalFrame(frame, title, makeVisible, width, height);
frame.setClosable(false);
frame.setContentPane(this);
Desktop.addInternalFrame(frame, title, makeVisible, width, height);
frame.setClosable(false);
@@
-357,7
+359,7
@@
public class WebserviceInfo extends GWebserviceInfo
@Override
public void internalFrameClosed(InternalFrameEvent evt)
{
@Override
public void internalFrameClosed(InternalFrameEvent evt)
{
- // System.out.println("Shutting down webservice client");
+ // jalview.bin.Console.outPrintln("Shutting down webservice client");
WSClientI service = thisinfo.getthisService();
if (service != null && service.isCancellable())
{
WSClientI service = thisinfo.getthisService();
if (service != null && service.isCancellable())
{
@@
-545,7
+547,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");
@@
-574,7
+576,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");