Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-14 19:25:51 +00:00
Code Issues Projects Releases Wiki Activity

Utils: Use enum for caching of operating system too.

Browse Source
This commit is contained in:
Andreas Schildbach 2019-01-02 16:37:47 +01:00
parent cdbf9ecc9f
commit 74b642844d
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/org/bitcoinj/core/Utils.java
View File

@ -554,7 +554,12 @@ public class Utils {
ANDROID, OPENJDK, ORACLE_JAVA
}
private enum OS {
LINUX, WINDOWS, MAC_OS
}
private static Runtime runtime = null;
private static OS os = null;
static {
String runtimeProp = System.getProperty("java.runtime.name").toLowerCase(Locale.US);
if (runtimeProp == null)
@ -567,6 +572,18 @@ public class Utils {
runtime = Runtime.ORACLE_JAVA;
else
log.info("Unknown java.runtime.name '{}'", runtimeProp);
String osProp = System.getProperty("os.name").toLowerCase(Locale.US);
if (osProp == null)
os = null;
else if (osProp.contains("linux"))
os = OS.LINUX;
else if (osProp.contains("win"))
os = OS.WINDOWS;
else if (osProp.contains("mac"))
os = OS.MAC_OS;
else
log.info("Unknown os.name '{}'", runtimeProp);
}
public static boolean isAndroidRuntime() {
@ -582,14 +599,14 @@ public class Utils {
}
public static boolean isLinux() {
return System.getProperty("os.name").toLowerCase().contains("linux");
return os == OS.LINUX;
}
public static boolean isWindows() {
return System.getProperty("os.name").toLowerCase().contains("win");
return os == OS.WINDOWS;
}
public static boolean isMac() {
return System.getProperty("os.name").toLowerCase().contains("mac");
return os == OS.MAC_OS;
}
}