Merge pull request #322 from scijava/fix-filelocation-to-string

FileLocation improvements

Author: ctrueden

src/main/java/org/scijava/io/location/AbstractLocation.java

@@ -32,6 +32,7 @@
 
 package org.scijava.io.location;
 
+import java.net.URI;
 import java.util.Objects;
 
 /**
@@ -58,4 +59,13 @@ public boolean equals(final Object obj) {
 		return Objects.equals(getURI(), other.getURI());
 	}
 
+	@Override
+	public String toString() {
+		final String prefix = getClass().getSimpleName() + ":";
+		final URI uri = getURI();
+		if (uri != null) return prefix + uri;
+		final String name = getName();
+		if (name != null) return prefix + name;
+		return prefix + defaultName();
+	}
 }

src/main/java/org/scijava/io/location/FileLocation.java

@@ -37,6 +37,7 @@
 import java.net.URI;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -52,6 +53,7 @@ public class FileLocation extends AbstractLocation implements
 	private final File file;
 
 	public FileLocation(final File file) {
+		Objects.requireNonNull(file);
 		this.file = file;
 	}