From 72d23bfe95f89c1b3f3f4e08c405c162feb4cb7a Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Wed, 3 Oct 2018 23:59:51 +0400
Subject: [PATCH]  * UI: deck editor - added cards sorting by rarity (#4414);

---
 .../deckeditor/table/MageCardComparator.java  |  5 ++--
 Mage/src/main/java/mage/constants/Rarity.java | 23 +++++++++++--------
 2 files changed, 17 insertions(+), 11 deletions(-)

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 1570c99aa7a..11a8a9d24b7 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
@@ -27,6 +27,7 @@
 package mage.client.deckeditor.table;
 
 import java.util.Comparator;
+
 import mage.cards.MageCard;
 import mage.view.CardView;
 
@@ -94,8 +95,8 @@ public class MageCardComparator implements Comparator<CardView> {
                 break;
             // Rarity
             case 6:
-                aCom = a.getRarity().toString();
-                bCom = b.getRarity().toString();
+                aCom = a.getRarity().getSorting();
+                bCom = b.getRarity().getSorting();
                 break;
             // Set name
             case 7:
diff --git a/Mage/src/main/java/mage/constants/Rarity.java b/Mage/src/main/java/mage/constants/Rarity.java
index b8fbf3259e2..2a79d5f3689 100644
--- a/Mage/src/main/java/mage/constants/Rarity.java
+++ b/Mage/src/main/java/mage/constants/Rarity.java
@@ -1,29 +1,30 @@
 package mage.constants;
 
 /**
- *
  * @author North
  */
 public enum Rarity {
 
-    LAND ("Land", "common", "C", 1),
-    COMMON ("Common", "common", "C", 1),
-    UNCOMMON ("Uncommon", "uncommon", "U", 2),
-    RARE ("Rare", "rare", "R", 3),
-    MYTHIC ("Mythic", "mythic", "M", 3),
-    SPECIAL ("Special", "special", "Special", 3),
-    BONUS ("Bonus", "bonus", "Bonus", 3);
+    LAND("Land", "common", "C", 1, 1),
+    COMMON("Common", "common", "C", 1, 2),
+    UNCOMMON("Uncommon", "uncommon", "U", 2, 3),
+    RARE("Rare", "rare", "R", 3, 4),
+    MYTHIC("Mythic", "mythic", "M", 3, 5),
+    SPECIAL("Special", "special", "Special", 3, 6),
+    BONUS("Bonus", "bonus", "Bonus", 3, 7);
 
     private final String text;
     private final String symbolCode;
     private final String code;
     private final int rating;
+    private final int sorting;
 
-    Rarity(String text, String symbolCode, String code, int rating) {
+    Rarity(String text, String symbolCode, String code, int rating, int sorting) {
         this.text = text;
         this.symbolCode = symbolCode;
         this.code = code;
         this.rating = rating;
+        this.sorting = sorting;
     }
 
     @Override
@@ -42,4 +43,8 @@ public enum Rarity {
     public int getRating() {
         return rating;
     }
+
+    public int getSorting() {
+        return sorting;
+    }
 }