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 for Deck Section highlight in Deck Import following XMage integration

Browse Source 
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
This commit is contained in:
leriomaggio
2021-09-12 18:31:30 +01:00
parent ab0b964772
commit 5f46af3fd1
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,8 @@ public class DeckImportController {
private final IComboBox<Integer> yearDropdown; private final IComboBox<Integer> yearDropdown;
private final List<DeckRecognizer.Token> tokens = new ArrayList<>(); private final List<DeckRecognizer.Token> tokens = new ArrayList<>();
private final boolean currentDeckNotEmpty; private final boolean currentDeckNotEmpty;
private List<String> allowedSetCodes; private final List<String> allowedSetCodes;
private DeckFormat currentDeckFormat; private final DeckFormat currentDeckFormat;
public DeckImportController(ICheckBox dateTimeCheck0, public DeckImportController(ICheckBox dateTimeCheck0,
IComboBox<String> monthDropdown0, IComboBox<Integer> yearDropdown0, IComboBox<String> monthDropdown0, IComboBox<Integer> yearDropdown0,
@@ -71,7 +71,7 @@ public class DeckImportController {
} }
int yearNow = Calendar.getInstance().get(Calendar.YEAR); int yearNow = Calendar.getInstance().get(Calendar.YEAR);
for (int i = yearNow; i >= 1993; i--) { for (int i = yearNow; i >= 1993; i--) {
yearDropdown.addItem(Integer.valueOf(i)); yearDropdown.addItem(i);
} }
} }
@@ -88,10 +88,26 @@ public class DeckImportController {
recognizer.setDeckFormatConstraint(this.currentDeckFormat); recognizer.setDeckFormatConstraint(this.currentDeckFormat);
String[] lines = input.split("\n"); String[] lines = input.split("\n");
DeckSection referenceDeckSectionInParsing = null; // default
for (String line : lines) { for (String line : lines) {
DeckRecognizer.Token token = recognizer.recognizeLine(line); DeckRecognizer.Token token = recognizer.recognizeLine(line, referenceDeckSectionInParsing);
if (token != null) if (token != null) {
tokens.add(token); if (token.getType() == DeckRecognizer.TokenType.DECK_SECTION_NAME)
referenceDeckSectionInParsing = DeckSection.valueOf(token.getText());
else if (token.isCardToken()) {
DeckSection tokenSection = token.getTokenSection();
if (!tokenSection.equals(referenceDeckSectionInParsing)) {
DeckRecognizer.Token sectionToken = DeckRecognizer.Token.DeckSection(token.getTokenSection().name());
if (referenceDeckSectionInParsing == null)
tokens.add(0, sectionToken); // first ever - put on top!
else
tokens.add(sectionToken); // add just before card token
referenceDeckSectionInParsing = tokenSection;
}
}
tokens.add(token); // add found token
}
} }
return tokens; return tokens;
} }