From 5f480a5da5eae9ac5a0a55a3876258edaf93b659 Mon Sep 17 00:00:00 2001 From: Iaccidentally Date: Thu, 31 Jan 2013 19:12:04 -0500 Subject: Update pom.xml for 1.4.7 R1 :: Replace deprecated scheduleAsyncDelayedTask --- Essentials/src/net/ess3/api/IPlugin.java | 4 ++-- Essentials/src/net/ess3/backup/Backup.java | 2 +- Essentials/src/net/ess3/bukkit/BukkitPlugin.java | 4 ++-- Essentials/src/net/ess3/commands/Commandbalancetop.java | 8 ++++---- Essentials/src/net/ess3/commands/Commandmail.java | 4 ++-- Essentials/src/net/ess3/listener/EssentialsPlayerListener.java | 2 +- Essentials/src/net/ess3/metrics/MetricsListener.java | 2 +- .../src/net/ess3/storage/AbstractDelayedYamlFileReader.java | 2 +- .../src/net/ess3/storage/AbstractDelayedYamlFileWriter.java | 2 +- Essentials/src/net/ess3/storage/StorageObjectMap.java | 2 +- Essentials/src/net/ess3/storage/StorageQueue.java | 4 ++-- EssentialsUpdate/src/net/ess3/update/states/StateMachine.java | 4 ++-- EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java | 2 +- EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java | 2 +- pom.xml | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Essentials/src/net/ess3/api/IPlugin.java b/Essentials/src/net/ess3/api/IPlugin.java index 8348c9490..a8a1f78ea 100644 --- a/Essentials/src/net/ess3/api/IPlugin.java +++ b/Essentials/src/net/ess3/api/IPlugin.java @@ -23,7 +23,7 @@ public interface IPlugin extends Plugin * @param run - Code to call later * @return - BukkitTask for the task created */ - BukkitTask scheduleAsyncDelayedTask(final Runnable run); + BukkitTask runTaskAsynchronously(final Runnable run); /** * Schedule a sync task (ran in main thread) to be run @@ -40,7 +40,7 @@ public interface IPlugin extends Plugin * @param delay - Long that represents how long to wait * @return - BukkitTask for the task created */ - BukkitTask scheduleAsyncDelayedTask(final Runnable run, final long delay); + BukkitTask runTaskLaterAsynchronously(final Runnable run, final long delay); /** * Schedule a sync (ran in main thread) delayed task diff --git a/Essentials/src/net/ess3/backup/Backup.java b/Essentials/src/net/ess3/backup/Backup.java index ea0287356..83be8e5ee 100644 --- a/Essentials/src/net/ess3/backup/Backup.java +++ b/Essentials/src/net/ess3/backup/Backup.java @@ -76,7 +76,7 @@ public class Backup implements Runnable, IBackup } } - ess.getPlugin().scheduleAsyncDelayedTask(new BackupRunner(backupCommand)); + ess.getPlugin().runTaskAsynchronously(new BackupRunner(backupCommand)); } diff --git a/Essentials/src/net/ess3/bukkit/BukkitPlugin.java b/Essentials/src/net/ess3/bukkit/BukkitPlugin.java index 1e2ed3e4e..9054461e2 100644 --- a/Essentials/src/net/ess3/bukkit/BukkitPlugin.java +++ b/Essentials/src/net/ess3/bukkit/BukkitPlugin.java @@ -133,7 +133,7 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin } @Override - public BukkitTask scheduleAsyncDelayedTask(final Runnable run) + public BukkitTask runTaskAsynchronously(final Runnable run) { return getServer().getScheduler().runTaskAsynchronously(this, run); } @@ -145,7 +145,7 @@ public class BukkitPlugin extends JavaPlugin implements IPlugin } @Override - public BukkitTask scheduleAsyncDelayedTask(final Runnable run, final long delay) + public BukkitTask runTaskLaterAsynchronously(final Runnable run, final long delay) { return getServer().getScheduler().runTaskLaterAsynchronously(this, run, delay); } diff --git a/Essentials/src/net/ess3/commands/Commandbalancetop.java b/Essentials/src/net/ess3/commands/Commandbalancetop.java index 874945cfb..4a41bd4ff 100644 --- a/Essentials/src/net/ess3/commands/Commandbalancetop.java +++ b/Essentials/src/net/ess3/commands/Commandbalancetop.java @@ -84,7 +84,7 @@ public class Commandbalancetop extends EssentialsCommand { lock.readLock().unlock(); } - ess.getPlugin().scheduleAsyncDelayedTask(new Viewer(sender, page, force)); + ess.getPlugin().runTaskAsynchronously(new Viewer(sender, page, force)); } else { @@ -92,7 +92,7 @@ public class Commandbalancetop extends EssentialsCommand { sender.sendMessage(_("orderBalances", ess.getUserMap().getUniqueUsers())); } - ess.getPlugin().scheduleAsyncDelayedTask(new Viewer(sender, page, force)); + ess.getPlugin().runTaskAsynchronously(new Viewer(sender, page, force)); } } @@ -169,7 +169,7 @@ public class Commandbalancetop extends EssentialsCommand { lock.writeLock().unlock(); } - ess.getPlugin().scheduleAsyncDelayedTask(viewer); + ess.getPlugin().runTaskAsynchronously(viewer); } } @@ -203,7 +203,7 @@ public class Commandbalancetop extends EssentialsCommand { lock.readLock().unlock(); } - ess.getPlugin().scheduleAsyncDelayedTask(new Calculator(new Viewer(sender, page, force), force)); + ess.getPlugin().runTaskAsynchronously(new Calculator(new Viewer(sender, page, force), force)); } } } diff --git a/Essentials/src/net/ess3/commands/Commandmail.java b/Essentials/src/net/ess3/commands/Commandmail.java index 94fc67bf3..98a64b963 100644 --- a/Essentials/src/net/ess3/commands/Commandmail.java +++ b/Essentials/src/net/ess3/commands/Commandmail.java @@ -56,7 +56,7 @@ public class Commandmail extends EssentialsCommand { throw new Exception(_("noPerm", "essentials.mail.sendall")); } - ess.getPlugin().scheduleAsyncDelayedTask(new SendAll(user.getName() + ": " + FormatUtil.stripColor(getFinalArg(args, 1)))); + ess.getPlugin().runTaskAsynchronously(new SendAll(user.getName() + ": " + FormatUtil.stripColor(getFinalArg(args, 1)))); user.sendMessage(_("mailSent")); return; } @@ -90,7 +90,7 @@ public class Commandmail extends EssentialsCommand } else if (args.length >= 1 && "sendall".equalsIgnoreCase(args[0])) { - ess.getPlugin().scheduleAsyncDelayedTask(new SendAll("Server: " + getFinalArg(args, 2))); + ess.getPlugin().runTaskAsynchronously(new SendAll("Server: " + getFinalArg(args, 2))); } else if (args.length >= 2) { diff --git a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java index 4623211c6..88ed03ec8 100644 --- a/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java +++ b/Essentials/src/net/ess3/listener/EssentialsPlayerListener.java @@ -164,7 +164,7 @@ public class EssentialsPlayerListener implements Listener @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(final PlayerJoinEvent event) { - ess.getPlugin().scheduleAsyncDelayedTask( + ess.getPlugin().runTaskAsynchronously( new Runnable() { @Override diff --git a/Essentials/src/net/ess3/metrics/MetricsListener.java b/Essentials/src/net/ess3/metrics/MetricsListener.java index 0d18187ef..d001e72f6 100644 --- a/Essentials/src/net/ess3/metrics/MetricsListener.java +++ b/Essentials/src/net/ess3/metrics/MetricsListener.java @@ -37,7 +37,7 @@ public class MetricsListener implements Listener ess.getLogger().log(Level.INFO, _("metrics3")); settings.getData().getGeneral().setMetricsEnabled(true); settings.queueSave(); - ess.getPlugin().scheduleAsyncDelayedTask(starter, 5 * 1200); + ess.getPlugin().runTaskLaterAsynchronously(starter, 5 * 1200); } } } diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java index 714138349..6f88f9c8c 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileReader.java @@ -28,7 +28,7 @@ public abstract class AbstractDelayedYamlFileReader imp } else { - ess.getPlugin().scheduleAsyncDelayedTask(this); + ess.getPlugin().runTaskAsynchronously(this); } } diff --git a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java index ade8eeb93..0ce4750a7 100644 --- a/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java +++ b/Essentials/src/net/ess3/storage/AbstractDelayedYamlFileWriter.java @@ -21,7 +21,7 @@ public abstract class AbstractDelayedYamlFileWriter implements Runnable public void schedule() { - ess.getPlugin().scheduleAsyncDelayedTask(this); + ess.getPlugin().runTaskAsynchronously(this); } public abstract File getFile(); diff --git a/Essentials/src/net/ess3/storage/StorageObjectMap.java b/Essentials/src/net/ess3/storage/StorageObjectMap.java index aeaf14892..b67ae551e 100644 --- a/Essentials/src/net/ess3/storage/StorageObjectMap.java +++ b/Essentials/src/net/ess3/storage/StorageObjectMap.java @@ -47,7 +47,7 @@ public abstract class StorageObjectMap extends CacheLoader impleme private void loadAllObjectsAsync() { - ess.getPlugin().scheduleAsyncDelayedTask( + ess.getPlugin().runTaskAsynchronously( new Runnable() { @Override diff --git a/Essentials/src/net/ess3/storage/StorageQueue.java b/Essentials/src/net/ess3/storage/StorageQueue.java index d602ad84e..e4bab5cb6 100644 --- a/Essentials/src/net/ess3/storage/StorageQueue.java +++ b/Essentials/src/net/ess3/storage/StorageQueue.java @@ -44,7 +44,7 @@ public class StorageQueue implements Runnable } else if (state == RequestState.SCHEDULE) { - plugin.scheduleAsyncDelayedTask(request.getRunnable()); + plugin.runTaskAsynchronously(request.getRunnable()); } } requests.clear(); @@ -74,7 +74,7 @@ public class StorageQueue implements Runnable { synchronized (lock) { - plugin.scheduleAsyncDelayedTask(this); + plugin.runTaskAsynchronously(this); } } diff --git a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java index c6e3cc3cb..5a5279b71 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java +++ b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java @@ -90,7 +90,7 @@ public class StateMachine extends AbstractWorkListener implements Runnable public void startWork() { iterator = states.values().iterator(); - Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), this); //Should this be async? (method deprecated) + Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), this); //Should this be async? (method deprecated) } @Override @@ -149,7 +149,7 @@ public class StateMachine extends AbstractWorkListener implements Runnable { StateMachine.this.player.sendMessage(message); } - Bukkit.getScheduler().scheduleAsyncDelayedTask(getPlugin(), StateMachine.this); //Should this be async? (method deprecated) + Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), StateMachine.this); //Should this be async? (method deprecated) } }); } diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java index e24a69f2a..239553acd 100644 --- a/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java +++ b/EssentialsUpdate/src/net/ess3/update/tasks/InstallModule.java @@ -31,7 +31,7 @@ public class InstallModule implements Runnable, Task @Override public void start() { - Bukkit.getScheduler().scheduleAsyncDelayedTask(listener.getPlugin(), this); //Should this be async? (method deprecated) + Bukkit.getScheduler().runTaskAsynchronously(listener.getPlugin(), this); //Should this be async? (method deprecated) } @Override diff --git a/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java index d4bc7b066..da69b0f90 100644 --- a/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java +++ b/EssentialsUpdate/src/net/ess3/update/tasks/SelfUpdate.java @@ -44,7 +44,7 @@ public class SelfUpdate extends AbstractWorkListener implements Task, Runnable @Override public void run() { - Bukkit.getScheduler().scheduleAsyncDelayedTask( //Should this be async? (method deprecated) + Bukkit.getScheduler().runTaskAsynchronously( //Should this be async? (method deprecated) getPlugin(), new Runnable() { @Override diff --git a/pom.xml b/pom.xml index 02b961763..f928c646c 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ UTF-8 - 1.4.7-R0.1 + 1.4.7-R1.0 Unknown true 2 -- cgit v1.2.3