")
+ .append("
Version: ")
+ .append(Cache.getProperty("VERSION")).append("
")
+ .append("
Built: ")
+ .append(Cache.getDefault("BUILD_DATE", "unknown"))
+ .append(" from ").append(Cache.getBuildDetailsForSplash())
+ .append("");
String latestVersion = Cache.getDefault("LATEST_VERSION", "Checking");
- if (latestVersion.equals("Checking")) {
+ if (latestVersion.equals("Checking"))
+ {
// JBP removed this message for 2.11: May be reinstated in future version
// message.append("
...Checking latest version...");
- } else if (!latestVersion.equals(Cache.getProperty("VERSION"))) {
+ }
+ 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
message.append("
");
}
-<<<<<<< HEAD
- message.append("
!! Version ").append(Cache.getDefault("LATEST_VERSION", "..Checking.."))
- .append(" is available for download from ")
- .append(Cache.getDefault("www.jalview.org", "https://www.jalview.org")).append(" !!");
- if (red) {
+ message.append("
!! Version ")
+ .append(Cache.getDefault("LATEST_VERSION", "..Checking.."))
+ .append(" is available for download from ")
+ .append(Cache.getDefault("www.jalview.org",
+ "https://www.jalview.org"))
+ .append(" !!");
+ if (red)
+ {
message.append("
");
}
}
@@ -1217,42 +1467,21 @@ public class Desktop extends jalview.jbgui.GDesktop
message.append("
!! Version "
- + jalview.bin.Cache.getDefault("LATEST_VERSION",
- "..Checking..")
- + " is available for download from "
- + jalview.bin.Cache.getDefault("www.jalview.org",
- "https://www.jalview.org")
- + " !!");
- if (red)
- {
- message.append("