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

Updated according to latest TokenType names and DeckRecognizer APIs.

Browse Source
This commit is contained in:
leriomaggio
2021-09-06 01:46:13 +01:00
parent e56b9183b1
commit 26375e941a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui/src/main/java/forge/deck/DeckImportController.java
View File

@@ -82,10 +82,10 @@ public class DeckImportController {
DeckRecognizer recognizer = new DeckRecognizer(FModel.getMagicDb().getCommonCards(), DeckRecognizer recognizer = new DeckRecognizer(FModel.getMagicDb().getCommonCards(),
FModel.getMagicDb().getVariantCards()); FModel.getMagicDb().getVariantCards());
if (dateTimeCheck.isSelected()) { if (dateTimeCheck.isSelected()) {
recognizer.setDateConstraint(monthDropdown.getSelectedIndex(), yearDropdown.getSelectedItem()); recognizer.setDateConstraint(yearDropdown.getSelectedItem(), monthDropdown.getSelectedIndex());
} }
if (this.allowedSetCodes != null && this.allowedSetCodes.size() > 0) if (this.allowedSetCodes != null && this.allowedSetCodes.size() > 0)
recognizer.setCardEditionConstrain(this.allowedSetCodes); recognizer.setGameFormatConstraint(this.allowedSetCodes);
if (this.currentDeckFormat != null) if (this.currentDeckFormat != null)
recognizer.setDeckFormatConstraint(this.currentDeckFormat); recognizer.setDeckFormatConstraint(this.currentDeckFormat);
@@ -128,14 +128,14 @@ public class DeckImportController {
for (final DeckRecognizer.Token t : tokens) { for (final DeckRecognizer.Token t : tokens) {
final DeckRecognizer.TokenType type = t.getType(); final DeckRecognizer.TokenType type = t.getType();
if (type == DeckRecognizer.TokenType.DeckName) { if (type == DeckRecognizer.TokenType.DECK_NAME) {
resultDeck.setName(t.getText()); resultDeck.setName(t.getText());
} }
if (type == DeckRecognizer.TokenType.DeckSectionName) { if (type == DeckRecognizer.TokenType.DECK_SECTION_NAME) {
deckSection = DeckSection.smartValueOf(t.getText()); deckSection = DeckSection.smartValueOf(t.getText());
} }
// all other tokens will be discarded. // all other tokens will be discarded.
if (type != DeckRecognizer.TokenType.KnownCard) { if (type != DeckRecognizer.TokenType.LEGAL_CARD_REQUEST) {
continue; continue;
} }
final PaperCard crd = t.getCard(); final PaperCard crd = t.getCard();