From fce128ccab971838b42f772fd545904ffbfaf3af Mon Sep 17 00:00:00 2001 From: Robin Kupper Date: Thu, 16 Jun 2011 11:12:32 +0200 Subject: [PATCH] Using interfaces --- src/de/diddiz/LogBlock/Config.java | 3 ++- src/de/diddiz/LogBlock/Consumer.java | 12 +++++++----- src/de/diddiz/LogBlock/LBChestAccessListener.java | 3 ++- src/de/diddiz/LogBlock/LogBlock.java | 1 + src/de/diddiz/LogBlock/QueryParams.java | 2 +- src/de/diddiz/LogBlock/Updater.java | 2 +- src/de/diddiz/LogBlock/WorldEditor.java | 3 ++- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/de/diddiz/LogBlock/Config.java b/src/de/diddiz/LogBlock/Config.java index eb4ac78..b4bf5bc 100644 --- a/src/de/diddiz/LogBlock/Config.java +++ b/src/de/diddiz/LogBlock/Config.java @@ -7,6 +7,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.zip.DataFormatException; import org.bukkit.Material; @@ -15,7 +16,7 @@ import org.bukkit.util.config.Configuration; public class Config { - public final HashMap tables; + public final Map tables; public final String url, user, password; public final int delayBetweenRuns, forceToProcessAtLeast, timePerRun; public final boolean useBukkitScheduler; diff --git a/src/de/diddiz/LogBlock/Consumer.java b/src/de/diddiz/LogBlock/Consumer.java index dade2ac..44143c7 100644 --- a/src/de/diddiz/LogBlock/Consumer.java +++ b/src/de/diddiz/LogBlock/Consumer.java @@ -9,6 +9,8 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.HashMap; import java.util.HashSet; +import java.util.Map; +import java.util.Queue; import java.util.Set; import java.util.TimerTask; import java.util.concurrent.LinkedBlockingQueue; @@ -26,15 +28,15 @@ import org.bukkit.inventory.ItemStack; public class Consumer extends TimerTask { - private final LinkedBlockingQueue bqueue = new LinkedBlockingQueue(); + private final Queue bqueue = new LinkedBlockingQueue(); private final Config config; private final Set hiddenplayers; - private final LinkedBlockingQueue kqueue = new LinkedBlockingQueue(); - private final HashMap lastAttackedEntity = new HashMap(); - private final HashMap lastAttackTime = new HashMap(); + private final Queue kqueue = new LinkedBlockingQueue(); + private final Map lastAttackedEntity = new HashMap(); + private final Map lastAttackTime = new HashMap(); private final Logger log; private final LogBlock logblock; - private final HashSet players = new HashSet(); + private final Set players = new HashSet(); Consumer(LogBlock logblock) { this.logblock = logblock; diff --git a/src/de/diddiz/LogBlock/LBChestAccessListener.java b/src/de/diddiz/LogBlock/LBChestAccessListener.java index 7f0efe4..9fc2837 100644 --- a/src/de/diddiz/LogBlock/LBChestAccessListener.java +++ b/src/de/diddiz/LogBlock/LBChestAccessListener.java @@ -4,6 +4,7 @@ import static de.diddiz.util.BukkitUtils.compareInventories; import static de.diddiz.util.BukkitUtils.compressInventory; import static de.diddiz.util.BukkitUtils.rawData; import java.util.HashMap; +import java.util.Map; import org.bukkit.Location; import org.bukkit.inventory.ItemStack; import org.bukkitcontrib.event.inventory.InventoryCloseEvent; @@ -13,7 +14,7 @@ import org.bukkitcontrib.event.inventory.InventoryOpenEvent; class LBChestAccessListener extends InventoryListener { private final Consumer consumer; - private final HashMap containers = new HashMap(); + private final Map containers = new HashMap(); LBChestAccessListener(LogBlock logblock) { consumer = logblock.getConsumer(); diff --git a/src/de/diddiz/LogBlock/LogBlock.java b/src/de/diddiz/LogBlock/LogBlock.java index 9edec80..5ed882c 100644 --- a/src/de/diddiz/LogBlock/LogBlock.java +++ b/src/de/diddiz/LogBlock/LogBlock.java @@ -154,6 +154,7 @@ public class LogBlock extends JavaPlugin public void onDisable() { if (timer != null) timer.cancel(); + getServer().getScheduler().cancelTasks(this); if (consumer != null && consumer.getQueueSize() > 0) { log.info("[LogBlock] Waiting for consumer ..."); final Thread thread = new Thread(consumer); diff --git a/src/de/diddiz/LogBlock/QueryParams.java b/src/de/diddiz/LogBlock/QueryParams.java index c73f54e..19cd831 100644 --- a/src/de/diddiz/LogBlock/QueryParams.java +++ b/src/de/diddiz/LogBlock/QueryParams.java @@ -23,7 +23,7 @@ import com.sk89q.worldedit.bukkit.selections.Selection; public class QueryParams implements Cloneable { - private static final HashSet keywords = new HashSet(Arrays.asList("player".hashCode(), "area".hashCode(), "selection".hashCode(), "sel".hashCode(), "block".hashCode(), "type".hashCode(), "sum".hashCode(), "destroyed".hashCode(), "created".hashCode(), "chestaccess".hashCode(), "all".hashCode(), "time".hashCode(), "since".hashCode(), "before".hashCode(), "limit".hashCode(), "world".hashCode(), "asc".hashCode(), "desc".hashCode(), "last".hashCode(), "coords".hashCode(), "silent".hashCode())); + private static final Set keywords = new HashSet(Arrays.asList("player".hashCode(), "area".hashCode(), "selection".hashCode(), "sel".hashCode(), "block".hashCode(), "type".hashCode(), "sum".hashCode(), "destroyed".hashCode(), "created".hashCode(), "chestaccess".hashCode(), "all".hashCode(), "time".hashCode(), "since".hashCode(), "before".hashCode(), "limit".hashCode(), "world".hashCode(), "asc".hashCode(), "desc".hashCode(), "last".hashCode(), "coords".hashCode(), "silent".hashCode())); public BlockChangeType bct = BlockChangeType.BOTH; public int limit = 15, minutes = 0, radius = -1; public Location loc = null; diff --git a/src/de/diddiz/LogBlock/Updater.java b/src/de/diddiz/LogBlock/Updater.java index 7f06b60..ff0b5b8 100644 --- a/src/de/diddiz/LogBlock/Updater.java +++ b/src/de/diddiz/LogBlock/Updater.java @@ -73,7 +73,7 @@ class Updater try { return readURL(new URL("http://diddiz.insane-architects.net/lbuptodate.php?v=" + logblock.getDescription().getVersion())); } catch (final Exception ex) { - return "Can't connect to server"; + return "Can't check version"; } } } diff --git a/src/de/diddiz/LogBlock/WorldEditor.java b/src/de/diddiz/LogBlock/WorldEditor.java index 05a6336..b0638d6 100644 --- a/src/de/diddiz/LogBlock/WorldEditor.java +++ b/src/de/diddiz/LogBlock/WorldEditor.java @@ -1,6 +1,7 @@ package de.diddiz.LogBlock; import static de.diddiz.util.BukkitUtils.equalTypes; +import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; import java.util.logging.Logger; import org.bukkit.World; @@ -18,7 +19,7 @@ public class WorldEditor implements Runnable private final Logger log; private final LogBlock logblock; private final Config config; - private final LinkedBlockingQueue edits = new LinkedBlockingQueue(); + private final Queue edits = new LinkedBlockingQueue(); private final World world; private int taskID; private int successes = 0, errors = 0, blacklistCollisions = 0;