Remove some more uses of ResourceManager.

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

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -22,10 +22,9 @@
 
 package com.dmdirc.plugins;
 
-import com.dmdirc.util.resourcemanager.ResourceManager;
-
 import java.io.IOException;
 import java.net.URL;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
@@ -117,16 +116,10 @@ public class PluginClassLoader extends ClassLoader {
             }
         }
 
-        final ResourceManager res;
-        try {
-            res = pluginInfo.getResourceManager();
-        } catch (IOException ioe) {
-            throw new ClassNotFoundException("Error with resourcemanager", ioe);
-        }
-
         final String fileName = name.replace('.', '/') + ".class";
         try {
-            if (pluginInfo.isPersistent(name) || !res.resourceExists(fileName)) {
+            if (pluginInfo.isPersistent(name) || !Files.exists(
+                    pluginInfo.getPath(fileName))) {
                 if (!pluginInfo.isPersistent(name) && askGlobal) {
                     return globalLoader.loadClass(name);
                 } else {
@@ -152,8 +145,12 @@ public class PluginClassLoader extends ClassLoader {
 
         // We are meant to be loading this one!
         final byte[] data;
-        if (res.resourceExists(fileName)) {
-            data = res.getResourceBytes(fileName);
+        if (Files.exists(pluginInfo.getPath(fileName))) {
+            try {
+                data = Files.readAllBytes(pluginInfo.getPath(fileName));
+            } catch (IOException ex) {
+                throw new ClassNotFoundException(ex.getMessage(), ex);
+            }
         } else {
             throw new ClassNotFoundException("Resource '" + name + "' (wanted by " + pluginInfo.
                     getMetaData().getName() + ") does not exist.");
@@ -181,9 +178,7 @@ public class PluginClassLoader extends ClassLoader {
     @Override
     protected URL findResource(final String name) {
         try {
-            final ResourceManager res = pluginInfo.getResourceManager();
-            final URL url = res.getResourceURL(name);
-
+            final URL url = pluginInfo.getPath(name).toUri().toURL();
             if (url != null) {
                 return url;
             }

src/com/dmdirc/plugins/PluginInfo.java

@@ -424,13 +424,37 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
         return !metaData.hasErrors();
     }
 
+    /**
+     * Returns the file system for this plugin's jar.
+     *
+     * @return Filesystem
+     */
+    public FileSystem getFileSystem() {
+        return pluginFilesystem;
+    }
+
+    /**
+     * Returns a path inside the plugin's jar for the given name.
+     *
+     * @param   first The path string or initial part of the path string
+     * @param   more Additional strings to be joined to form the full path
+     *
+     * @return The resulting path inside the plugin's jar
+     */
+    public Path getPath(final String first, final String... more) {
+        return pluginFilesystem.getPath(first, more);
+    }
+
     /**
      * Gets a resource manager for this plugin
      *
      * @return The resource manager for this plugin
      *
      * @throws IOException if there is any problem getting a ResourceManager for this plugin
+     *
+     * @deprecated @See getFileSystem()
      */
+    @Deprecated
     public ResourceManager getResourceManager() throws IOException {
         return getResourceManager(false);
     }
@@ -444,7 +468,10 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
      *
      * @throws IOException if there is any problem getting a ResourceManager for this plugin
      * @since 0.6
+     *
+     * @deprecated @See getFileSystem()
      */
+    @Deprecated
     public synchronized ResourceManager getResourceManager(final boolean forceNew) throws
             IOException {
         if (resourceManager == null || forceNew) {