diff options
author | snowleo <schneeleo@gmail.com> | 2011-10-26 22:14:24 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2011-10-26 22:14:24 +0200 |
commit | 72596decbae18e2f59fdd5f1fff78b304ca2e114 (patch) | |
tree | 973b898ef48e48f99e6ed6854737e1b79ad96f2d /EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java | |
parent | e8b8d26bdbe935fff57ab3ded6902e576355f995 (diff) | |
download | Essentials-72596decbae18e2f59fdd5f1fff78b304ca2e114.tar Essentials-72596decbae18e2f59fdd5f1fff78b304ca2e114.tar.gz Essentials-72596decbae18e2f59fdd5f1fff78b304ca2e114.tar.lz Essentials-72596decbae18e2f59fdd5f1fff78b304ca2e114.tar.xz Essentials-72596decbae18e2f59fdd5f1fff78b304ca2e114.zip |
The state machine now handles both manual updating and installation.
Diffstat (limited to 'EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java')
-rw-r--r-- | EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java index a8dd00a94..9ced4fc66 100644 --- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java +++ b/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.update.states; +import com.earth2me.essentials.update.UpdateCheck; import com.earth2me.essentials.update.WorkListener; -import com.earth2me.essentials.update.VersionInfo; import java.util.Iterator; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -19,16 +19,13 @@ public class StateMachine extends WorkListener implements Runnable private transient Player player; private transient MachineResult result = MachineResult.NONE; - public StateMachine(final Plugin plugin, final Player player, final VersionInfo newVersionInfo) + public StateMachine(final Plugin plugin, final Player player, final UpdateCheck updateCheck) { - super(plugin, newVersionInfo); + super(plugin, updateCheck.getNewVersionInfo()); this.player = player; states.clear(); - states.add(new EssentialsChat(states)); - states.add(new EssentialsSpawn(states)); - states.add(new EssentialsProtect(states)); - states.add(new EssentialsGeoIP(states)); - current = states.values().iterator().next(); + UpdateOrInstallation state = new UpdateOrInstallation(states, updateCheck); + current = states.put(UpdateOrInstallation.class, state); } public MachineResult askQuestion() |