From 86619275992b4b29bfac91897986b10f2ef863cb Mon Sep 17 00:00:00 2001 From: KHobbits Date: Mon, 31 Dec 2012 02:28:52 +0000 Subject: Merge gravy's pull and reformat code --- .../src/net/ess3/update/states/StateMachine.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'EssentialsUpdate/src/net/ess3/update/states/StateMachine.java') diff --git a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java index b66ca4c58..76bfec87e 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java +++ b/EssentialsUpdate/src/net/ess3/update/states/StateMachine.java @@ -1,13 +1,11 @@ package net.ess3.update.states; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.UpdateCheck; import java.util.Iterator; - -import net.ess3.update.UpdateCheck; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.UpdateCheck; public class StateMachine extends AbstractWorkListener implements Runnable @@ -16,6 +14,8 @@ public class StateMachine extends AbstractWorkListener implements Runnable { ABORT, WAIT, DONE, NONE } + + private final transient StateMap states = new StateMap(); private transient AbstractState current; private transient Player player; @@ -84,6 +84,7 @@ public class StateMachine extends AbstractWorkListener implements Runnable } return result; } + private transient Iterator iterator; public void startWork() @@ -97,7 +98,8 @@ public class StateMachine extends AbstractWorkListener implements Runnable { if (!iterator.hasNext()) { - Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask( + getPlugin(), new Runnable() { @Override public void run() @@ -120,7 +122,8 @@ public class StateMachine extends AbstractWorkListener implements Runnable public void onWorkAbort(final String message) { finish(); - Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask( + getPlugin(), new Runnable() { @Override public void run() @@ -136,7 +139,8 @@ public class StateMachine extends AbstractWorkListener implements Runnable @Override public void onWorkDone(final String message) { - Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), new Runnable() + Bukkit.getScheduler().scheduleSyncDelayedTask( + getPlugin(), new Runnable() { @Override public void run() -- cgit v1.2.3