From 7da043afd00c82c45630af027ea3450a76f9ee2b Mon Sep 17 00:00:00 2001
From: "vyacheslav.raskulin" <v.raskulin@gmail.com>
Date: Wed, 9 Sep 2020 15:00:30 +0300
Subject: [PATCH] comparation simplified

---
 .../src/main/java/mage/client/cards/CardGrid.java     |  2 +-
 .../src/main/java/mage/client/cards/Cards.java        |  2 +-
 .../java/mage/client/dialog/PickCheckBoxDialog.java   | 11 ++++-------
 .../java/mage/client/dialog/PickChoiceDialog.java     | 11 ++++-------
 .../client/plugins/adapters/MageActionCallback.java   |  2 +-
 .../java/mage/client/util/CardViewCostComparator.java |  2 +-
 6 files changed, 12 insertions(+), 18 deletions(-)

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 806b445e2bf..0c6fd69d8af 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardGrid.java
@@ -384,7 +384,7 @@
 
      @Override
      public int compare(MageCard o1, MageCard o2) {
-         int val = Integer.valueOf(o1.getOriginal().getConvertedManaCost()).compareTo(o2.getOriginal().getConvertedManaCost());
+         int val = Integer.compare(o1.getOriginal().getConvertedManaCost(), o2.getOriginal().getConvertedManaCost());
          if (val == 0) {
              return o1.getOriginal().getName().compareTo(o2.getOriginal().getName());
          } else {
diff --git a/Mage.Client/src/main/java/mage/client/cards/Cards.java b/Mage.Client/src/main/java/mage/client/cards/Cards.java
index b1ee32f74f2..f3241bc0039 100644
--- a/Mage.Client/src/main/java/mage/client/cards/Cards.java
+++ b/Mage.Client/src/main/java/mage/client/cards/Cards.java
@@ -321,7 +321,7 @@
              }
          }
          // sort the cards
-         cardsToLayout.sort((cp1, cp2) -> Integer.valueOf(cp1.getLocation().x).compareTo(cp2.getLocation().x));
+         cardsToLayout.sort(Comparator.comparingInt(cp -> cp.getLocation().x));
          // relocate the cards
          int dx = 0;
          for (Component component : cardsToLayout) {
diff --git a/Mage.Client/src/main/java/mage/client/dialog/PickCheckBoxDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PickCheckBoxDialog.java
index 584d5b5aa3b..c7ed93b891e 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PickCheckBoxDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/PickCheckBoxDialog.java
@@ -96,13 +96,10 @@ public class PickCheckBoxDialog extends MageDialog {
 
         // sorting
         if (choice.isSortEnabled()) {
-            Collections.sort(this.allItems, new Comparator<KeyValueItem>() {
-                @Override
-                public int compare(KeyValueItem o1, KeyValueItem o2) {
-                    Integer n1 = choice.getSortData().get(o1.getKey());
-                    Integer n2 = choice.getSortData().get(o2.getKey());
-                    return n1.compareTo(n2);
-                }
+            this.allItems.sort((o1, o2) -> {
+                Integer n1 = choice.getSortData().get(o1.getKey());
+                Integer n2 = choice.getSortData().get(o2.getKey());
+                return n1.compareTo(n2);
             });
         }
 
diff --git a/Mage.Client/src/main/java/mage/client/dialog/PickChoiceDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PickChoiceDialog.java
index 92ba6cac319..8ea8bdc0dbf 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/PickChoiceDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/PickChoiceDialog.java
@@ -57,13 +57,10 @@ public class PickChoiceDialog extends MageDialog {
 
         // sorting
         if (choice.isSortEnabled()) {
-            Collections.sort(this.allItems, new Comparator<KeyValueItem>() {
-                @Override
-                public int compare(KeyValueItem o1, KeyValueItem o2) {
-                    Integer n1 = choice.getSortData().get(o1.Key);
-                    Integer n2 = choice.getSortData().get(o2.Key);
-                    return n1.compareTo(n2);
-                }
+            this.allItems.sort((o1, o2) -> {
+                Integer n1 = choice.getSortData().get(o1.Key);
+                Integer n2 = choice.getSortData().get(o2.Key);
+                return n1.compareTo(n2);
             });
         }
 
diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
index 50665578dfd..7c56a8a74e6 100644
--- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
+++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
@@ -332,7 +332,7 @@ public class MageActionCallback implements ActionCallback {
     private void sortLayout(List<CardPanel> cards, CardPanel source, boolean includeSource) {
         source.getLocation().x -= COMPARE_GAP_X; // this creates nice effect
 
-        cards.sort((cp1, cp2) -> Integer.valueOf(cp1.getLocation().x).compareTo(cp2.getLocation().x));
+        cards.sort(Comparator.comparingInt(cp -> cp.getLocation().x));
 
         int dx = 0;
         boolean createdGapForSource = false;
diff --git a/Mage.Client/src/main/java/mage/client/util/CardViewCostComparator.java b/Mage.Client/src/main/java/mage/client/util/CardViewCostComparator.java
index 0bfa18bb0df..00452c6a3df 100644
--- a/Mage.Client/src/main/java/mage/client/util/CardViewCostComparator.java
+++ b/Mage.Client/src/main/java/mage/client/util/CardViewCostComparator.java
@@ -12,7 +12,7 @@ public class CardViewCostComparator implements Comparator<CardView> {
 
     @Override
     public int compare(CardView o1, CardView o2) {
-        return Integer.valueOf(o1.getConvertedManaCost()).compareTo(o2.getConvertedManaCost());
+        return Integer.compare(o1.getConvertedManaCost(), o2.getConvertedManaCost());
     }
 
 }