diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-05 22:45:54 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-05 22:45:54 +0000 |
commit | 71c12aadc93f90ed0cca40ce207fb6b91ff66a27 (patch) | |
tree | caf9be9cf958647db473da1fc6d6f087b5c0c5bd /src/main | |
parent | 9b227081f589700a365d760e9e9af90248ffa9e2 (diff) | |
download | bukkit-71c12aadc93f90ed0cca40ce207fb6b91ff66a27.tar bukkit-71c12aadc93f90ed0cca40ce207fb6b91ff66a27.tar.gz bukkit-71c12aadc93f90ed0cca40ce207fb6b91ff66a27.tar.lz bukkit-71c12aadc93f90ed0cca40ce207fb6b91ff66a27.tar.xz bukkit-71c12aadc93f90ed0cca40ce207fb6b91ff66a27.zip |
Separate InvalidDescriptionException -> InvalidPluginException
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/org/bukkit/plugin/PluginLoader.java | 2 | ||||
-rw-r--r-- | src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java index a652b4ba..d8a26644 100644 --- a/src/main/java/org/bukkit/plugin/PluginLoader.java +++ b/src/main/java/org/bukkit/plugin/PluginLoader.java @@ -19,7 +19,7 @@ public interface PluginLoader { * unsuccessful * @throws InvalidPluginException Thrown when the specified file is not a plugin */ - public Plugin loadPlugin(File file) throws InvalidPluginException; + public Plugin loadPlugin(File file) throws InvalidPluginException, InvalidDescriptionException; /** * Returns a list of all filename filters expected by this PluginLoader diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index 2c9b5078..f0d7d13c 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -41,7 +41,7 @@ public final class JavaPluginLoader implements PluginLoader { server = instance; } - public Plugin loadPlugin(File file) throws InvalidPluginException { + public Plugin loadPlugin(File file) throws InvalidPluginException, InvalidDescriptionException { JavaPlugin result = null; PluginDescriptionFile description = null; @@ -63,8 +63,6 @@ public final class JavaPluginLoader implements PluginLoader { jar.close(); } catch (IOException ex) { throw new InvalidPluginException(ex); - } catch (InvalidDescriptionException ex) { - throw new InvalidPluginException(ex); } try { |