remove URLType

Author: dominikl

src/main/java/loci/common/Location.java

@@ -37,7 +37,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UncheckedIOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -68,12 +67,6 @@ public class Location {
   private static final boolean IS_WINDOWS =
     System.getProperty("os.name").startsWith("Windows");
 
-  // -- Enumerations --
-  protected enum UrlType {
-    GENERIC,
-    S3
-  };
-
   // -- Static fields --
 
   /** Map from given filenames to actual filenames. */
@@ -113,7 +106,6 @@ protected class ListingsResult {
   // -- Fields --
 
   private boolean isURL = false;
-  private UrlType urlType;
   private URL url;
   private URI uri;
   private File file;
@@ -203,15 +195,13 @@ public Location(String parent, String child) {
         pathname = child;
         uri = new URI(mapped);
         isURL = true;
-        urlType = UrlType.GENERIC;
         url = uri.toURL();
       }
       catch (URISyntaxException | MalformedURLException e) {
         // Readers such as FilePatternReader may pass invalid URI paths
         // containing <> so don't throw, instead treat as a non-URL
         LOGGER.debug("Invalid URL: {} {}", child, e);
         isURL = false;
-        urlType = null;
         url = null;
         uri = null;
       }
@@ -554,18 +544,6 @@ public String[] list(boolean noHiddenFiles) {
     final List<String> files = new ArrayList<String>();
     if (isURL) {
       try {
-        if (urlType == UrlType.S3) {
-          if (isDirectory()) {
-            // TODO: This is complicated, not sure what to do here
-            // See comment in isDirectory()
-            LOGGER.trace("list s3 {}: Returning []", uri);
-            return new String[0];
-          }
-          else {
-            LOGGER.trace("list s3 {}: Returning null", uri);
-            return null;
-          }
-        }
         URLConnection c = url.openConnection();
         InputStream is = c.getInputStream();
         boolean foundEnd = false;

src/main/java/loci/common/StreamHandle.java

@@ -52,17 +52,6 @@
  */
 public abstract class StreamHandle implements IRandomAccess {
 
-  // TODO: Decide how to handle S3Handle and other reader settings
-  public static class Settings {
-    public String get(String key) {
-      return System.getenv(key);
-    }
-
-    public String getRemoteCacheRootDir() {
-      return get("BF_REMOTE_CACHE_ROOTDIR");
-    }
-  }
-
   private static final Logger LOGGER = LoggerFactory.getLogger(StreamHandle.class);
 
   // -- Fields --