external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support leaving tournament

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-desktop/src/main/java/forge/screens/home/quest/CSubmenuQuestDraft.java
View File

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

1
forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestDraft.java
View File

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

17
forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
View File

@@ -75,19 +75,29 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
btnSpendToken.setCommand(new FEventHandler() { btnSpendToken.setCommand(new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { 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() { btnEditDeck.setCommand(new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
controller.editDeck(); editDeck(true);
} }
}); });
btnLeaveTournament.setCommand(new FEventHandler() { btnLeaveTournament.setCommand(new FEventHandler() {
@Override @Override
public void handleEvent(FEvent e) { 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"); deckViewer.setCaption("Main Deck");
@@ -177,7 +187,6 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
return null; return null;
} }
@Override
public void editDeck(boolean isExistingDeck) { public void editDeck(boolean isExistingDeck) {
Deck deck = getDeck(); Deck deck = getDeck();
if (deck != null) { if (deck != null) {

5
forge-gui/src/main/java/forge/quest/QuestTournamentController.java
View File

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