Added a new sort mode to editor that sorts by color detailed by color combinations.

Mage.Client/src/main/java/mage/client/cards/CardGrid.java

@@ -48,6 +48,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.Map.Entry;
+import mage.ObjectColor;
 
 import mage.cards.MageCard;
 import mage.client.constants.Constants.SortBy;
@@ -132,6 +133,9 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
                 case COLOR:
                     Collections.sort(sortedCards, new CardColorComparator());
                     break;
+                case COLOR_DETAILED:
+                    Collections.sort(sortedCards, new CardColorDetailedComparator());
+                    break;
                 case CASTING_COST:
                     Collections.sort(sortedCards, new CardCostComparator());
                     break;
@@ -160,6 +164,12 @@ public class CardGrid extends javax.swing.JLayeredPane implements MouseListener,
                                 curRow = 0;
                             }
                             break;
+                        case COLOR_DETAILED:
+                            if (cardImg.getOriginal().getColor().hashCode() !=  lastCard.getOriginal().getColor().hashCode()) {
+                                curColumn++;
+                                curRow = 0;
+                            }
+                            break;
                         case CASTING_COST:
                             if (cardImg.getOriginal().getConvertedManaCost() != lastCard.getOriginal().getConvertedManaCost()) {
                                 curColumn++;
@@ -349,4 +359,19 @@ class CardColorComparator implements Comparator<MageCard> {
         }
     }
 
-}
+}
+
+class CardColorDetailedComparator implements Comparator<MageCard> {
+
+    @Override
+    public int compare(MageCard o1, MageCard o2) {
+        int val = o1.getOriginal().getColor().hashCode() - o2.getOriginal().getColor().hashCode();
+        if (val == 0) {
+            return o1.getOriginal().getName().compareTo(o2.getOriginal().getName());
+        }
+        else {
+            return val;
+        }
+    }
+
+}

Mage.Client/src/main/java/mage/client/cards/CardsList.java

@@ -185,6 +185,9 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
                 case COLOR:
                     Collections.sort(sortedCards, new CardViewColorComparator());
                     break;
+                case COLOR_DETAILED:
+                    Collections.sort(sortedCards, new CardViewColorDetailedComparator());
+                    break;
                 case CASTING_COST:
                     Collections.sort(sortedCards, new CardViewCostComparator());
                     break;
@@ -213,6 +216,12 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar
                                 curRow = 0;
                             }
                             break;
+                        case COLOR_DETAILED:
+                            if (card.getColor().hashCode() != lastCard.getColor().hashCode()) {
+                                curColumn++;
+                                curRow = 0;
+                            }
+                            break;
                         case CASTING_COST:
                             if (card.getConvertedManaCost() != lastCard.getConvertedManaCost()) {
                                 curColumn++;

Mage.Client/src/main/java/mage/client/constants/Constants.java

@@ -96,6 +96,7 @@ public final class Constants {
         CASTING_COST ("Casting Cost"),
         RARITY ("Rarity"),
         COLOR ("Color"),
+        COLOR_DETAILED ("Color Detailed"),
         NAME ("Name"),
         UNSORTED ("Unsorted");
 

Mage.Client/src/main/java/mage/client/util/CardViewColorDetailedComparator.java

@@ -0,0 +1,51 @@
+/*
+ *  Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+
+package mage.client.util;
+
+import java.util.Comparator;
+import mage.view.CardView;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class CardViewColorDetailedComparator implements Comparator<CardView> {
+
+    @Override
+    public int compare(CardView o1, CardView o2) {
+        int val = o1.getColor().hashCode() - o2.getColor().hashCode();
+        if (val == 0) {
+            return o1.getName().compareTo(o2.getName());
+        }
+        else {
+            return val;
+        }
+    }
+
+}