This code doesn't do subdirectories, so is completely broken. It just happens to not be used in the client.

Revert "Start using nio2 in resource managers."

This reverts commit a4c4174103.

Change-Id: Ia0c6f0f1a7c654338573440826b0bb8c89564c17
Reviewed-on: http://gerrit.dmdirc.com/3513
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/CorePluginExtractor.java

@@ -60,14 +60,8 @@ public class CorePluginExtractor {
      *               extracted.
      */
     public void extractCorePlugins(final String prefix) {
-        final Map<String, byte[]> resources;
-        try {
-            resources = ResourceManager.getResourceManager()
-                    .getResourcesStartingWithAsBytes("plugins");
-        } catch (IOException ex) {
-            Logger.userError(ErrorLevel.LOW, "Failed to extract plugins", ex);
-            return;
-        }
+        final Map<String, byte[]> resources = ResourceManager.getResourceManager()
+                .getResourcesStartingWithAsBytes("plugins");
         for (Map.Entry<String, byte[]> resource : resources.entrySet()) {
             try {
                 final String resourceName = pluginDir + resource.getKey().substring(7);

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -154,12 +154,7 @@ public class PluginClassLoader extends ClassLoader {
         byte[] data = null;
 
         if (res.resourceExists(fileName)) {
-            try {
-                data = res.getResourceBytes(fileName);
-            } catch (IOException ex) {
-                throw new ClassNotFoundException("Resource '" + name + "' (wanted by " + pluginInfo.
-                        getMetaData().getName() + ") does not exist.", ex);
-            }
+            data = res.getResourceBytes(fileName);
         } else {
             throw new ClassNotFoundException("Resource '" + name + "' (wanted by " + pluginInfo.
                     getMetaData().getName() + ") does not exist.");

src/com/dmdirc/plugins/PluginInfo.java

@@ -129,11 +129,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             throw new PluginException("Plugin " + filename + " failed to load. " + lastError, ioe);
         }
 
-        try {
-            updateClassList(res);
-        } catch (IOException ex) {
-            throw new PluginException("Plugin " + filename + " failed to load. ", ex);
-        }
+        updateClassList(res);
 
         if (!myClasses.contains(metadata.getMainClass())) {
             lastError = "main class file (" + metadata.getMainClass() + ") not found in jar.";
@@ -168,10 +164,8 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      * Updates the list of known classes within this plugin from the specified resource manager.
      *
      * @param res Resource manager to use to read the plugin contents.
-     *
-     * @throws IOException if resource listing fails
      */
-    private void updateClassList(final ResourceManager res) throws IOException {
+    private void updateClassList(final ResourceManager res) {
         myClasses.clear();
 
         for (final String classfilename : res.getResourcesStartingWith("")) {

src/com/dmdirc/util/resourcemanager/FileResourceManager.java

@@ -22,16 +22,17 @@
 
 package com.dmdirc.util.resourcemanager;
 
+import com.dmdirc.util.io.StreamUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.file.DirectoryStream;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,10 +42,8 @@ import java.util.Map;
  */
 public final class FileResourceManager extends ResourceManager {
 
-    /** Filesystem to use. */
-    private final FileSystem fs = FileSystems.getDefault();
     /** Base path for the project. */
-    private final Path basePath;
+    private final String basePath;
 
     /**
      * Creates a new instance of FileResourceManager.
@@ -54,79 +53,187 @@ public final class FileResourceManager extends ResourceManager {
     protected FileResourceManager(final String basePath) {
         super();
 
-        this.basePath = fs.getPath(basePath);
+        this.basePath = basePath;
     }
 
+    /** {@inheritDoc} */
     @Override
     public boolean resourceExists(final String resource) {
-        final Path path = basePath.resolve(resource);
-        return Files.exists(path) && !Files.isDirectory(path);
+        final File file;
+
+        if (resource.startsWith(basePath)) {
+            file = new File(resource);
+        } else {
+            file = new File(basePath, resource);
+        }
+
+        return file.exists() && !file.isDirectory();
     }
 
+    /** {@inheritDoc} */
     @Override
-    public byte[] getResourceBytes(final String resource) throws IOException {
-        return Files.readAllBytes(basePath.resolve(resource));
+    public byte[] getResourceBytes(final String resource) {
+        FileInputStream inputStream = null;
+        final File file;
+
+        if (resource.startsWith(basePath)) {
+            file = new File(resource);
+        } else {
+            file = new File(basePath, resource);
+        }
+
+        if (!file.exists()) {
+            return new byte[0];
+        }
+
+        if (file.isDirectory()) {
+            return new byte[0];
+        }
+
+        final byte[] bytes = new byte[(int) file.length()];
+
+        try {
+            inputStream = new FileInputStream(file);
+            inputStream.read(bytes);
+        } catch (IOException ex) {
+            return new byte[0];
+        } finally {
+            StreamUtils.close(inputStream);
+        }
+
+        return bytes;
     }
 
+    /** {@inheritDoc} */
     @Override
-    public InputStream getResourceInputStream(final String resource) throws IOException {
-        return Files.newInputStream(basePath.resolve(resource));
+    public InputStream getResourceInputStream(final String resource) {
+        final File file;
+
+        if (resource.startsWith(basePath)) {
+            file = new File(resource);
+        } else {
+            file = new File(basePath, resource);
+        }
+
+        if (!file.exists()) {
+            return null;
+        }
+
+        if (file.isDirectory()) {
+            return null;
+        }
+
+        try {
+            return new FileInputStream(file);
+        } catch (FileNotFoundException ex) {
+            return null;
+        }
     }
 
+    /** {@inheritDoc} */
     @Override
     public URL getResourceURL(final String resource) throws MalformedURLException {
-        return basePath.resolve(resource).toUri().toURL();
+        if (resourceExists(resource)) {
+            return new File(basePath, resource).toURI().toURL();
+        } else {
+            return null;
+        }
     }
 
+    /** {@inheritDoc} */
     @Override
-    public Map<String, byte[]> getResourcesEndingWithAsBytes(final String resourcesSuffix)
-            throws IOException {
-        final DirectoryStream<Path> paths = Files.newDirectoryStream(basePath);
+    public Map<String, byte[]> getResourcesEndingWithAsBytes(
+            final String resourcesSuffix) {
+        final List<File> files = getFileListing(new File(basePath));
         final Map<String, byte[]> resources = new HashMap<>();
-        for (Path path : paths) {
+
+        for (File file : files) {
+            final String path = file.getPath().substring(basePath.length(),
+                    file.getPath().length());
             if (path.endsWith(resourcesSuffix)) {
-                resources.put(path.toString(), Files.readAllBytes(path));
+                resources.put(path, getResourceBytes(path));
             }
         }
+
         return resources;
     }
 
+    /** {@inheritDoc} */
     @Override
-    public Map<String, byte[]> getResourcesStartingWithAsBytes(final String resourcesPrefix)
-            throws IOException {
-        final DirectoryStream<Path> paths = Files.newDirectoryStream(basePath);
+    public Map<String, byte[]> getResourcesStartingWithAsBytes(
+            final String resourcesPrefix) {
+        final List<File> files = getFileListing(new File(basePath));
         final Map<String, byte[]> resources = new HashMap<>();
-        for (Path path : paths) {
+
+        for (File file : files) {
+            final String path = file.getPath().substring(basePath.length(),
+                    file.getPath().length());
             if (path.startsWith(resourcesPrefix)) {
-                resources.put(path.toString(), Files.readAllBytes(path));
+                resources.put(path, getResourceBytes(path));
             }
         }
+
         return resources;
     }
 
+    /** {@inheritDoc} */
     @Override
     public Map<String, InputStream> getResourcesStartingWithAsInputStreams(
-            final String resourcesPrefix) throws IOException {
-        final DirectoryStream<Path> files = Files.newDirectoryStream(basePath);
+            final String resourcesPrefix) {
+        final List<File> files = getFileListing(new File(basePath));
         final Map<String, InputStream> resources = new HashMap<>();
-        for (Path file : files) {
-            if (file.startsWith(resourcesPrefix)) {
-                resources.put(file.toString(), Files.newInputStream(file));
+
+        for (File file : files) {
+            final String path = file.getPath().substring(basePath.length(),
+                    file.getPath().length());
+            if (path.startsWith(resourcesPrefix)) {
+                resources.put(path, getResourceInputStream(path));
             }
         }
+
         return resources;
     }
 
+    /** {@inheritDoc} */
     @Override
-    public List<String> getResourcesStartingWith(final String resourcesPrefix) throws IOException {
-        final DirectoryStream<Path> files = Files.newDirectoryStream(basePath);
+    public List<String> getResourcesStartingWith(final String resourcesPrefix) {
+        final List<File> files = getFileListing(new File(basePath));
         final List<String> resources = new ArrayList<>();
-        for (Path file : files) {
-            if (file.startsWith(resourcesPrefix)) {
-                resources.add(file.toString());
+
+        for (File file : files) {
+            final String path = file.getPath().substring(basePath.length(),
+                    file.getPath().length());
+            if (path.startsWith(resourcesPrefix)) {
+                resources.add(path);
             }
         }
+
         return resources;
     }
 
+    /**
+     * Returns a resursive listing of a directory tree.
+     *
+     * @param startingDirectory Starting directory for the file listing
+     *
+     * @return Recursive directory listing
+     */
+    private static List<File> getFileListing(final File startingDirectory) {
+        final List<File> result = new ArrayList<>();
+
+        if (startingDirectory.listFiles() == null) {
+            return result;
+        }
+
+        final List<File> files = Arrays.asList(startingDirectory.listFiles());
+        for (File file : files) {
+            if (file.isFile()) {
+                result.add(file);
+            } else {
+                result.addAll(getFileListing(file));
+            }
+        }
+        return result;
+    }
+
 }

src/com/dmdirc/util/resourcemanager/ResourceManager.java

@@ -59,13 +59,8 @@ public abstract class ResourceManager {
                     me = new ZipResourceManager(DMDircResourceManager
                             .getWorkingDirectoryString(mainClassURL));
                 } else {
-                    final String path = DMDircResourceManager
-                            .getWorkingDirectoryString(mainClassURL);
-                    if (path.charAt(0) == '/') {
-                        me = new FileResourceManager(path.substring(1));
-                    } else {
-                        me = new FileResourceManager(path);
-                    }
+                    me = new FileResourceManager(DMDircResourceManager
+                            .getWorkingDirectoryString(mainClassURL));
                 }
             } catch (IOException ex) {
                 Logger.appError(ErrorLevel.MEDIUM,
@@ -246,10 +241,8 @@ public abstract class ResourceManager {
      * @param resource Name of the resource to return
      *
      * @return byte[] for the resource, or an empty byte[] if not found
-     *
-     * @throws IOException if reading the file fails
      */
-    public abstract byte[] getResourceBytes(final String resource) throws IOException;
+    public abstract byte[] getResourceBytes(final String resource);
 
     /**
      * Gets an InputStream for the specified resource.
@@ -257,10 +250,8 @@ public abstract class ResourceManager {
      * @param resource Name of the resource to return
      *
      * @return InputStream for the resource, or null if not found
-     *
-     * @throws IOException if reading the file fails
      */
-    public abstract InputStream getResourceInputStream(final String resource) throws IOException;
+    public abstract InputStream getResourceInputStream(final String resource);
 
     /**
      * Gets an URL for the specified resource.
@@ -281,11 +272,9 @@ public abstract class ResourceManager {
      *
      * @since 0.6
      * @return Map of byte[]s of resources found
-     *
-     * @throws IOException if reading the file fails
      */
     public abstract Map<String, byte[]> getResourcesEndingWithAsBytes(
-            final String resourcesSuffix) throws IOException;
+            final String resourcesSuffix);
 
     /**
      * Gets a Map of byte[]s of the resources starting with the specified prefix.
@@ -293,11 +282,9 @@ public abstract class ResourceManager {
      * @param resourcesPrefix Prefix of the resources to return
      *
      * @return Map of byte[]s of resources found
-     *
-     * @throws IOException if reading the file fails
      */
     public abstract Map<String, byte[]> getResourcesStartingWithAsBytes(
-            final String resourcesPrefix) throws IOException;
+            final String resourcesPrefix);
 
     /**
      * Gets a Map of InputStreams of the resources starting with the specified prefix.
@@ -305,11 +292,9 @@ public abstract class ResourceManager {
      * @param resourcesPrefix Prefix of the resources to return
      *
      * @return Map of InputStreams of resources found
-     *
-     * @throws IOException if reading the file fails
      */
     public abstract Map<String, InputStream> getResourcesStartingWithAsInputStreams(
-            final String resourcesPrefix) throws IOException;
+            final String resourcesPrefix);
 
     /**
      * Gets a List of the resources starting with the specified prefix.
@@ -317,10 +302,7 @@ public abstract class ResourceManager {
      * @param resourcesPrefix Prefix of the resources to return
      *
      * @return List of resources found
-     *
-     * @throws IOException if reading the file fails
      */
-    public abstract List<String> getResourcesStartingWith(final String resourcesPrefix)
-            throws IOException;
+    public abstract List<String> getResourcesStartingWith(final String resourcesPrefix);
 
 }