From 26375e941afa8b6f90d1c213695c0b1049884c9d Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Mon, 6 Sep 2021 01:46:13 +0100 Subject: [PATCH] Updated according to latest TokenType names and DeckRecognizer APIs. --- .../src/main/java/forge/deck/DeckImportController.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-gui/src/main/java/forge/deck/DeckImportController.java b/forge-gui/src/main/java/forge/deck/DeckImportController.java index 31e222faf20..382720d8fde 100644 --- a/forge-gui/src/main/java/forge/deck/DeckImportController.java +++ b/forge-gui/src/main/java/forge/deck/DeckImportController.java @@ -82,10 +82,10 @@ public class DeckImportController { DeckRecognizer recognizer = new DeckRecognizer(FModel.getMagicDb().getCommonCards(), FModel.getMagicDb().getVariantCards()); if (dateTimeCheck.isSelected()) { - recognizer.setDateConstraint(monthDropdown.getSelectedIndex(), yearDropdown.getSelectedItem()); + recognizer.setDateConstraint(yearDropdown.getSelectedItem(), monthDropdown.getSelectedIndex()); } if (this.allowedSetCodes != null && this.allowedSetCodes.size() > 0) - recognizer.setCardEditionConstrain(this.allowedSetCodes); + recognizer.setGameFormatConstraint(this.allowedSetCodes); if (this.currentDeckFormat != null) recognizer.setDeckFormatConstraint(this.currentDeckFormat); @@ -128,14 +128,14 @@ public class DeckImportController { for (final DeckRecognizer.Token t : tokens) { final DeckRecognizer.TokenType type = t.getType(); - if (type == DeckRecognizer.TokenType.DeckName) { + if (type == DeckRecognizer.TokenType.DECK_NAME) { resultDeck.setName(t.getText()); } - if (type == DeckRecognizer.TokenType.DeckSectionName) { + if (type == DeckRecognizer.TokenType.DECK_SECTION_NAME) { deckSection = DeckSection.smartValueOf(t.getText()); } // all other tokens will be discarded. - if (type != DeckRecognizer.TokenType.KnownCard) { + if (type != DeckRecognizer.TokenType.LEGAL_CARD_REQUEST) { continue; } final PaperCard crd = t.getCard();