Refactor detection of OS X to SystemReader

Change-Id: I34e9ba4a26f7af5b88140c070f02a7990f1941af

1 files changed, 2 insertions, 17 deletions

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
index 36d3b9484a..742afe1354 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
@@ -44,8 +44,6 @@ package org.eclipse.jgit.util;
 
 import java.io.File;
 import java.nio.charset.Charset;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -58,7 +56,7 @@ abstract class FS_POSIX extends FS {
 		if (gitExe != null)
 			return gitExe.getParentFile().getParentFile();
 
-		if (isMacOS()) {
+		if (SystemReader.getInstance().isMacOS()) {
 			// On MacOSX, PATH is shorter when Eclipse is launched from the
 			// Finder than from a terminal. Therefore try to launch bash as a
 			// login shell and search using that.
@@ -87,10 +85,7 @@ abstract class FS_POSIX extends FS {
 
 	@Override
 	public boolean isCaseSensitive() {
-		if (isMacOS())
-			return false;
-		else
-			return true;
+		return !SystemReader.getInstance().isMacOS();
 	}
 
 	@Override
@@ -105,14 +100,4 @@ abstract class FS_POSIX extends FS {
 		proc.command(argv);
 		return proc;
 	}
-
-	private static boolean isMacOS() {
-		final String osDotName = AccessController
-				.doPrivileged(new PrivilegedAction<String>() {
-					public String run() {
-						return System.getProperty("os.name");
-					}
-				});
-		return "Mac OS X".equals(osDotName) || "Darwin".equals(osDotName);
-	}
 }