From 67b4e31a5affb2a520ae4eab7eb23beabb2544a3 Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Sat, 16 Oct 2021 21:15:09 +0300 Subject: [PATCH] - Fix compile and tests --- .../src/main/java/forge/screens/deckeditor/SEditorIO.java | 2 -- .../forge/screens/deckeditor/controllers/CCurrentDeck.java | 1 - .../src/test/java/forge/deck/DeckRecognizerTest.java | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java index 5a86887cad7..6ef6c1be1c6 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/SEditorIO.java @@ -1,7 +1,5 @@ package forge.screens.deckeditor; -import forge.gui.framework.ICDoc; -import forge.gui.framework.IVDoc; import forge.screens.deckeditor.controllers.*; import forge.screens.deckeditor.views.*; import org.apache.commons.lang3.StringUtils; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java index 5cbb50232fb..ac0eabf23d2 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCurrentDeck.java @@ -17,7 +17,6 @@ import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; import forge.gui.UiCommand; import forge.gui.framework.ICDoc; -import forge.item.InventoryItem; import forge.localinstance.properties.ForgeConstants; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.DeckImport; diff --git a/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java b/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java index faef5c24422..0d4634ac6eb 100644 --- a/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java +++ b/forge-gui-desktop/src/test/java/forge/deck/DeckRecognizerTest.java @@ -568,13 +568,13 @@ public class DeckRecognizerTest extends ForgeCardMockTestCase { t = recognizer.recogniseNonCardToken("CMC0"); assertNotNull(t); assertEquals(t.getType(), TokenType.CARD_CMC); - assertEquals(t.getText(), "CMC: {0}"); + assertEquals(t.getText(), "CMC: 0"); assertEquals(t.getQuantity(), 0); t = recognizer.recogniseNonCardToken("CC1"); assertNotNull(t); assertEquals(t.getType(), TokenType.CARD_CMC); - assertEquals(t.getText(), "CMC: {1}"); + assertEquals(t.getText(), "CMC: 1"); assertEquals(t.getQuantity(), 0); t = recognizer.recogniseNonCardToken("//Common");