From fda3e81d9a0459a5b73b574b82420e1ca7ae7630 Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Thu, 18 Oct 2018 17:56:21 -0600 Subject: [PATCH 1/2] ignore deck lines that start with // Signed-off-by: Jamin W. Collins --- forge-gui/src/main/java/forge/deck/DeckImportController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge-gui/src/main/java/forge/deck/DeckImportController.java b/forge-gui/src/main/java/forge/deck/DeckImportController.java index 217115efe5a..d1952f15260 100644 --- a/forge-gui/src/main/java/forge/deck/DeckImportController.java +++ b/forge-gui/src/main/java/forge/deck/DeckImportController.java @@ -78,6 +78,9 @@ public class DeckImportController { final DeckRecognizer.TokenType type = t.getType(); if (type == DeckRecognizer.TokenType.SectionName) { section = t.getText().toLowerCase(); + if (section.startsWith("//")) { + continue; + } // can't use wildcards in switch/case, so if/else it is if (section.startsWith("main")) { deckSection = DeckSection.Main; From 2e81a939b9aa4ddf66925c20a8ba18f1586b6fc9 Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Thu, 18 Oct 2018 18:11:45 -0600 Subject: [PATCH 2/2] fix deck import exception message Signed-off-by: Jamin W. Collins --- forge-gui/src/main/java/forge/deck/DeckImportController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/deck/DeckImportController.java b/forge-gui/src/main/java/forge/deck/DeckImportController.java index d1952f15260..d8182d211d0 100644 --- a/forge-gui/src/main/java/forge/deck/DeckImportController.java +++ b/forge-gui/src/main/java/forge/deck/DeckImportController.java @@ -104,7 +104,7 @@ public class DeckImportController { deckSection = DeckSection.Conspiracy; } else { - throw new NotImplementedException("Unexpected section: %s", t.getText()); + throw new NotImplementedException("Unexpected section: " + t.getText()); } } if (type != DeckRecognizer.TokenType.KnownCard) {