Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-03 03:25:28 -04:00
Code Issues Projects Releases Wiki Activity

System.getProperty("os.name") reports "Darwin" on OpenJDK 7 for OS X.

Browse Source 
It also reports "universal" for os.arch and "10.7.0" for os.version, which is probably hardcoded and incorrect. :-/
This commit is contained in:
Harald Kuhr 2011-04-19 16:47:17 +02:00
parent cb4a35016b
commit cb149a7c79
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/common-lang/src/main/java/com/twelvemonkeys/lang/Platform.java
View File

@ -72,7 +72,7 @@ public final class Platform {
else if (os.startsWith("linux")) { else if (os.startsWith("linux")) {
return OperatingSystem.Linux; return OperatingSystem.Linux;
} }
else if (os.startsWith("mac os")) { else if (os.startsWith("mac os") || os.startsWith("darwin")) {
return OperatingSystem.MacOS; return OperatingSystem.MacOS;
} }
else if (os.startsWith("solaris") || os.startsWith("sunos")) { else if (os.startsWith("solaris") || os.startsWith("sunos")) {
@ -89,8 +89,7 @@ public final class Platform {
} }
arch = arch.toLowerCase(); arch = arch.toLowerCase();
if (pOsName == OperatingSystem.Windows if (pOsName == OperatingSystem.Windows && (arch.startsWith("x86") || arch.startsWith("i386"))) {
&& (arch.startsWith("x86") || arch.startsWith("i386"))) {
return Architecture.X86; return Architecture.X86;
// TODO: 64 bit // TODO: 64 bit
} }
@ -223,14 +222,14 @@ public final class Platform {
Solaris("Solaris", "sun"), Solaris("Solaris", "sun"),
MacOS("Mac OS", "osx"), MacOS("Mac OS", "osx"),
Unknown(System.getProperty("os.name"), ""); Unknown(System.getProperty("os.name"), null);
final String id; final String id;
final String name;// for debug only final String name;// for debug only
private OperatingSystem(String pName, String pId) { private OperatingSystem(String pName, String pId) {
name = pName; name = pName;
id = pId; id = pId != null ? pId : pName.toLowerCase();
} }
public String getName() { public String getName() {