From ba36eac7f8bb72957dfeff52f197c25caa677b9b Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Tue, 28 May 2024 22:22:20 +0400 Subject: [PATCH] fixed error on deck editor usage, related to 2298ebc5f5773c6b4457b0172867a3ce16dbec80 --- .../mage/client/deckeditor/collection/viewer/MageBook.java | 5 ++--- .../mage/client/deckeditor/table/MageCardComparator.java | 6 ++++-- .../main/java/mage/client/deckeditor/table/TableModel.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java index 65bb80dc629..fe3ab7605d4 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java @@ -39,9 +39,8 @@ import java.awt.image.BufferedImage; import java.io.FileNotFoundException; import java.io.InputStream; import java.lang.reflect.Constructor; -import java.util.ArrayList; +import java.util.*; import java.util.List; -import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -399,7 +398,7 @@ public class MageBook extends JComponent { draftRating.setFont(jLayeredPane.getFont().deriveFont(jLayeredPane.getFont().getStyle() | Font.BOLD)); if (card.getMageObjectType().equals(MageObjectType.CARD)) { // card - draftRating.setText("draft rating: " + RateCard.rateCard(card, null)); + draftRating.setText("draft rating: " + RateCard.rateCard(card, Collections.emptyList())); } else { // token draftRating.setText(""); diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java index a08755b1834..25132ef3544 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/MageCardComparator.java @@ -6,6 +6,8 @@ import mage.cards.RateCard; import mage.view.CardView; import org.apache.log4j.Logger; +import java.util.Collections; + /** * {@link MageCard} comparator. Used to sort cards in Deck Editor Table View * pane. @@ -83,8 +85,8 @@ public class MageCardComparator implements CardViewComparator { bCom = Integer.parseInt(b.getCardNumber().replaceAll("[\\D]", "")); break; case 9: - aCom = RateCard.rateCard(a, null); - bCom = RateCard.rateCard(b, null); + aCom = RateCard.rateCard(a, Collections.emptyList()); + bCom = RateCard.rateCard(b, Collections.emptyList()); break; case 10: aCom = a.getOriginalColorIdentity(); diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java index f4406471348..e640f8fffea 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/table/TableModel.java @@ -253,7 +253,7 @@ public class TableModel extends AbstractTableModel implements ICardGrid { case 8: return c.getCardNumber(); case 9: - return RateCard.rateCard(c, null); + return RateCard.rateCard(c, Collections.emptyList()); case 10: return ManaSymbols.getClearManaCost(c.getOriginalColorIdentity()); default: