From e3497e12a01a9b59db12aad8464a88d279512397 Mon Sep 17 00:00:00 2001 From: Lymia Date: Sun, 2 Jan 2011 00:26:04 -0600 Subject: [PATCH 1/3] Added generics to PluginManager --- src/main/java/org/bukkit/plugin/PluginManager.java | 2 +- src/main/java/org/bukkit/plugin/SimplePluginManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java index a2f88cb1..1f22efd4 100644 --- a/src/main/java/org/bukkit/plugin/PluginManager.java +++ b/src/main/java/org/bukkit/plugin/PluginManager.java @@ -18,7 +18,7 @@ public interface PluginManager { * @param loader Class name of the PluginLoader to register * @throws IllegalArgumentException Thrown when the given Class is not a valid PluginLoader */ - public void RegisterInterface(Class loader) throws IllegalArgumentException; + public void RegisterInterface(Class loader) throws IllegalArgumentException; /** * Checks if the given plugin is loaded and returns it when applicable diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java index 08fed37f..ed171479 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -39,11 +39,11 @@ public final class SimplePluginManager implements PluginManager { * @param loader Class name of the PluginLoader to register * @throws IllegalArgumentException Thrown when the given Class is not a valid PluginLoader */ - public void RegisterInterface(Class loader) throws IllegalArgumentException { + public void RegisterInterface(Class loader) throws IllegalArgumentException { PluginLoader instance; if (PluginLoader.class.isAssignableFrom(loader)) { - Constructor constructor; + Constructor constructor; try { constructor = loader.getConstructor(Server.class); instance = (PluginLoader) constructor.newInstance(server); From 212404f7f7a481a041496e34a010d29cc2ee7acf Mon Sep 17 00:00:00 2001 From: Lymia Date: Sun, 2 Jan 2011 00:29:34 -0600 Subject: [PATCH 2/3] Opps! Wrong class. --- src/main/java/org/bukkit/plugin/PluginManager.java | 2 +- src/main/java/org/bukkit/plugin/SimplePluginManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java index 1f22efd4..fcef6b89 100644 --- a/src/main/java/org/bukkit/plugin/PluginManager.java +++ b/src/main/java/org/bukkit/plugin/PluginManager.java @@ -18,7 +18,7 @@ public interface PluginManager { * @param loader Class name of the PluginLoader to register * @throws IllegalArgumentException Thrown when the given Class is not a valid PluginLoader */ - public void RegisterInterface(Class loader) throws IllegalArgumentException; + public void RegisterInterface(Class loader) throws IllegalArgumentException; /** * Checks if the given plugin is loaded and returns it when applicable diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java index ed171479..64eab97b 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -39,11 +39,11 @@ public final class SimplePluginManager implements PluginManager { * @param loader Class name of the PluginLoader to register * @throws IllegalArgumentException Thrown when the given Class is not a valid PluginLoader */ - public void RegisterInterface(Class loader) throws IllegalArgumentException { + public void RegisterInterface(Class loader) throws IllegalArgumentException { PluginLoader instance; if (PluginLoader.class.isAssignableFrom(loader)) { - Constructor constructor; + Constructor constructor; try { constructor = loader.getConstructor(Server.class); instance = (PluginLoader) constructor.newInstance(server); From 739142b42e0fa87406a68255d4d9f8190af4f821 Mon Sep 17 00:00:00 2001 From: Lymia Date: Sun, 2 Jan 2011 00:38:51 -0600 Subject: [PATCH 3/3] Fixed generics warning. --- src/main/java/org/bukkit/plugin/PluginDescriptionFile.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java index 9387d253..78f54281 100644 --- a/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java +++ b/src/main/java/org/bukkit/plugin/PluginDescriptionFile.java @@ -17,6 +17,7 @@ public final class PluginDescriptionFile { private String name = null; private String main = null; + @SuppressWarnings("unchecked") public PluginDescriptionFile(final InputStream stream) throws InvalidDescriptionException { try { loadMap((Map)yaml.load(stream)); @@ -29,10 +30,11 @@ public final class PluginDescriptionFile { * Loads a PluginDescriptionFile from the specified reader * @param reader */ + @SuppressWarnings("unchecked") public PluginDescriptionFile(final Reader reader) { loadMap((Map)yaml.load(reader)); } - + /** * Creates a new PluginDescriptionFile with the given detailed *