From 44f41714dee264c8ece71bf8a0f40d4b97b64b62 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 8 Apr 2018 12:20:34 -0400 Subject: [PATCH] runelite-client: remove old plugin classloader --- .../net/runelite/client/plugins/Plugin.java | 1 - .../client/plugins/PluginClassLoader.java | 67 ------------------- 2 files changed, 68 deletions(-) delete mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/PluginClassLoader.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java index b30d174f02..8a220495c6 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/Plugin.java @@ -36,7 +36,6 @@ public abstract class Plugin implements Module { protected Injector injector; File file; - PluginClassLoader loader; @Override public void configure(Binder binder) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/PluginClassLoader.java b/runelite-client/src/main/java/net/runelite/client/plugins/PluginClassLoader.java deleted file mode 100644 index eab03e8a73..0000000000 --- a/runelite-client/src/main/java/net/runelite/client/plugins/PluginClassLoader.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2016-2017, Adam - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.client.plugins; - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; - -/** - * A classloader for external plugins - * - * @author Adam - */ -public class PluginClassLoader extends URLClassLoader -{ - private final ClassLoader parent; - - public PluginClassLoader(File plugin, ClassLoader parent) throws MalformedURLException - { - super( - new URL[] - { - plugin.toURI().toURL() - }, - null // null or else class path scanning includes everything from the main class loader - ); - - this.parent = parent; - } - - @Override - public Class loadClass(String name) throws ClassNotFoundException - { - try - { - return super.loadClass(name); - } - catch (ClassNotFoundException ex) - { - // fall back to main class loader - return parent.loadClass(name); - } - } -}