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 'patch/Release_2_11_1_Branch_patch_JAL-3490' into releases/Release_2_11_...
[jalview.git]
/
src
/
jalview
/
bin
/
Cache.java
diff --git
a/src/jalview/bin/Cache.java
b/src/jalview/bin/Cache.java
index
dbe85fe
..
6e44b0c
100755
(executable)
--- a/
src/jalview/bin/Cache.java
+++ b/
src/jalview/bin/Cache.java
@@
-1105,20
+1105,23
@@
public class Cache
public static String getVersionDetailsForConsole()
{
StringBuilder sb = new StringBuilder();
public static String getVersionDetailsForConsole()
{
StringBuilder sb = new StringBuilder();
- sb.append("Jalview Version: "
- + jalview.bin.Cache.getDefault("VERSION", "TEST"));
+ sb.append("Jalview Version: ");
+ sb.append(jalview.bin.Cache.getDefault("VERSION", "TEST"));
sb.append("\n");
sb.append("\n");
- sb.append("Jalview Installation: "
- + jalview.bin.Cache.getDefault("INSTALLATION", "unknown"));
+ sb.append("Jalview Installation: ");
+ sb.append(jalview.bin.Cache.getDefault("INSTALLATION", "unknown"));
sb.append("\n");
sb.append("\n");
- sb.append("Build Date: "
- + jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"));
+ sb.append("Build Date: ");
+ sb.append(jalview.bin.Cache.getDefault("BUILD_DATE", "unknown"));
sb.append("\n");
sb.append("\n");
- sb.append("Java version: " + System.getProperty("java.version"));
+ sb.append("Java version: ");
+ sb.append(System.getProperty("java.version"));
sb.append("\n");
sb.append("\n");
- sb.append(System.getProperty("os.arch") + " "
- + System.getProperty("os.name") + " "
- + System.getProperty("os.version"));
+ sb.append(System.getProperty("os.arch"));
+ sb.append(" ");
+ sb.append(System.getProperty("os.name"));
+ sb.append(" ");
+ sb.append(System.getProperty("os.version"));
sb.append("\n");
appendIfNotNull(sb, "Install4j version: ",
System.getProperty("sys.install4jVersion"), "\n", null);
sb.append("\n");
appendIfNotNull(sb, "Install4j version: ",
System.getProperty("sys.install4jVersion"), "\n", null);
@@
-1129,8
+1132,11
@@
public class Cache
LookAndFeel laf = UIManager.getLookAndFeel();
String lafName = laf == null ? "Not obtained" : laf.getName();
String lafClass = laf == null ? "unknown" : laf.getClass().getName();
LookAndFeel laf = UIManager.getLookAndFeel();
String lafName = laf == null ? "Not obtained" : laf.getName();
String lafClass = laf == null ? "unknown" : laf.getClass().getName();
- appendIfNotNull(sb, "LookAndFeel: ", lafName + " (" + lafClass + ")",
- "\n", null);
+ sb.append("LookAndFeel: ");
+ sb.append(lafName);
+ sb.append(" (");
+ sb.append(lafClass);
+ sb.append(")\n");
// Not displayed in release version ( determined by possible version number
// regex 9[9.]*9[.-_a9]* )
if (Pattern.matches("^\\d[\\d\\.]*\\d[\\.\\-\\w]*$",
// Not displayed in release version ( determined by possible version number
// regex 9[9.]*9[.-_a9]* )
if (Pattern.matches("^\\d[\\d\\.]*\\d[\\.\\-\\w]*$",