The state machine now handles both manual updating and installation.

4 files changed, 156 insertions, 14 deletions

diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/Changelog.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/Changelog.java
new file mode 100644
index 000000000..36ae93c4d
--- /dev/null
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/states/Changelog.java
@@ -0,0 +1,91 @@
+package com.earth2me.essentials.update.states;
+
+import com.earth2me.essentials.update.UpdateCheck;
+import com.earth2me.essentials.update.VersionInfo;
+import java.util.List;
+import org.bukkit.entity.Player;
+
+
+public class Changelog extends AbstractState
+{
+	private static final int CHANGES_PER_PAGE = 5;
+	private transient int page = 0;
+	private transient boolean confirmed = false;
+	private transient final List<String> changes;
+	private transient final int pages;
+
+	public Changelog(final StateMap stateMap)
+	{
+		super(stateMap);
+		changes = getChanges();
+		pages = changes.size() / CHANGES_PER_PAGE + (changes.size() % CHANGES_PER_PAGE > 0 ? 1 : 0);
+	}
+
+	@Override
+	public AbstractState getNextState()
+	{
+		return confirmed ? getState(EssentialsChat.class) : this;
+	}
+
+	@Override
+	public boolean guessAnswer()
+	{
+		if (pages == 0)
+		{
+			confirmed = true;
+		}
+		return confirmed;
+	}
+
+	private List<String> getChanges()
+	{
+		final UpdateCheck updateCheck = getState(UpdateOrInstallation.class).getUpdateCheck();
+		final VersionInfo versionInfo = updateCheck.getNewVersionInfo();
+		return versionInfo.getChangelog();
+	}
+
+	@Override
+	public void askQuestion(final Player sender)
+	{
+		if (pages > 1)
+		{
+			sender.sendMessage("Changelog, page " + page + " of " + pages + ":");
+		}
+		else
+		{
+			sender.sendMessage("Changelog:");
+		}
+		for (int i = page * CHANGES_PER_PAGE; i < Math.min(page * CHANGES_PER_PAGE + CHANGES_PER_PAGE, changes.size()); i++)
+		{
+			sender.sendMessage(changes.get(i));
+		}
+		if (pages > 1)
+		{
+			sender.sendMessage("Select a page by typing the numbers 1 to " + pages + " to view all changes and then type confirm to update Essentials.");
+		}
+		else
+		{
+			sender.sendMessage("Type confirm to update Essentials.");
+		}
+	}
+
+	@Override
+	public boolean reactOnAnswer(final String answer)
+	{
+		if (answer.equalsIgnoreCase("confirm"))
+		{
+			confirmed = true;
+			return true;
+		}
+		if (answer.matches("[0-9]+"))
+		{
+			final int page = Integer.parseInt(answer);
+			if (page <= pages && page > 0)
+			{
+				this.page = page - 1;
+				return true;
+			}
+		}
+		return false;
+	}
+}
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()
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMap.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMap.java
index a2cf7b719..cca4223d6 100644
--- a/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMap.java
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMap.java
@@ -7,11 +7,6 @@ public class StateMap extends LinkedHashMap<Class<? extends AbstractState>, Abst
 {
 	public StateMap()
 	{
-		super();
-	}
-	
-	public AbstractState add(AbstractState state)
-	{
-		return put(state.getClass(), state);
+		super(50);
 	}
 }
diff --git a/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java b/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java
new file mode 100644
index 000000000..5671275f0
--- /dev/null
+++ b/EssentialsUpdate/src/com/earth2me/essentials/update/states/UpdateOrInstallation.java
@@ -0,0 +1,59 @@
+package com.earth2me.essentials.update.states;
+
+import com.earth2me.essentials.update.UpdateCheck;
+import org.bukkit.entity.Player;
+
+
+public class UpdateOrInstallation extends AbstractState
+{
+	private final transient UpdateCheck updateCheck;
+	private transient boolean update = false;
+	
+	public UpdateOrInstallation(final StateMap stateMap, final UpdateCheck updateCheck)
+	{
+		super(stateMap);
+		this.updateCheck = updateCheck;
+	}
+	
+	@Override
+	public boolean guessAnswer()
+	{
+		if (getUpdateCheck().isEssentialsInstalled()) {
+			update = true;
+		}
+		return update;
+	}
+
+	@Override
+	public AbstractState getNextState()
+	{
+		return update ? getState(Changelog.class) : getState(EssentialsChat.class);
+	}
+
+	@Override
+	public void askQuestion(final Player sender)
+	{
+		sender.sendMessage("Thank you for choosing Essentials.");
+		sender.sendMessage("The following installation wizard will guide you through the installation of Essentials.");
+		sender.sendMessage("Your answers will be saved for a later update.");
+		sender.sendMessage("Please answer the messages with yes or no, if not otherwise stated.");
+		sender.sendMessage("Write bye/exit/quit if you want to exit the wizard at anytime.");
+		sender.sendMessage("Type ok to continue...");
+	}
+
+	@Override
+	public boolean reactOnAnswer(final String answer)
+	{
+		return answer.equalsIgnoreCase("ok") || answer.equalsIgnoreCase("k") || answer.equalsIgnoreCase("continue");
+	}
+
+	public UpdateCheck getUpdateCheck()
+	{
+		return updateCheck;
+	}
+
+	public boolean isUpdate()
+	{
+		return update;
+	}
+}