diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java index 5f1d8518634..b484f31ab98 100644 --- a/forge-core/src/main/java/forge/deck/CardPool.java +++ b/forge-core/src/main/java/forge/deck/CardPool.java @@ -27,6 +27,7 @@ import forge.util.ItemPoolSorter; import forge.util.MyRandom; import org.apache.commons.lang3.StringUtils; +import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map.Entry; @@ -197,7 +198,7 @@ public class CardPool extends ItemPool { public String toCardList(String separator) { List> main2sort = Lists.newArrayList(this); - main2sort.sort(ItemPoolSorter.BY_NAME_THEN_SET); + Collections.sort(main2sort, ItemPoolSorter.BY_NAME_THEN_SET); final CardDb commonDb = StaticData.instance().getCommonCards(); StringBuilder sb = new StringBuilder(); diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java index 9e8921d78b6..f997a6582a5 100644 --- a/forge-core/src/main/java/forge/deck/Deck.java +++ b/forge-core/src/main/java/forge/deck/Deck.java @@ -123,7 +123,7 @@ public class Deck extends DeckBase implements Iterable 1) { //sort by type so signature spell comes after oathbreaker - result.sort(new Comparator() { + Collections.sort(result, new Comparator() { @Override public int compare(final PaperCard c1, final PaperCard c2) { return Boolean.compare(c1.getRules().canBeSignatureSpell(), c2.getRules().canBeSignatureSpell()); diff --git a/forge-core/src/main/java/forge/deck/DeckGroup.java b/forge-core/src/main/java/forge/deck/DeckGroup.java index 53f22b74d2d..20ef5adc404 100644 --- a/forge-core/src/main/java/forge/deck/DeckGroup.java +++ b/forge-core/src/main/java/forge/deck/DeckGroup.java @@ -79,7 +79,7 @@ public class DeckGroup extends DeckBase { if (aiDecks.size() < 2) { return; } - aiDecks.sort(comparator); + Collections.sort(aiDecks, comparator); } @Override diff --git a/forge-core/src/main/java/forge/util/collect/FCollection.java b/forge-core/src/main/java/forge/util/collect/FCollection.java index 4599035c795..709c325e16c 100644 --- a/forge-core/src/main/java/forge/util/collect/FCollection.java +++ b/forge-core/src/main/java/forge/util/collect/FCollection.java @@ -506,7 +506,7 @@ public class FCollection implements List, /*Set,*/ FCollectionView, * {@inheritDoc} */ public void sort(final Comparator comparator) { - list.sort(comparator); + Collections.sort(list, comparator); } /** diff --git a/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java b/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java index a0434aeab79..9a60d5d92d3 100644 --- a/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java +++ b/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java @@ -132,7 +132,7 @@ public final class MapToAmountUtil { for (final Entry entry : map.entrySet()) { entries.add(Pair.of(entry.getKey(), entry.getValue())); } - entries.sort(new Comparator>() { + Collections.sort(entries, new Comparator>() { @Override public int compare(final Entry o1, final Entry o2) { return o1.getValue().compareTo(o2.getValue()); diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java index 23dc2860af2..5f13ef658e1 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java @@ -35,6 +35,7 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.Enumeration; import java.util.LinkedList; @@ -164,9 +165,8 @@ public final class ItemListView extends ItemView { columns.add(colOverrides.get(colConfig.getDef())); } } - columns.sort(new Comparator() { - @Override - public int compare(final ItemTableColumn arg0, final ItemTableColumn arg1) { + Collections.sort(columns, new Comparator() { + @Override public int compare(final ItemTableColumn arg0, final ItemTableColumn arg1) { return Integer.compare(arg0.getIndex(), arg1.getIndex()); } }); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java index 2dc906c0e61..00a25b1da95 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/ContestGauntletLister.java @@ -4,6 +4,7 @@ import java.awt.Color; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -46,7 +47,7 @@ public class ContestGauntletLister extends JPanel { final List tempRows = new ArrayList<>(); final List sorted = new ArrayList<>(); sorted.addAll(gd0); - sorted.sort(new Comparator() { + Collections.sort(sorted, new Comparator() { @Override public int compare(final GauntletData x, final GauntletData y) { return x.getName().compareTo(y.getName()); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java index 99e47412fb5..6028c92228e 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/gauntlet/QuickGauntletLister.java @@ -4,6 +4,7 @@ import java.awt.Color; import java.awt.event.MouseEvent; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -65,7 +66,7 @@ public class QuickGauntletLister extends JPanel { final List tempRows = new ArrayList<>(); final List sorted = new ArrayList<>(); sorted.addAll(gauntlets); - sorted.sort(new Comparator() { + Collections.sort(sorted, new Comparator() { @Override public int compare(final GauntletData x, final GauntletData y) { return x.getName().toLowerCase().compareTo(y.getName().toLowerCase()); diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java index 7a650ed9ee4..31d502a48e7 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestFileLister.java @@ -67,7 +67,7 @@ public class QuestFileLister extends JPanel { List tempRows = new ArrayList<>(); List sorted = new ArrayList<>(); sorted.addAll(qd0); - sorted.sort(new Comparator() { + Collections.sort(sorted, new Comparator() { @Override public int compare(final QuestData x, final QuestData y) { return x.getName().toLowerCase().compareTo(y.getName().toLowerCase()); diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java index 74e6e2e5a5d..4dba33b85f2 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingZone.java @@ -19,6 +19,7 @@ package forge.view.arcane; import java.util.HashMap; import java.util.Map; +import java.util.Collections; import java.util.Comparator; import java.awt.event.MouseEvent; @@ -126,7 +127,7 @@ public class FloatingZone extends FloatingCardArea { if ( zoneCards != null ) { cardList = new FCollection<>(zoneCards); if ( sortedByName ) { - cardList.sort(comp); + Collections.sort(cardList, comp); } return cardList; } else { diff --git a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java index d2b9a769b79..96c381e1d5b 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -229,7 +229,7 @@ public abstract class ItemManager extends FContainer im cols.add(colOverrides.get(colConfig.getDef())); } } - cols.sort(new Comparator() { + Collections.sort(cols, new Comparator() { @Override public int compare(ItemColumn arg0, ItemColumn arg1) { return Integer.compare(arg0.getConfig().getIndex(), arg1.getConfig().getIndex()); diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java index a8a3cc58e6a..51920794a30 100644 --- a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java +++ b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java @@ -3,6 +3,7 @@ package forge.screens.gauntlet; import java.io.File; import java.text.NumberFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; import com.badlogic.gdx.utils.Align; @@ -296,7 +297,7 @@ public class LoadGauntletScreen extends LaunchScreen { public void refresh() { List sorted = new ArrayList<>(); sorted.addAll(gauntlets); - sorted.sort(new Comparator() { + Collections.sort(sorted, new Comparator() { @Override public int compare(final GauntletData x, final GauntletData y) { return x.getName().toLowerCase().compareTo(y.getName().toLowerCase()); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index e11ce520ca0..da8c3d817a2 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -2,6 +2,7 @@ package forge.screens.planarconquest; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -335,7 +336,7 @@ public class LoadConquestScreen extends LaunchScreen { public void setConquests(List qd0) { List sorted = new ArrayList<>(); sorted.addAll(qd0); - sorted.sort(new Comparator() { + Collections.sort(sorted, new Comparator() { @Override public int compare(final ConquestData x, final ConquestData y) { return x.getName().toLowerCase().compareTo(y.getName().toLowerCase()); diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java index 23ccaaf97bf..77867072bb8 100644 --- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -336,7 +337,7 @@ public class LoadQuestScreen extends LaunchScreen { public void setQuests(List qd0) { List sorted = new ArrayList<>(); sorted.addAll(qd0); - sorted.sort(new Comparator() { + Collections.sort(sorted, new Comparator() { @Override public int compare(final QuestData x, final QuestData y) { return x.getName().toLowerCase().compareTo(y.getName().toLowerCase()); diff --git a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java index e8f19f00ad1..9ba376a0b53 100644 --- a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java +++ b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java @@ -334,7 +334,7 @@ public class GuiChoose { // If comparer is NULL, T has to be comparable. Otherwise you'll get an exception from inside the Arrays.sort() routine public static void sortedGetChoices(final String message, final int min, final int max, final List choices, Comparator comparer, final Callback> callback) { // You may create a copy of source list if callers expect the collection to be unchanged - choices.sort(comparer); + Collections.sort(choices, comparer); getChoices(message, min, max, choices, callback); } } diff --git a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java index 129924ef861..e2b43bc5927 100644 --- a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java +++ b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java @@ -209,7 +209,7 @@ public class AdvancedSearch { List cards = FModel.getMagicDb().getCommonCards().getAllCards(input.getName()); if (cards.size() <= 1) { return true; } - cards.sort(FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR); + Collections.sort(cards, FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR); return cards.get(0) == input; } }), diff --git a/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java b/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java index cb634c6f120..345647f207e 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java +++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java @@ -18,6 +18,7 @@ package forge.itemmanager; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map.Entry; @@ -124,7 +125,7 @@ public final class ItemManagerModel { public void refreshSort() { if (getOrderedList().isEmpty()) { return; } - getOrderedList().sort(new MyComparator()); + Collections.sort(getOrderedList(), new MyComparator()); } //Manages sorting orders for multiple depths of sorting diff --git a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java index eb960d86a2c..af66a90e732 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java @@ -12,6 +12,7 @@ import forge.util.ComparableOp; import forge.util.Localizer; import java.util.ArrayList; +import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map.Entry; @@ -146,7 +147,7 @@ public final class SItemManagerUtil { for (final Entry itemEntry : items) { sorted.add(itemEntry); } - sorted.sort(new Comparator>() { + Collections.sort(sorted, new Comparator>() { @Override public int compare(final Entry x, final Entry y) { return x.getKey().toString().compareTo(y.getKey().toString()); diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/limited/BoosterDraft.java index f3f58037b5b..09d22dca69e 100644 --- a/forge-gui/src/main/java/forge/limited/BoosterDraft.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraft.java @@ -158,7 +158,7 @@ public class BoosterDraft implements IBoosterDraft { if (myDrafts.isEmpty()) { SOptionPane.showMessageDialog("No custom draft files found."); } else { - myDrafts.sort(new Comparator() { + Collections.sort(myDrafts, new Comparator() { @Override public int compare(CustomLimited o1, CustomLimited o2) { return o1.getName().compareTo(o2.getName()); diff --git a/forge-gui/src/main/java/forge/limited/CardRanker.java b/forge-gui/src/main/java/forge/limited/CardRanker.java index 91f12774e2e..13d138f6b9e 100644 --- a/forge-gui/src/main/java/forge/limited/CardRanker.java +++ b/forge-gui/src/main/java/forge/limited/CardRanker.java @@ -170,7 +170,7 @@ public class CardRanker { } private static List sortAndCreateList(List> cardScores) { - cardScores.sort(Collections.reverseOrder(new CardRankingComparator())); + Collections.sort(cardScores, Collections.reverseOrder(new CardRankingComparator())); List rankedCards = new ArrayList<>(cardScores.size()); for (Pair pair : cardScores) { diff --git a/forge-gui/src/main/java/forge/match/HostedMatch.java b/forge-gui/src/main/java/forge/match/HostedMatch.java index fa57ea0a654..5d82270821c 100644 --- a/forge-gui/src/main/java/forge/match/HostedMatch.java +++ b/forge-gui/src/main/java/forge/match/HostedMatch.java @@ -1,6 +1,7 @@ package forge.match; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -108,9 +109,9 @@ public class HostedMatch { } final List sortedPlayers = Lists.newArrayList(players); - sortedPlayers.sort(new Comparator() { - @Override - public final int compare(final RegisteredPlayer p1, final RegisteredPlayer p2) { + Collections.sort(sortedPlayers, new Comparator() { + @Override public final int compare(final RegisteredPlayer p1, final RegisteredPlayer p2) { + final int v1 = p1.getPlayer() instanceof LobbyPlayerHuman ? 0 : 1; final int v2 = p2.getPlayer() instanceof LobbyPlayerHuman ? 0 : 1; return Integer.compare(v1, v2); diff --git a/forge-gui/src/main/java/forge/net/client/GameClientHandler.java b/forge-gui/src/main/java/forge/net/client/GameClientHandler.java index 60eebcaabfc..30d977378a1 100644 --- a/forge-gui/src/main/java/forge/net/client/GameClientHandler.java +++ b/forge-gui/src/main/java/forge/net/client/GameClientHandler.java @@ -206,7 +206,7 @@ final class GameClientHandler extends GameProtocolHandler { } final List sortedPlayers = Lists.newArrayList(players); - sortedPlayers.sort(new Comparator() { + Collections.sort(sortedPlayers, new Comparator() { @Override public final int compare(final RegisteredPlayer p1, final RegisteredPlayer p2) { final int v1 = p1.getPlayer() instanceof LobbyPlayerHuman ? 0 : 1; diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index eb4dc80fa2f..238a2398837 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1146,7 +1146,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont // create sorted list from map from least to most frequent List> sortedList = Lists.newArrayList(typesInDeck.entrySet()); - sortedList.sort(new Comparator>() { + Collections.sort(sortedList, new Comparator>() { public int compare(Entry o1, Entry o2) { return o1.getValue().compareTo(o2.getValue()); } diff --git a/forge-gui/src/main/java/forge/quest/BoosterUtils.java b/forge-gui/src/main/java/forge/quest/BoosterUtils.java index 43fe9083c46..84d6cb768bd 100644 --- a/forge-gui/src/main/java/forge/quest/BoosterUtils.java +++ b/forge-gui/src/main/java/forge/quest/BoosterUtils.java @@ -551,19 +551,19 @@ public final class BoosterUtils { public static void sort(List cards) { //sort cards alphabetically so colors appear together and rares appear on top - cards.sort(new Comparator() { + Collections.sort(cards, new Comparator() { @Override public int compare(PaperCard c1, PaperCard c2) { return c1.getName().compareTo(c2.getName()); } }); - cards.sort(new Comparator() { + Collections.sort(cards, new Comparator() { @Override public int compare(PaperCard c1, PaperCard c2) { return c1.getRules().getColor().compareTo(c2.getRules().getColor()); } }); - cards.sort(new Comparator() { + Collections.sort(cards, new Comparator() { @Override public int compare(PaperCard c1, PaperCard c2) { return c2.getRarity().compareTo(c1.getRarity()); diff --git a/forge-gui/src/main/java/forge/quest/QuestEventDraft.java b/forge-gui/src/main/java/forge/quest/QuestEventDraft.java index 4f58b2f0437..88ff16f4bf6 100644 --- a/forge-gui/src/main/java/forge/quest/QuestEventDraft.java +++ b/forge-gui/src/main/java/forge/quest/QuestEventDraft.java @@ -991,7 +991,7 @@ public class QuestEventDraft implements IQuestEvent { } final boolean oldSetsFirst = sets.get(0).getDate().before(FModel.getMagicDb().getEditions().get("SOM").getDate()); - allowedSets.sort(new Comparator() { + Collections.sort(allowedSets, new Comparator() { @Override public int compare(final CardEdition edition1, final CardEdition edition2) { if (edition1.getDate().before(edition2.getDate())) { diff --git a/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java b/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java index ffbad1ca8f3..cb2e852554f 100644 --- a/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java +++ b/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java @@ -168,7 +168,7 @@ public class QuestUtilUnlockSets { } // sort by distance, then by code desc - excludedWithDistances.sort(new Comparator>() { + Collections.sort(excludedWithDistances, new Comparator>() { @Override public int compare(ImmutablePair o1, ImmutablePair o2) { long delta = o2.right - o1.right; diff --git a/forge-gui/src/main/java/forge/tournament/system/AbstractTournament.java b/forge-gui/src/main/java/forge/tournament/system/AbstractTournament.java index b70a9b526da..e658f3cac29 100644 --- a/forge-gui/src/main/java/forge/tournament/system/AbstractTournament.java +++ b/forge-gui/src/main/java/forge/tournament/system/AbstractTournament.java @@ -109,21 +109,21 @@ public abstract class AbstractTournament implements Serializable { public void sortAllPlayers(String sortType) { if (sortType.equals("score")) { - allPlayers.sort(new Comparator() { + Collections.sort(allPlayers, new Comparator() { @Override public int compare(TournamentPlayer o1, TournamentPlayer o2) { return o2.getScore() - o1.getScore(); } }); } else if (sortType.equals("index")) { - allPlayers.sort(new Comparator() { + Collections.sort(allPlayers, new Comparator() { @Override public int compare(TournamentPlayer o1, TournamentPlayer o2) { return o2.getIndex() - o1.getIndex(); } }); } else if (sortType.equals("swiss")) { - allPlayers.sort(new Comparator() { + Collections.sort(allPlayers, new Comparator() { @Override public int compare(TournamentPlayer o1, TournamentPlayer o2) { return o2.getSwissScore() - o1.getSwissScore(); diff --git a/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java b/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java index 1a7df43b495..31c9ae300ff 100644 --- a/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java +++ b/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java @@ -129,7 +129,7 @@ public class TournamentSwiss extends AbstractTournament { return pairSwissGroup(players); } - players.sort(new Comparator() { + Collections.sort(players, new Comparator() { @Override public int compare(TournamentPlayer o1, TournamentPlayer o2) { return availableOpponents.get(o1).size() - availableOpponents.get(o2).size();