Use PlatformUtils methods where applicable

Author: ctrueden

src/main/java/org/scijava/input/Accelerator.java

@@ -33,6 +33,8 @@
 
 import java.util.regex.Pattern;
 
+import org.scijava.util.PlatformUtils;
+
 /**
  * A keyboard shortcut, consisting of a {@link KeyCode} plus
  * {@link InputModifiers}.
@@ -159,7 +161,7 @@ else if (components[i].equalsIgnoreCase("control") ||
 
 	public static boolean isCtrlReplacedWithMeta() {
 		// FIXME: Relocate this platform-specific logic.
-		return System.getProperty("os.name").startsWith("Mac");
+		return PlatformUtils.isMac();
 	}
 
 	// -- Helper methods --

src/main/java/org/scijava/util/FileUtils.java

@@ -66,9 +66,6 @@ public final class FileUtils {
 	public static final String SHORTENER_SLASH = "/";
 	public static final String SHORTENER_ELLIPSE = "...";
 
-	private final static boolean isWindows =
-		System.getProperty("os.name").startsWith("Win");
-
 	private FileUtils() {
 		// prevent instantiation of utility class
 	}
@@ -207,7 +204,7 @@ public static File urlToFile(final String url) {
 			path = path.substring(4, index);
 		}
 		try {
-			if (isWindows && path.matches("file:[A-Za-z]:.*")) {
+			if (PlatformUtils.isWindows() && path.matches("file:[A-Za-z]:.*")) {
 				path = "file:/" + path.substring(5);
 			}
 			return new File(new URL(path).toURI());

src/test/java/org/scijava/util/AppUtilsTest.java

@@ -49,7 +49,7 @@ public class AppUtilsTest {
 	public void testBaseDirectory() {
 		assertNull(AppUtils.getBaseDirectory(new File(
 			"/home/blub/.m2/repository/org/dscho/secret/1.0/secret-1.0.jar"), null));
-		final String tmp = System.getProperty("os.name").startsWith("Win") ? "c:/tmp" : "/tmp";
+		final String tmp = PlatformUtils.isWindows() ? "c:/tmp" : "/tmp";
 		assertEquals(new File(tmp), AppUtils.getBaseDirectory(new File(
 			tmp + "/app/target/classes"), "app"));
 		assertEquals(new File(tmp), AppUtils.getBaseDirectory(new File(

src/test/java/org/scijava/util/FileUtilsTest.java

@@ -61,8 +61,6 @@
  * @author Grant Harris
  */
 public class FileUtilsTest {
-	private final static boolean isWindows =
-		System.getProperty("os.name").startsWith("Win");
 
 	@Test
 	public void testGetPath() {
@@ -91,7 +89,7 @@ public void testGetExtension() {
 	public void testURLToFile() throws MalformedURLException {
 		// verify that 'file:' URL works
 		final String jqpublic;
-		if (isWindows) {
+		if (PlatformUtils.isWindows()) {
 			jqpublic = "C:/Users/jqpublic/";
 		} else {
 			jqpublic = "/Users/jqpublic/";
@@ -274,7 +272,7 @@ public void testListContents() throws IOException, URISyntaxException {
 	}
 
 	private static void assertEqualsPath(final String a, final String b) {
-		if (isWindows) {
+		if (PlatformUtils.isWindows()) {
 			assertEquals(a.replace('\\', '/'), b.replace('\\', '/'));
 		} else {
 			assertEquals(a, b);

src/test/java/org/scijava/util/ProcessUtilsTest.java

@@ -68,8 +68,7 @@ public void testStdin() {
 	}
 
 	private void assumePOSIX() {
-		final String osName = System.getProperty("os.name");
-		assumeTrue(osName.equals("Linux") || osName.equals("Mac OS X"));
+		assumeTrue(PlatformUtils.isPOSIX());
 	}
 
 	/**