Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-07-17 00:55:11 +02: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
EssentialsUpdate/src/com/earth2me/essentials/update/states/AbstractState.java
View File

@ -8,12 +8,12 @@ public abstract class AbstractState
{
private transient boolean abortion = false;
private final transient StateMap stateMap;
public AbstractState(final StateMap stateMap)
{
this.stateMap = stateMap;
}
public <T extends AbstractState> T getState(final Class<? extends T> stateClass)
{
if (!stateMap.containsKey(stateClass))
@ -35,7 +35,7 @@ public abstract class AbstractState
}
return (T)stateMap.get(stateClass);
}
public abstract AbstractState getNextState();
/**
@ -60,7 +60,7 @@ public abstract class AbstractState
* @return true, if the answer could be recognized as a valid answer
*/
public abstract boolean reactOnAnswer(String answer);
public final AbstractState reactOnAnswer(final Player sender, final String answer)
{
final String trimmedAnswer = answer.trim();
@ -71,16 +71,24 @@ public abstract class AbstractState
abort();
return null;
}
final boolean found = reactOnAnswer(trimmedAnswer);
if (found)
try
{
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;
}
}
}
/**
@ -90,12 +98,12 @@ public abstract class AbstractState
{
listener.onWorkDone();
}
public boolean isAbortion()
{
return abortion;
}
protected void abort()
{
abortion = true;

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

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