Support leaving tournament

This commit is contained in:
drdev
2016-07-17 21:33:34 +00:00
parent e06db51295
commit ed23ac3b15
4 changed files with 14 additions and 11 deletions

View File

@@ -44,7 +44,7 @@ public enum CSubmenuQuestDraft implements ICDoc {
});
view.getBtnEditDeck().setCommand(new UiCommand() {
@Override public void run() {
controller.editDeck();
view.editDeck(true);
}
});
view.getBtnLeaveTournament().setCommand(new UiCommand() {

View File

@@ -652,7 +652,6 @@ public enum VSubmenuQuestDraft implements IVSubmenu<CSubmenuQuestDraft>, IQuestT
CDeckEditorUI.SINGLETON_INSTANCE.setEditorController(draftController);
}
@Override
public void editDeck(boolean isExistingDeck) {
final CDetailPicture cDetailPicture = CDeckEditorUI.SINGLETON_INSTANCE.getCDetailPicture();
if (isExistingDeck) {

View File

@@ -75,19 +75,29 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
btnSpendToken.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
controller.spendToken();
FThreads.invokeInBackgroundThread(new Runnable() { //must run in background thread to handle alerts
@Override
public void run() {
controller.spendToken();
}
});
}
});
btnEditDeck.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
controller.editDeck();
editDeck(true);
}
});
btnLeaveTournament.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
controller.endTournamentAndAwardPrizes();
FThreads.invokeInBackgroundThread(new Runnable() { //must run in background thread to handle alerts
@Override
public void run() {
controller.endTournamentAndAwardPrizes();
}
});
}
});
deckViewer.setCaption("Main Deck");
@@ -177,7 +187,6 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
return null;
}
@Override
public void editDeck(boolean isExistingDeck) {
Deck deck = getDeck();
if (deck != null) {

View File

@@ -374,11 +374,6 @@ public class QuestTournamentController {
view.populate();
}
public void editDeck() {
view.editDeck(true);
FModel.getQuest().save();
}
public void startDraft() {
if (drafting) {
SOptionPane.showErrorDialog("You are currently in a draft.\n" +