Merge branch 'skip-unfillable-inputs'

This branches fixes a longstanding bug in the autofilling preprocessor
logic, which would erroneously autofill inputs marked autoFill=false.

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}.
@@ -158,8 +160,8 @@ else if (components[i].equalsIgnoreCase("control") ||
 	}
 
 	public static boolean isCtrlReplacedWithMeta() {
-		// TODO: Relocate this platform-specific logic?
-		return System.getProperty("os.name").startsWith("Mac");
+		// FIXME: Relocate this platform-specific logic.
+		return PlatformUtils.isMac();
 	}
 
 	// -- Helper methods --

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

@@ -204,6 +204,9 @@ public static File urlToFile(final String url) {
 			path = path.substring(4, index);
 		}
 		try {
+			if (PlatformUtils.isWindows() && path.matches("file:[A-Za-z]:.*")) {
+				path = "file:/" + path.substring(5);
+			}
 			return new File(new URL(path).toURI());
 		}
 		catch (final MalformedURLException e) {

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

@@ -0,0 +1,72 @@
+/*
+ * #%L
+ * SciJava Common shared library for SciJava software.
+ * %%
+ * Copyright (C) 2009 - 2014 Board of Regents of the University of
+ * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck
+ * Institute of Molecular Cell Biology and Genetics.
+ * %%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * #L%
+ */
+
+package org.scijava.util;
+
+/**
+ * Useful methods for platform-specific interrogation.
+ * 
+ * @author Curtis Rueden
+ * @author Johannes Schindelin
+ */
+public final class PlatformUtils {
+
+	private PlatformUtils() {
+		// prevent instantiation of utility class
+	}
+
+	/** Whether the operating system is Windows-based. */
+	public static boolean isWindows() {
+		return osName().startsWith("Win");
+	}
+
+	/** Whether the operating system is Mac-based. */
+	public static boolean isMac() {
+		return osName().startsWith("Mac");
+	}
+
+	/** Whether the operating system is Linux-based. */
+	public static boolean isLinux() {
+		return osName().startsWith("Linux");
+	}
+
+	/** Whether the operating system is POSIX compliant. */
+	public static boolean isPOSIX() {
+		return isMac() || isLinux();
+	}
+
+	/** Gets the name of the operating system. */
+	public static String osName() {
+		final String osName = System.getProperty("os.name");
+		return osName == null ? "Unknown" : osName;
+	}
+
+}

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,11 +89,15 @@ 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/";
 		}
+
+		final File jqpublicFile = FileUtils.urlToFile("file:" + jqpublic);
+		assertEqualsPath(jqpublic, jqpublicFile.getPath() + "/");
+
 		final String filePath = jqpublic + "imagej/ImageJ.class";
 		final String fileURL = new File(filePath).toURI().toURL().toString();
 		final File fileFile = FileUtils.urlToFile(fileURL);
@@ -270,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());
 	}
 
 	/**