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
JAL-3594 added BG and UoD logo and banner to splashscreens, and adjusted status text box
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
67ef952
..
666fb4e
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-20,6
+20,8
@@
*/
package jalview.gui;
*/
package jalview.gui;
+import java.util.Locale;
+
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
@@
-1055,7
+1057,7
@@
public class Desktop extends jalview.jbgui.GDesktop
String url = (history instanceof JTextField ? ((JTextField) history).getText()
: ((JComboBox<String>) history).getEditor().getItem().toString().trim());
String url = (history instanceof JTextField ? ((JTextField) history).getText()
: ((JComboBox<String>) history).getEditor().getItem().toString().trim());
- if (url.toLowerCase().endsWith(".jar")) {
+ if (url.toLowerCase(Locale.ROOT).endsWith(".jar")) {
if (viewport != null) {
new FileLoader().LoadFile(viewport, url, DataSourceType.URL, FileFormat.Jalview);
} else {
if (viewport != null) {
new FileLoader().LoadFile(viewport, url, DataSourceType.URL, FileFormat.Jalview);
} else {
@@
-1181,7
+1183,7
@@
public class Desktop extends jalview.jbgui.GDesktop
// message.append("<br>...Checking latest version...</br>");
} else if (!latestVersion.equals(Cache.getProperty("VERSION"))) {
boolean red = false;
// message.append("<br>...Checking latest version...</br>");
} else if (!latestVersion.equals(Cache.getProperty("VERSION"))) {
boolean red = false;
- if (Cache.getProperty("VERSION").toLowerCase().indexOf("automated build") == -1) {
+ if (Cache.getProperty("VERSION").toLowerCase(Locale.ROOT).indexOf("automated build") == -1) {
red = true;
// Displayed when code version and jnlp version do not match and code
// version is not a development build
red = true;
// Displayed when code version and jnlp version do not match and code
// version is not a development build
@@
-2669,7
+2671,7
@@
public class Desktop extends jalview.jbgui.GDesktop
continue;
}
java.net.URI uri = new java.net.URI(s);
continue;
}
java.net.URI uri = new java.net.URI(s);
- if (uri.getScheme().toLowerCase().startsWith("http")) {
+ if (uri.getScheme().toLowerCase(Locale.ROOT).startsWith("http")) {
protocols.add(DataSourceType.URL);
files.add(uri.toString());
} else {
protocols.add(DataSourceType.URL);
files.add(uri.toString());
} else {
@@
-2706,7
+2708,7
@@
public class Desktop extends jalview.jbgui.GDesktop
// resolve any .lnk files in the file drop
for (int f = 0; f < files.size(); f++) {
// resolve any .lnk files in the file drop
for (int f = 0; f < files.size(); f++) {
- String source = files.get(f).toString().toLowerCase();
+ String source = files.get(f).toString().toLowerCase(Locale.ROOT);
if (protocols.get(f).equals(DataSourceType.FILE)
&& (source.endsWith(".lnk") || source.endsWith(".url") || source.endsWith(".site"))) {
try {
if (protocols.get(f).equals(DataSourceType.FILE)
&& (source.endsWith(".lnk") || source.endsWith(".url") || source.endsWith(".site"))) {
try {