TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-05 20:12:54 +00:00
Code Issues Projects Releases Wiki Activity

Abort the installation wizard if a runtime exception happens

Browse source
This commit is contained in:
snowleo 2011-10-26 19:46:40 +02:00
parent 48f8eb9788
commit 5641b1173c
2 changed files with 43 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java
View file

@ -71,14 +71,22 @@ public abstract class AbstractState
abort(); abort();
return null; return null;
} }
final boolean found = reactOnAnswer(trimmedAnswer); try
if (found)
{ {
return getNextState(); final boolean found = reactOnAnswer(trimmedAnswer);
if (found)
{
return getNextState();
}
else
{
sender.sendMessage("Answer not recognized.");
return this;
}
} }
else catch (RuntimeException ex)
{ {
sender.sendMessage("Answer not recognized."); sender.sendMessage(ex.toString());
return this; return this;
} }
} }

34
EssentialsUpdate/src/com/earth2me/essentials/update/states/StateMachine.java
View file

@ -33,22 +33,33 @@ public class StateMachine extends WorkListener
public MachineResult askQuestion() public MachineResult askQuestion()
{ {
while (current.guessAnswer()) try
{ {
current = current.getNextState(); while (current.guessAnswer())
if (current == null)
{ {
result = MachineResult.DONE;
break; current = current.getNextState();
if (current == null)
{
result = MachineResult.DONE;
break;
}
}
if (current != null)
{
if (player.isOnline())
{
current.askQuestion(player);
}
result = MachineResult.WAIT;
} }
} }
if (current != null) catch (RuntimeException ex)
{ {
if (player.isOnline()) player.sendMessage(ex.getMessage());
{ finish();
current.askQuestion(player); result = MachineResult.ABORT;
}
result = MachineResult.WAIT;
} }
return result; return result;
} }
@ -135,6 +146,7 @@ public class StateMachine extends WorkListener
private void finish() private void finish()
{ {
current = null;
iterator = null; iterator = null;
states.clear(); states.clear();
getPlugin().getServer().getPluginManager().callEvent(new InstallationFinishedEvent()); getPlugin().getServer().getPluginManager().callEvent(new InstallationFinishedEvent());