diff options
Diffstat (limited to 'EssentialsUpdate/src/net/ess3/update/states')
8 files changed, 26 insertions, 33 deletions
diff --git a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java index 5d4e03a2c..ba202c1ff 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java +++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractState.java @@ -1,8 +1,7 @@ package net.ess3.update.states; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.AbstractWorkListener; import org.bukkit.entity.Player; +import net.ess3.update.AbstractWorkListener; public abstract class AbstractState @@ -66,11 +65,8 @@ public abstract class AbstractState public final AbstractState reactOnAnswer(final Player sender, final String answer) { final String trimmedAnswer = answer.trim(); - if (trimmedAnswer.equalsIgnoreCase("quit") - || trimmedAnswer.equalsIgnoreCase("bye") - || trimmedAnswer.equalsIgnoreCase("abort") - || trimmedAnswer.equalsIgnoreCase("cancel") - || trimmedAnswer.equalsIgnoreCase("exit")) + if (trimmedAnswer.equalsIgnoreCase("quit") || trimmedAnswer.equalsIgnoreCase("bye") || trimmedAnswer.equalsIgnoreCase( + "abort") || trimmedAnswer.equalsIgnoreCase("cancel") || trimmedAnswer.equalsIgnoreCase("exit")) { abort(); return null; diff --git a/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java b/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java index 3ee7d0ee2..e84046224 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java +++ b/EssentialsUpdate/src/net/ess3/update/states/AbstractYesNoState.java @@ -22,22 +22,18 @@ public abstract class AbstractYesNoState extends AbstractState @Override public AbstractState getNextState() { - return answer - ? (yesState == null ? null : getState(yesState)) - : (noState == null ? null : getState(noState)); + return answer ? (yesState == null ? null : getState(yesState)) : (noState == null ? null : getState(noState)); } @Override public boolean reactOnAnswer(final String answer) { - if (answer.equalsIgnoreCase("yes") - || answer.equalsIgnoreCase("y")) + if (answer.equalsIgnoreCase("yes") || answer.equalsIgnoreCase("y")) { this.answer = true; return true; } - if (answer.equalsIgnoreCase("no") - || answer.equalsIgnoreCase("n")) + if (answer.equalsIgnoreCase("no") || answer.equalsIgnoreCase("n")) { this.answer = false; return true; diff --git a/EssentialsUpdate/src/net/ess3/update/states/Changelog.java b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java index 42fdc8ca2..033106041 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/Changelog.java +++ b/EssentialsUpdate/src/net/ess3/update/states/Changelog.java @@ -1,9 +1,9 @@ package net.ess3.update.states; -import net.ess3.update.UpdateCheck; -import net.ess3.update.VersionInfo; import java.util.List; import org.bukkit.entity.Player; +import net.ess3.update.UpdateCheck; +import net.ess3.update.VersionInfo; public class Changelog extends AbstractState diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java index a62735f5e..9fa9d763c 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsChat.java @@ -1,10 +1,10 @@ package net.ess3.update.states; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.tasks.InstallModule; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; public class EssentialsChat extends AbstractYesNoState diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java index cd1865b42..7ac34fa22 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsGeoIP.java @@ -1,11 +1,10 @@ package net.ess3.update.states; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.tasks.InstallModule; -import net.ess3.update.AbstractWorkListener; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; public class EssentialsGeoIP extends AbstractYesNoState diff --git a/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java index bb3a841a7..e2c33cd9b 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java +++ b/EssentialsUpdate/src/net/ess3/update/states/EssentialsProtect.java @@ -1,11 +1,10 @@ package net.ess3.update.states; -import net.ess3.update.AbstractWorkListener; -import net.ess3.update.tasks.InstallModule; -import net.ess3.update.AbstractWorkListener; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; +import net.ess3.update.AbstractWorkListener; +import net.ess3.update.tasks.InstallModule; public class EssentialsProtect extends AbstractYesNoState 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<AbstractState> 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() diff --git a/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java index c7bd5127a..4a4b9e862 100644 --- a/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java +++ b/EssentialsUpdate/src/net/ess3/update/states/UpdateOrInstallation.java @@ -1,8 +1,7 @@ package net.ess3.update.states; -import net.ess3.update.UpdateCheck; -import net.ess3.update.UpdateCheck; import org.bukkit.entity.Player; +import net.ess3.update.UpdateCheck; public class UpdateOrInstallation extends AbstractState |