meerkat
/
meerkat-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A cancel by the voter is now sent to the execution flow as a Throwable 

rather than an Exception.
vbdev2
Hai Brenner 2016-06-28 11:28:14 +03:00
parent 438df78e36
commit 3a5908ac49
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
voting-booth/src/main/java/meerkat/voting/controller/callbacks/ChannelChoiceCallback.java
View File

@ -35,8 +35,8 @@ public class ChannelChoiceCallback extends ControllerCallback<List<BallotAnswer>
@Override @Override
public void onFailure(Throwable t) { public void onFailure(Throwable t) {
if (t instanceof VoterCancelException) { if (t instanceof VoterCancelThrowable) {
// voter has cancelled during the UI channel choice process. A VoterCancelException is thrown // voter has cancelled during the UI channel choice process. A VoterCancelThrowable is thrown
logger.debug("ChannelChoiceCallback got a cancellation response"); logger.debug("ChannelChoiceCallback got a cancellation response");
enqueueCommand(new RestartVotingCommand(getRequestIdentifier(), getBallotSerialNumber())); enqueueCommand(new RestartVotingCommand(getRequestIdentifier(), getBallotSerialNumber()));
} }

2
voting-booth/src/main/java/meerkat/voting/controller/callbacks/VotingCallback.java
View File

@ -34,7 +34,7 @@ public class VotingCallback extends ControllerCallback<List<BallotAnswer>> {
@Override @Override
public void onFailure(Throwable t) { public void onFailure(Throwable t) {
if (t instanceof VoterCancelException) { if (t instanceof VoterCancelThrowable) {
logger.debug("VotingCallback got a cancellation response"); logger.debug("VotingCallback got a cancellation response");
enqueueCommand(new RestartVotingCommand(getRequestIdentifier(), getBallotSerialNumber())); enqueueCommand(new RestartVotingCommand(getRequestIdentifier(), getBallotSerialNumber()));
} }

8
voting-booth/src/main/java/meerkat/voting/ui/SystemConsoleUI.java
View File

@ -155,7 +155,7 @@ public class SystemConsoleUI implements VotingBoothUI, Runnable {
List<BallotAnswer> answers = askVoterForAnswers(command.getQuestions()); List<BallotAnswer> answers = askVoterForAnswers(command.getQuestions());
command.getCallback().onSuccess(answers); command.getCallback().onSuccess(answers);
} }
catch (VoterCancelException e) { catch (VoterCancelThrowable e) {
command.getCallback().onFailure(e); command.getCallback().onFailure(e);
} }
catch (IOException e) { catch (IOException e) {
@ -179,7 +179,7 @@ public class SystemConsoleUI implements VotingBoothUI, Runnable {
List<BallotAnswer> answers = askVoterForAnswers(command.getQuestions()); List<BallotAnswer> answers = askVoterForAnswers(command.getQuestions());
command.getCallback().onSuccess(answers); command.getCallback().onSuccess(answers);
} }
catch (VoterCancelException e) { catch (VoterCancelThrowable e) {
command.getCallback().onFailure(e); command.getCallback().onFailure(e);
} }
catch (IOException e) { catch (IOException e) {
@ -339,7 +339,7 @@ public class SystemConsoleUI implements VotingBoothUI, Runnable {
} }
} }
private List<BallotAnswer> askVoterForAnswers(List<BallotQuestion> questions) throws VoterCancelException, IOException { private List<BallotAnswer> askVoterForAnswers(List<BallotQuestion> questions) throws VoterCancelThrowable, IOException {
assertQuestionsAreValid (questions); assertQuestionsAreValid (questions);
@ -354,7 +354,7 @@ public class SystemConsoleUI implements VotingBoothUI, Runnable {
String s = readInputLine(); String s = readInputLine();
if ((s.equals("cancel") || s.equals("c")) || (index == 0 && (s.equals("back") || s.equals("b")))) { if ((s.equals("cancel") || s.equals("c")) || (index == 0 && (s.equals("back") || s.equals("b")))) {
throw new VoterCancelException(); throw new VoterCancelThrowable();
} }
else if (s.equals("back") || s.equals("b")) { else if (s.equals("back") || s.equals("b")) {
--index; --index;