DefaultTableIOPlugin: stop assuming FileService

ctrueden · ctrueden · commit 6e4ba23febd3 · 2018-12-12T16:15:44.000+01:00
We now use the LocationService's resolve(String) method to magically
transform the string into a Location. And fail fast if it doesn't work.
diff --git a/src/main/java/org/scijava/table/DefaultTableIOPlugin.java b/src/main/java/org/scijava/table/DefaultTableIOPlugin.java
@@ -30,6 +30,7 @@
 
 package org.scijava.table;
 
+import java.net.URISyntaxException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -42,11 +43,11 @@
 
 import org.scijava.Priority;
 import org.scijava.io.AbstractIOPlugin;
+import org.scijava.io.IOPlugin;
 import org.scijava.io.handle.DataHandle;
 import org.scijava.io.handle.DataHandleService;
-import org.scijava.io.location.FileLocation;
-import org.scijava.io.IOPlugin;
 import org.scijava.io.location.Location;
+import org.scijava.io.location.LocationService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
 import org.scijava.util.FileUtils;
@@ -60,6 +61,9 @@
 @Plugin(type = IOPlugin.class, priority = Priority.LOW)
 public class DefaultTableIOPlugin extends AbstractIOPlugin<Table> {
 
+	@Parameter
+	private LocationService locationService;
+
 	@Parameter
 	private DataHandleService dataHandleService;
 
@@ -190,8 +194,13 @@ else if (line.charAt(idx) == separator) {
 
 	@Override
 	public GenericTable open(final String source) throws IOException {
-		// FIXME Assumes FileLocation
-		final Location sourceLocation = new FileLocation(source);
+		final Location sourceLocation;
+		try {
+			sourceLocation = locationService.resolve(source);
+		}
+		catch (final URISyntaxException exc) {
+			throw new IOException("Unresolvable source: " + source, exc);
+		}
 		final GenericTable table = new DefaultGenericTable();
 
 		try (final DataHandle<? extends Location> handle = //
@@ -266,8 +275,13 @@ public GenericTable open(final String source) throws IOException {
 	public void save(final Table table, final String destination)
 		throws IOException
 	{
-		// FIXME Assumes FileLocation
-		final Location dstLocation = new FileLocation(destination);
+		final Location dstLocation;
+		try {
+			dstLocation = locationService.resolve(destination);
+		}
+		catch (final URISyntaxException exc) {
+			throw new IOException("Unresolvable destination: " + destination, exc);
+		}
 
 		try (final DataHandle<Location> handle = //
 			dataHandleService.create(dstLocation))
