From f7b9a834ab86de85450b0bff300a7e77674c5069 Mon Sep 17 00:00:00 2001 From: Pascal Koenig Date: Sat, 3 Sep 2011 02:18:50 +0200 Subject: [PATCH] Corrected defect push. --- .../XmlStats/Datasource/AchievementsDS.java | 12 --------- src/de/sockenklaus/XmlStats/Webserver.java | 9 +------ src/de/sockenklaus/XmlStats/XmlStats.java | 27 +------------------ .../XmlWorkers/XmlWorkerAchievements.java | 24 ----------------- 4 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 src/de/sockenklaus/XmlStats/Datasource/AchievementsDS.java delete mode 100644 src/de/sockenklaus/XmlStats/XmlWorkers/XmlWorkerAchievements.java diff --git a/src/de/sockenklaus/XmlStats/Datasource/AchievementsDS.java b/src/de/sockenklaus/XmlStats/Datasource/AchievementsDS.java deleted file mode 100644 index 180cd31..0000000 --- a/src/de/sockenklaus/XmlStats/Datasource/AchievementsDS.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * - */ -package de.sockenklaus.XmlStats.Datasource; - -/** - * @author socrates - * - */ -public class AchievementsDS extends Datasource { - -} diff --git a/src/de/sockenklaus/XmlStats/Webserver.java b/src/de/sockenklaus/XmlStats/Webserver.java index bde6c17..7992ca1 100644 --- a/src/de/sockenklaus/XmlStats/Webserver.java +++ b/src/de/sockenklaus/XmlStats/Webserver.java @@ -92,14 +92,7 @@ public class Webserver { else { XmlStats.LogWarn("iConomy not loaded correctly. Disabling /money.xml"); } - - if(XmlStats.isAchievementsHooked()){ - server.createContext("/achievements.xml", new XmlWorkerAchievements()); - } - else { - XmlStats.LogWarn("Achievements not loaded correctly. Disabling /achievements.xml"); - } - + this.server.start(); } } diff --git a/src/de/sockenklaus/XmlStats/XmlStats.java b/src/de/sockenklaus/XmlStats/XmlStats.java index d59ebee..8232acf 100644 --- a/src/de/sockenklaus/XmlStats/XmlStats.java +++ b/src/de/sockenklaus/XmlStats/XmlStats.java @@ -143,7 +143,6 @@ public class XmlStats extends JavaPlugin { protected void hookPlugins(){ Plugin StatsTemp = getServer().getPluginManager().getPlugin("Stats"); Plugin iConomyTemp = getServer().getPluginManager().getPlugin("iConomy"); - Plugin AchievementsTemp = getServer().getPluginManager().getPlugin("Achievements"); if(StatsTemp != null){ if(StatsTemp.isEnabled() && StatsTemp.getClass().getName().equals("com.nidefawl.Stats.Stats")){ @@ -154,17 +153,7 @@ public class XmlStats extends JavaPlugin { else { LogWarn("Stats not found! Can't hook into it."); } - - if(AchievementsTemp != null){ - if(AchievementsTemp.isEnabled() && AchievementsTemp.getClass().getName().equals("com.nidefawl.Achievements.Achievements")){ - XmlStatsRegistry.put("achievements", (Achievements)AchievementsTemp); - LogInfo("Hooked into Achievements!"); - } - } - else { - LogWarn("Achievements not found! Can't hook into it."); - } - + if (iConomyTemp != null) { if (iConomyTemp.isEnabled() && iConomyTemp.getClass().getName().equals("com.iConomy.iConomy")) { XmlStatsRegistry.put("iconomy", (iConomy)iConomyTemp); @@ -204,20 +193,6 @@ public class XmlStats extends JavaPlugin { return false; } - /** - * Checks if is Achievements hooked. - * - * @return true, if is Achievements hooked - */ - public static boolean isAchievementsHooked(){ - Achievements AchievementsTemp = (Achievements)XmlStatsRegistry.get("achievments"); - - if (AchievementsTemp != null){ - if(AchievementsTemp.getClass().getName().equals("com.nidefawl.Achievements.Achievements") && AchievementsTemp.isEnabled()) return true; - } - return false; - } - /* (non-Javadoc) * @see org.bukkit.plugin.java.JavaPlugin#onCommand(org.bukkit.command.CommandSender, org.bukkit.command.Command, java.lang.String, java.lang.String[]) */ diff --git a/src/de/sockenklaus/XmlStats/XmlWorkers/XmlWorkerAchievements.java b/src/de/sockenklaus/XmlStats/XmlWorkers/XmlWorkerAchievements.java deleted file mode 100644 index 20956dd..0000000 --- a/src/de/sockenklaus/XmlStats/XmlWorkers/XmlWorkerAchievements.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * - */ -package de.sockenklaus.XmlStats.XmlWorkers; - -import java.util.List; -import java.util.Map; - -/** - * @author socrates - * - */ -public class XmlWorkerAchievements extends XmlWorker { - - /* (non-Javadoc) - * @see de.sockenklaus.XmlStats.XmlWorkers.XmlWorker#getXML(java.util.Map) - */ - @Override - String getXML(Map> parameters) { - // TODO Auto-generated method stub - return null; - } - -}