Do not hardcode String-to-FileLocation conversions

That's what LocationService.resolve is for.

Author: ctrueden

src/main/java/org/scijava/io/IOPlugin.java

@@ -30,9 +30,11 @@
 package org.scijava.io;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 
 import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
+import org.scijava.io.location.LocationService;
 import org.scijava.plugin.HandlerPlugin;
 import org.scijava.plugin.Plugin;
 
@@ -58,22 +60,32 @@ public interface IOPlugin<D> extends HandlerPlugin<Location> {
 	/** Checks whether the I/O plugin can open data from the given source. */
 	@SuppressWarnings("unused")
 	default boolean supportsOpen(final String source) {
-		return supportsOpen(new FileLocation(source));
+		try {
+			return supportsOpen(context().service(LocationService.class).resolve(source));
+		}
+		catch (final URISyntaxException exc) {
+			return false;
+		}
 	}
 
 	/** Checks whether the I/O plugin can open data from the given location. */
-	default boolean supportsOpen(Location source) {
+	default boolean supportsOpen(final Location source) {
 		return false;
 	}
 
 	/** Checks whether the I/O plugin can save data to the given destination. */
 	@SuppressWarnings("unused")
 	default boolean supportsSave(final String destination) {
-		return supportsSave(new FileLocation(destination));
+		try {
+			return supportsSave(context().service(LocationService.class).resolve(destination));
+		}
+		catch (final URISyntaxException exc) {
+			return false;
+		}
 	}
 
 	/** Checks whether the I/O plugin can save data to the given location. */
-	default boolean supportsSave(Location destination) {
+	default boolean supportsSave(final Location destination) {
 		return false;
 	}
 
@@ -85,7 +97,7 @@ default boolean supportsSave(final Object data, final String destination) {
 		return supportsSave(destination) && getDataType().isInstance(data);
 	}
 
-	default boolean supportsSave(Object data, Location destination) {
+	default boolean supportsSave(final Object data, final Location destination) {
 		return supportsSave(destination) && getDataType().isInstance(data);
 	}
 
@@ -96,17 +108,23 @@ default D open(final String source) throws IOException {
 	}
 
 	/** Opens data from the given location. */
-	default D open(Location source) throws IOException {
+	default D open(final Location source) throws IOException {
 		throw new UnsupportedOperationException();
 	}
+
 	/** Saves the given data to the specified destination. */
 	@SuppressWarnings("unused")
 	default void save(final D data, final String destination) throws IOException {
-		save(data, new FileLocation(destination));
+		try {
+			save(data, context().service(LocationService.class).resolve(destination));
+		}
+		catch (final URISyntaxException exc) {
+			throw new UnsupportedOperationException(exc);
+		}
 	}
 
 	/** Saves the given data to the specified location. */
-	default void save(D data, Location destination) throws IOException {
+	default void save(final D data, final Location destination) throws IOException {
 		throw new UnsupportedOperationException();
 	}
 

src/main/java/org/scijava/io/TypedIOService.java

@@ -30,9 +30,11 @@
 package org.scijava.io;
 
 import java.io.IOException;
+import java.net.URISyntaxException;
 
 import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
+import org.scijava.io.location.LocationService;
 import org.scijava.plugin.HandlerService;
 import org.scijava.service.SciJavaService;
 
@@ -51,7 +53,12 @@ public interface TypedIOService<D> extends HandlerService<Location, IOPlugin<D>>
 	 * location.
 	 */
 	default IOPlugin<D> getOpener(final String source) {
-		return getOpener(new FileLocation(source));
+		try {
+			return getOpener(context().service(LocationService.class).resolve(source));
+		}
+		catch (final URISyntaxException exc) {
+			return null;
+		}
 	}
 
 	/**
@@ -70,7 +77,12 @@ default IOPlugin<D> getOpener(Location source) {
 	 * location.
 	 */
 	default IOPlugin<D> getSaver(final D data, final String destination) {
-		return getSaver(data, new FileLocation(destination));
+		try {
+			return getSaver(data, context().service(LocationService.class).resolve(destination));
+		}
+		catch (final URISyntaxException exc) {
+			return null;
+		}
 	}
 
 	/**

src/main/java/org/scijava/io/event/DataOpenedEvent.java

@@ -49,20 +49,14 @@ public DataOpenedEvent(final Location location, final Object data) {
 	 */
 	@Deprecated
 	public DataOpenedEvent(final String source, final Object data) {
-		this(new FileLocation(source), data);
+		super(source, data);
 	}
 
 	/**
 	 * @deprecated use {@link #getLocation} instead
 	 */
 	@Deprecated
 	public String getSource() {
-		try {
-			FileLocation fileLocation = (FileLocation) getLocation();
-			return fileLocation.getFile().getAbsolutePath();
-		} catch(ClassCastException e) {
-			return getLocation().getURI().toString();
-		}
+		return getDescriptor();
 	}
-
 }

src/main/java/org/scijava/io/event/DataSavedEvent.java

@@ -49,19 +49,14 @@ public DataSavedEvent(final Location destination, final Object data) {
 	 */
 	@Deprecated
 	public DataSavedEvent(final String destination, final Object data) {
-		this(new FileLocation(destination), data);
+		super(destination, data);
 	}
 
 	/**
 	 * @deprecated use {@link #getLocation} instead
 	 */
 	@Deprecated
 	public String getDestination() {
-		try {
-			FileLocation fileLocation = (FileLocation) getLocation();
-			return fileLocation.getFile().getAbsolutePath();
-		} catch(ClassCastException e) {
-			return getLocation().getURI().toString();
-		}
+		return getDescriptor();
 	}
 }

src/main/java/org/scijava/io/event/IOEvent.java

@@ -29,9 +29,12 @@
 
 package org.scijava.io.event;
 
+import java.net.URISyntaxException;
+
 import org.scijava.event.SciJavaEvent;
 import org.scijava.io.location.FileLocation;
 import org.scijava.io.location.Location;
+import org.scijava.io.location.LocationService;
 
 /**
  * An event indicating that I/O (e.g., opening or saving) has occurred.
@@ -43,6 +46,10 @@ public abstract class IOEvent extends SciJavaEvent {
 	/** The data location (source or destination). */
 	private final Location location;
 
+	/** @deprecated use {@link #location} instead */
+	@Deprecated
+	private final String descriptor;
+
 	/** The data for which I/O took place. */
 	private final Object data;
 
@@ -51,17 +58,26 @@ public abstract class IOEvent extends SciJavaEvent {
 	 */
 	@Deprecated
 	public IOEvent(final String descriptor, final Object data) {
-		this(new FileLocation(descriptor), data);
+		this.location = null;
+		this.descriptor = descriptor;
+		this.data = data;
 	}
 
 	public IOEvent(final Location location, final Object data) {
 		this.location = location;
+		this.descriptor = null;
 		this.data = data;
 	}
 
 	/** Gets the data location (source or destination). */
 	public Location getLocation() {
-		return location;
+		if (location != null) return location;
+		try {
+			return context().service(LocationService.class).resolve(descriptor);
+		}
+		catch (final URISyntaxException exc) {
+			return null;
+		}
 	}
 
 	/** Gets the data for which I/O took place. */
@@ -82,12 +98,11 @@ public String toString() {
 	 */
 	@Deprecated
 	public String getDescriptor() {
-		try {
-			FileLocation fileLocation = (FileLocation) getLocation();
+		if (descriptor != null) return descriptor;
+		if (location instanceof FileLocation) {
+			final FileLocation fileLocation = (FileLocation) location;
 			return fileLocation.getFile().getAbsolutePath();
-		} catch(ClassCastException e) {
-			return getLocation().getURI().toString();
 		}
+		return location.getURI().toString();
 	}
-
 }