From c6e262b0ed0378d533449cfafa10ca6669a128e3 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Wed, 3 Apr 2019 13:00:24 +0400
Subject: [PATCH] Refactor: fixed duplicated class name

---
 .../src/main/java/mage/client/cards/CardGrid.java      | 10 +++++-----
 .../client/util/CardViewColorIdentityComparator.java   |  6 +++---
 .../mage/utils/{CardUtil.java => CardColorUtil.java}   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename Mage.Common/src/main/java/mage/utils/{CardUtil.java => CardColorUtil.java} (98%)

diff --git a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
index f4c6a75976a..4a094c6655c 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
@@ -14,7 +14,7 @@ import mage.client.util.ClientEventType;
 import mage.client.util.Event;
 import mage.client.util.GUISizeHelper;
 import mage.client.util.Listener;
-import mage.utils.CardUtil;
+import mage.utils.CardColorUtil;
 import mage.view.CardView;
 import mage.view.CardsView;
 import org.mage.card.arcane.CardPanel;
@@ -172,8 +172,8 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
                             }
                             break;
                         case COLOR_IDENTITY:
-                            if (CardUtil.getColorIdentitySortValue(cardImg.getOriginal().getManaCost(), cardImg.getOriginal().getColor(), cardImg.getOriginal().getRules())
-                                    != CardUtil.getColorIdentitySortValue(lastCard.getOriginal().getManaCost(), lastCard.getOriginal().getColor(), lastCard.getOriginal().getRules())) {
+                            if (CardColorUtil.getColorIdentitySortValue(cardImg.getOriginal().getManaCost(), cardImg.getOriginal().getColor(), cardImg.getOriginal().getRules())
+                                    != CardColorUtil.getColorIdentitySortValue(lastCard.getOriginal().getManaCost(), lastCard.getOriginal().getColor(), lastCard.getOriginal().getRules())) {
                                 curColumn++;
                                 curRow = 0;
                             }
@@ -404,8 +404,8 @@ class CardColorDetailedIdentity implements Comparator<MageCard> {
 
     @Override
     public int compare(MageCard o1, MageCard o2) {
-        int val = CardUtil.getColorIdentitySortValue(o1.getOriginal().getManaCost(), o1.getOriginal().getColor(), o1.getOriginal().getRules())
-                - CardUtil.getColorIdentitySortValue(o2.getOriginal().getManaCost(), o2.getOriginal().getColor(), o2.getOriginal().getRules());
+        int val = CardColorUtil.getColorIdentitySortValue(o1.getOriginal().getManaCost(), o1.getOriginal().getColor(), o1.getOriginal().getRules())
+                - CardColorUtil.getColorIdentitySortValue(o2.getOriginal().getManaCost(), o2.getOriginal().getColor(), o2.getOriginal().getRules());
         if (val == 0) {
             return o1.getOriginal().getName().compareTo(o2.getOriginal().getName());
         } else {
diff --git a/Mage.Client/src/main/java/mage/client/util/CardViewColorIdentityComparator.java b/Mage.Client/src/main/java/mage/client/util/CardViewColorIdentityComparator.java
index 162ea9182b8..60ce0dda9ab 100644
--- a/Mage.Client/src/main/java/mage/client/util/CardViewColorIdentityComparator.java
+++ b/Mage.Client/src/main/java/mage/client/util/CardViewColorIdentityComparator.java
@@ -2,7 +2,7 @@
 package mage.client.util;
 
 import java.util.Comparator;
-import mage.utils.CardUtil;
+import mage.utils.CardColorUtil;
 import mage.view.CardView;
 
 /**
@@ -13,7 +13,7 @@ public class CardViewColorIdentityComparator implements Comparator<CardView> {
 
     @Override
     public int compare(CardView o1, CardView o2) {
-        return CardUtil.getColorIdentitySortValue(o1.getManaCost(), o1.getColor(), o1.getRules())
-                - CardUtil.getColorIdentitySortValue(o2.getManaCost(), o2.getColor(), o2.getRules());
+        return CardColorUtil.getColorIdentitySortValue(o1.getManaCost(), o1.getColor(), o1.getRules())
+                - CardColorUtil.getColorIdentitySortValue(o2.getManaCost(), o2.getColor(), o2.getRules());
     }
 }
diff --git a/Mage.Common/src/main/java/mage/utils/CardUtil.java b/Mage.Common/src/main/java/mage/utils/CardColorUtil.java
similarity index 98%
rename from Mage.Common/src/main/java/mage/utils/CardUtil.java
rename to Mage.Common/src/main/java/mage/utils/CardColorUtil.java
index ccd928f988b..8556bfd698a 100644
--- a/Mage.Common/src/main/java/mage/utils/CardUtil.java
+++ b/Mage.Common/src/main/java/mage/utils/CardColorUtil.java
@@ -13,7 +13,7 @@ import java.util.List;
  * @version 0.1 02.11.2010
  * @author nantuko
  */
-public final class CardUtil {
+public final class CardColorUtil {
 
     private static final String regexBlack = ".*\\x7b.{0,2}B.{0,2}\\x7d.*";
     private static final String regexBlue = ".*\\x7b.{0,2}U.{0,2}\\x7d.*";