Merge "FS: Overload detect() with no arguments"

org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java

@@ -53,7 +53,16 @@ import java.security.PrivilegedAction;
 /** Abstraction to support various file system operations not in Java. */
 public abstract class FS {
 	/** The auto-detected implementation selected for this operating system and JRE. */
-	public static final FS DETECTED;
+	public static final FS DETECTED = detect();
+
+	/**
+	 * Auto-detect the appropriate file system abstraction.
+	 *
+	 * @return detected file system abstraction
+	 */
+	public static FS detect() {
+		return detect(null);
+	}
 
 	/**
 	 * Auto-detect the appropriate file system abstraction, taking into account
@@ -77,24 +86,19 @@ public abstract class FS {
 	 * @return detected file system abstraction
 	 */
 	public static FS detect(Boolean cygwinUsed) {
-		if (FS_Win32.detect()) {
+		if (FS_Win32.isWin32()) {
-			boolean useCygwin = (cygwinUsed == null && FS_Win32_Cygwin.detect())
+			if (cygwinUsed == null)
-					|| Boolean.TRUE.equals(cygwinUsed);
+				cygwinUsed = Boolean.valueOf(FS_Win32_Cygwin.isCygwin());
-
+			if (cygwinUsed.booleanValue())
-			if (useCygwin)
 				return new FS_Win32_Cygwin();
 			else
 				return new FS_Win32();
-		} else if (FS_POSIX_Java6.detect())
+		} else if (FS_POSIX_Java6.hasExecute())
 			return new FS_POSIX_Java6();
 		else
 			return new FS_POSIX_Java5();
 	}
 
-	static {
-		DETECTED = detect(null);
-	}
-
 	private final File userHome;
 
 	/**

org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX_Java6.java

@@ -59,7 +59,7 @@ class FS_POSIX_Java6 extends FS_POSIX {
 		setExecute = needMethod(File.class, "setExecutable", Boolean.TYPE);
 	}
 
-	static boolean detect() {
+	static boolean hasExecute() {
 		return canExecute != null && setExecute != null;
 	}
 

org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32.java

@@ -53,7 +53,7 @@ import java.util.Arrays;
 import java.util.List;
 
 class FS_Win32 extends FS {
-	static boolean detect() {
+	static boolean isWin32() {
 		final String osDotName = AccessController
 				.doPrivileged(new PrivilegedAction<String>() {
 					public String run() {

org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java

@@ -53,7 +53,7 @@ import java.util.List;
 class FS_Win32_Cygwin extends FS_Win32 {
 	private static String cygpath;
 
-	static boolean detect() {
+	static boolean isCygwin() {
 		final String path = AccessController
 				.doPrivileged(new PrivilegedAction<String>() {
 					public String run() {