bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix osx description

This commit is contained in:
Doug MacEachern 2005-12-01 22:40:13 +00:00
parent 7e6f2316a1
commit 1921b62a7b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bindings/java/src/net/hyperic/sigar/OperatingSystem.java
View File

@ -158,10 +158,10 @@ public class OperatingSystem {
os.type = TYPE_MACOSX; os.type = TYPE_MACOSX;
os.name = NAME_MACOSX; os.name = NAME_MACOSX;
os.vendor = "Apple"; os.vendor = "Apple";
if (os.version.equals("10.4")) { if (os.version.startsWith("10.4")) {
os.vendorCodeName = "Tiger"; os.vendorCodeName = "Tiger";
} }
else if (os.version.equals("10.3")) { else if (os.version.startsWith("10.3")) {
os.vendorCodeName = "Panther"; os.vendorCodeName = "Panther";
} }
} }
@ -200,8 +200,13 @@ public class OperatingSystem {
//"HP-UX 11" //"HP-UX 11"
return this.vendorName + " " + this.vendorVersion; return this.vendorName + " " + this.vendorVersion;
case TYPE_MACOSX: case TYPE_MACOSX:
//"Mac OS X 10.4" //"Mac OS X Tiger"
return this.vendorName + " " + this.vendorCodeName; if (this.vendorCodeName != null) {
return this.vendorName + " " + this.vendorCodeName;
}
else {
return this.vendorName;
}
case TYPE_WIN32: case TYPE_WIN32:
//"Microsoft Windows 2003" //"Microsoft Windows 2003"
return this.vendor + " Windows " + this.vendorVersion; return this.vendor + " Windows " + this.vendorVersion;