From 0beace4547e6619017dc5ec374210844bb99f8b7 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 19 Feb 2014 17:29:25 +0100 Subject: [PATCH] Removed wrong/old Preference load of sortType. --- Mage.Client/src/main/java/mage/client/cards/CardsList.java | 4 ++-- .../src/main/java/mage/client/deckeditor/DeckEditorPanel.java | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.java b/Mage.Client/src/main/java/mage/client/cards/CardsList.java index 51e7c9bc944..b2d7e61103f 100644 --- a/Mage.Client/src/main/java/mage/client/cards/CardsList.java +++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.java @@ -186,7 +186,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar } public List asList(final int[] is) { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int i : is) { list.add(i); } @@ -224,7 +224,7 @@ public class CardsList extends javax.swing.JPanel implements MouseListener, ICar cardArea.removeAll(); if (cards != null && cards.size() > 0) { Rectangle rectangle = new Rectangle(Config.dimensions.frameWidth, Config.dimensions.frameHeight); - List sortedCards = new ArrayList(cards.values()); + List sortedCards = new ArrayList<>(cards.values()); switch (sortSetting.getSortBy()) { case NAME: Collections.sort(sortedCards, new CardViewNameComparator()); diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java index 5aec33573af..49cbe08915d 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java @@ -308,9 +308,6 @@ public class DeckEditorPanel extends javax.swing.JPanel { } } }); - // Set Sort from Preferences - SortBy sortBy = SortBy.getByString(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_DRAFT_SORT_BY, "Color")); - deckArea.getDeckList().setSortBy(sortBy); refreshDeck(); this.setVisible(true);