diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java index 30d01bd9ccc..2ad89291285 100644 --- a/forge-ai/src/main/java/forge/ai/AiController.java +++ b/forge-ai/src/main/java/forge/ai/AiController.java @@ -666,7 +666,7 @@ public class AiController { List all = ComputerUtilAbility.getSpellAbilities(cards, player); try { - Collections.sort(all, ComputerUtilAbility.saEvaluator); // put best spells first + all.sort(ComputerUtilAbility.saEvaluator); // put best spells first ComputerUtilAbility.sortCreatureSpells(all); } catch (IllegalArgumentException ex) { System.err.println(ex.getMessage()); @@ -1589,7 +1589,7 @@ public class AiController { return null; try { - Collections.sort(all, ComputerUtilAbility.saEvaluator); // put best spells first + all.sort(ComputerUtilAbility.saEvaluator); // put best spells first ComputerUtilAbility.sortCreatureSpells(all); } catch (IllegalArgumentException ex) { System.err.println(ex.getMessage()); diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java index c7d1e6f8145..4f80defc430 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java @@ -965,7 +965,7 @@ public class ComputerUtilCard { if (color.hasGreen()) map.get(4).setValue(map.get(4).getValue() + 1); } - Collections.sort(map, Comparator.>comparingInt(Pair::getValue).reversed()); + map.sort(Comparator.>comparingInt(Pair::getValue).reversed()); // will this part be once dropped? List result = new ArrayList<>(cntColors); diff --git a/forge-ai/src/main/java/forge/ai/SpecialCardAi.java b/forge-ai/src/main/java/forge/ai/SpecialCardAi.java index 09fd85c2f2f..7731c20bf9e 100644 --- a/forge-ai/src/main/java/forge/ai/SpecialCardAi.java +++ b/forge-ai/src/main/java/forge/ai/SpecialCardAi.java @@ -791,7 +791,7 @@ public class SpecialCardAi { sa.getParamOrDefault("ChangeNum", "1"), sa); CardCollection lib = CardLists.filter(ai.getCardsIn(ZoneType.Library), Predicates.not(CardPredicates.nameEquals(sa.getHostCard().getName()))); - Collections.sort(lib, CardLists.CmcComparatorInv); + lib.sort(CardLists.CmcComparatorInv); // Additional cards which are difficult to auto-classify but which are generally good to Intuition for List highPriorityNamedCards = Lists.newArrayList("Accumulated Knowledge", "Take Inventory"); @@ -888,7 +888,7 @@ public class SpecialCardAi { // If we're playing Reanimator, we're really interested just in the highest CMC spells, not the // ones we necessarily have multiples of if (ComputerUtil.isPlayingReanimator(ai)) { - Collections.sort(libHighPriorityList, CardLists.CmcComparatorInv); + libHighPriorityList.sort(CardLists.CmcComparatorInv); } // Otherwise, try to grab something that is hopefully decent to grab, in priority order @@ -1502,7 +1502,7 @@ public class SpecialCardAi { if (atTargetCMCInLib.isEmpty()) { atTargetCMCInLib = CardLists.filter(creatsInLib, CardPredicates.greaterCMC(numManaSrcs)); } - Collections.sort(atTargetCMCInLib, CardLists.CmcComparatorInv); + atTargetCMCInLib.sort(CardLists.CmcComparatorInv); if (atTargetCMCInLib.isEmpty()) { // Nothing to aim for? return null; @@ -1510,11 +1510,11 @@ public class SpecialCardAi { // Cards in hand that are below the max CMC affordable by the AI CardCollection belowMaxCMC = CardLists.filter(creatsInHand, CardPredicates.lessCMC(numManaSrcs - 1)); - Collections.sort(belowMaxCMC, Collections.reverseOrder(CardLists.CmcComparatorInv)); + belowMaxCMC.sort(Collections.reverseOrder(CardLists.CmcComparatorInv)); // Cards in hand that are above the max CMC affordable by the AI CardCollection aboveMaxCMC = CardLists.filter(creatsInHand, CardPredicates.greaterCMC(numManaSrcs + 1)); - Collections.sort(aboveMaxCMC, CardLists.CmcComparatorInv); + aboveMaxCMC.sort(CardLists.CmcComparatorInv); Card maxCMC = !aboveMaxCMC.isEmpty() ? aboveMaxCMC.getFirst() : null; Card minCMC = !belowMaxCMC.isEmpty() ? belowMaxCMC.getFirst() : null; @@ -1547,7 +1547,7 @@ public class SpecialCardAi { // worth to fill the graveyard now if (ComputerUtil.isPlayingReanimator(ai) && !creatsInLib.isEmpty()) { CardCollection creatsInHandByCMC = new CardCollection(creatsInHand); - Collections.sort(creatsInHandByCMC, CardLists.CmcComparatorInv); + creatsInHandByCMC.sort(CardLists.CmcComparatorInv); return creatsInHandByCMC.getFirst(); } @@ -1569,14 +1569,14 @@ public class SpecialCardAi { if (atTargetCMCInLib.isEmpty()) { atTargetCMCInLib = CardLists.filter(creatsInLib, CardPredicates.greaterCMC(numManaSrcs)); } - Collections.sort(atTargetCMCInLib, CardLists.CmcComparatorInv); + atTargetCMCInLib.sort(CardLists.CmcComparatorInv); Card bestInLib = atTargetCMCInLib != null ? atTargetCMCInLib.getFirst() : null; if (bestInLib == null && ComputerUtil.isPlayingReanimator(ai)) { // For Reanimator, we don't mind grabbing the biggest thing possible to recycle it again with SotF later. CardCollection creatsInLibByCMC = new CardCollection(creatsInLib); - Collections.sort(creatsInLibByCMC, CardLists.CmcComparatorInv); + creatsInLibByCMC.sort(CardLists.CmcComparatorInv); return creatsInLibByCMC.getFirst(); } diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java index 91d9c8a5101..8cbbcbcc3b9 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 - Collections.sort(result, Comparator.comparing(c -> c.getRules().canBeSignatureSpell())); + result.sort(Comparator.comparing(c -> c.getRules().canBeSignatureSpell())); } return result; } diff --git a/forge-core/src/main/java/forge/deck/DeckGroup.java b/forge-core/src/main/java/forge/deck/DeckGroup.java index ec79dd50abc..70db2312e8b 100644 --- a/forge-core/src/main/java/forge/deck/DeckGroup.java +++ b/forge-core/src/main/java/forge/deck/DeckGroup.java @@ -87,7 +87,7 @@ public class DeckGroup extends DeckBase { if (aiDecks.size() < 2) { return; } - Collections.sort(aiDecks, comparator); + aiDecks.sort(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 a08141ccd89..d54fe2adb24 100644 --- a/forge-core/src/main/java/forge/util/collect/FCollection.java +++ b/forge-core/src/main/java/forge/util/collect/FCollection.java @@ -525,7 +525,7 @@ public class FCollection implements List, /*Set,*/ FCollectionView, * {@inheritDoc} */ public void sort(final Comparator comparator) { - Collections.sort(list, comparator); + list.sort(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 60299475b01..f2a04e02790 100644 --- a/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java +++ b/forge-core/src/main/java/forge/util/maps/MapToAmountUtil.java @@ -133,7 +133,7 @@ public final class MapToAmountUtil { for (final Entry entry : map.entrySet()) { entries.add(Pair.of(entry.getKey(), entry.getValue())); } - Collections.sort(entries, Entry.comparingByValue()); + entries.sort(Entry.comparingByValue()); return entries; } diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index 96c05671648..5c570eec954 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -1143,7 +1143,7 @@ public class GameAction { .compareTrueFirst(a.hasParam("CharacteristicDefining"), b.hasParam("CharacteristicDefining")) .compare(a.getHostCard().getLayerTimestamp(), b.getHostCard().getLayerTimestamp()) .result(); - Collections.sort(staticAbilities, comp); + staticAbilities.sort(comp); final Map affectedPerAbility = Maps.newHashMap(); for (final StaticAbilityLayer layer : StaticAbilityLayer.CONTINUOUS_LAYERS) { diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java index 13d4ee71da9..bde08906dbc 100644 --- a/forge-game/src/main/java/forge/game/GameFormat.java +++ b/forge-game/src/main/java/forge/game/GameFormat.java @@ -465,9 +465,8 @@ public class GameFormat implements Comparable { super("Format collections", reader); naturallyOrdered = reader.naturallyOrdered; reverseDateOrdered = new ArrayList<>(naturallyOrdered); - Collections.sort(naturallyOrdered); - //Why this refactor doesnt work on some android phones? -> reverseDateOrdered.sort(new InverseDateComparator()); - Collections.sort(reverseDateOrdered, new InverseDateComparator()); + naturallyOrdered.sort(Comparator.naturalOrder()); + reverseDateOrdered.sort(new InverseDateComparator()); } public Iterable getOrderedList() { diff --git a/forge-game/src/main/java/forge/game/card/CardLists.java b/forge-game/src/main/java/forge/game/card/CardLists.java index c3a6af30aa5..152e349c092 100644 --- a/forge-game/src/main/java/forge/game/card/CardLists.java +++ b/forge-game/src/main/java/forge/game/card/CardLists.java @@ -80,7 +80,7 @@ public class CardLists { * @param list */ public static void sortByCmcDesc(final List list) { - Collections.sort(list, CmcComparatorInv); + list.sort(CmcComparatorInv); } /** @@ -91,7 +91,7 @@ public class CardLists { * @param list */ public static void sortByToughnessAsc(final List list) { - Collections.sort(list, ToughnessComparator); + list.sort(ToughnessComparator); } /** @@ -102,7 +102,7 @@ public class CardLists { * @param list */ public static void sortByToughnessDesc(final List list) { - Collections.sort(list, ToughnessComparatorInv); + list.sort(ToughnessComparatorInv); } /** @@ -113,7 +113,7 @@ public class CardLists { * @param list */ public static void sortByPowerAsc(final List list) { - Collections.sort(list, PowerComparator); + list.sort(PowerComparator); } // the higher the attack the better @@ -125,7 +125,7 @@ public class CardLists { * @param list */ public static void sortByPowerDesc(final List list) { - Collections.sort(list, Collections.reverseOrder(PowerComparator)); + list.sort(Collections.reverseOrder(PowerComparator)); } /** diff --git a/forge-game/src/main/java/forge/game/cost/Cost.java b/forge-game/src/main/java/forge/game/cost/Cost.java index 8dccee23db8..1c3aad763aa 100644 --- a/forge-game/src/main/java/forge/game/cost/Cost.java +++ b/forge-game/src/main/java/forge/game/cost/Cost.java @@ -118,7 +118,7 @@ public class Cost implements Serializable { // Things that are pretty much happen at the end (Untap) 16+ // Things that NEED to happen last 100+ - Collections.sort(this.costParts, (o1, o2) -> ObjectUtils.compare(o1.paymentOrder(), o2.paymentOrder())); + this.costParts.sort((o1, o2) -> ObjectUtils.compare(o1.paymentOrder(), o2.paymentOrder())); } /** 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 dbd681f8fee..b328c78fd7a 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 @@ -160,7 +160,7 @@ public final class ItemListView extends ItemView { columns.add(colOverrides.get(colConfig.getDef())); } } - Collections.sort(columns, Comparator.comparingInt(ItemTableColumn::getIndex)); + columns.sort(Comparator.comparingInt(ItemTableColumn::getIndex)); //hide table header if only showing single string column final boolean hideHeader = (config.getCols().size() == 1 && config.getCols().containsKey(ColumnDef.STRING)); 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 42bd1adc1be..448fb89df27 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 @@ -46,7 +46,7 @@ public class ContestGauntletLister extends JPanel { this.removeAll(); final List tempRows = new ArrayList<>(); final List sorted = new ArrayList<>(gd0); - Collections.sort(sorted, Comparator.comparing(GauntletData::getName)); + sorted.sort(Comparator.comparing(GauntletData::getName)); // Title row // Note: careful with the widths of the rows here; 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 0246f267a96..ec829f68e2e 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 @@ -65,7 +65,7 @@ public class QuickGauntletLister extends JPanel { this.removeAll(); final List tempRows = new ArrayList<>(); final List sorted = new ArrayList<>(gauntlets); - Collections.sort(sorted, Comparator.comparing(x -> x.getName().toLowerCase())); + sorted.sort(Comparator.comparing(x -> x.getName().toLowerCase())); // Title row // Note: careful with the widths of the rows here; 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 dca6573278e..33baf212b56 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 @@ -77,7 +77,7 @@ public class QuestFileLister extends JPanel { this.removeAll(); List tempRows = new ArrayList<>(); List sorted = new ArrayList<>(qd0); - Collections.sort(sorted, Comparator.comparing(x -> x.getName().toLowerCase())); + sorted.sort(Comparator.comparing(x -> x.getName().toLowerCase())); // Title row // Note: careful with the widths of the rows here; 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 af891f2870c..d404bf851d3 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 @@ -147,7 +147,7 @@ public class FloatingZone extends FloatingCardArea { if (zoneCards != null) { cardList = new FCollection<>(zoneCards); if (sortedByName) { - Collections.sort(cardList, comp); + cardList.sort(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 01269a014c0..d1bfa7b27ad 100644 --- a/forge-gui-mobile/src/forge/itemmanager/ItemManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/ItemManager.java @@ -207,7 +207,7 @@ public abstract class ItemManager extends FContainer im cols.add(colOverrides.get(colConfig.getDef())); } } - Collections.sort(cols, Comparator.comparingInt(arg0 -> arg0.getConfig().getIndex())); + cols.sort(Comparator.comparingInt(arg0 -> arg0.getConfig().getIndex())); sortCols.clear(); if (cbxSortOptions != null) { diff --git a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java index bf5494835ee..1eb2817785a 100644 --- a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java +++ b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java @@ -274,7 +274,7 @@ public class LoadGauntletScreen extends LaunchScreen { public void refresh() { List sorted = new ArrayList<>(gauntlets); - Collections.sort(sorted, Comparator.comparing(x -> x.getName().toLowerCase())); + sorted.sort(Comparator.comparing(x -> x.getName().toLowerCase())); setListData(sorted); } diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index 995d312db1a..540b4cd6176 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -302,7 +302,7 @@ public class LoadConquestScreen extends LaunchScreen { public void setConquests(List qd0) { List sorted = new ArrayList<>(qd0); - Collections.sort(sorted, Comparator.comparing(x -> x.getName().toLowerCase())); + sorted.sort(Comparator.comparing(x -> x.getName().toLowerCase())); setListData(sorted); } diff --git a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java index 46b7478a2ae..9b23d0ca7ad 100644 --- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java @@ -301,7 +301,7 @@ public class LoadQuestScreen extends LaunchScreen { public void setQuests(List qd0) { List sorted = new ArrayList<>(qd0); - Collections.sort(sorted, Comparator.comparing(x -> x.getName().toLowerCase())); + sorted.sort(Comparator.comparing(x -> x.getName().toLowerCase())); setListData(sorted); } diff --git a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java index 66f14fe4eb9..38a1a1d6449 100644 --- a/forge-gui-mobile/src/forge/toolbox/GuiChoose.java +++ b/forge-gui-mobile/src/forge/toolbox/GuiChoose.java @@ -340,7 +340,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 - Collections.sort(choices, comparer); + choices.sort(comparer); getChoices(message, min, max, choices, callback); } } diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java index 70a64671966..342edd06a95 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java @@ -173,7 +173,7 @@ public class BoosterDraft implements IBoosterDraft { if (myDrafts.isEmpty()) { SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblNotFoundCustomDraftFiles")); } else { - Collections.sort(myDrafts, Comparator.comparing(DeckBase::getName)); + myDrafts.sort(Comparator.comparing(DeckBase::getName)); final CustomLimited customDraft = SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblChooseCustomDraft"), myDrafts); if (customDraft == null) { diff --git a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java index 6782fbe55b3..99605c80301 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java @@ -134,7 +134,7 @@ public class HostedMatch { } final List sortedPlayers = Lists.newArrayList(players); - Collections.sort(sortedPlayers, (p1, p2) -> { + sortedPlayers.sort((p1, p2) -> { final int v1 = p1.getPlayer() instanceof LobbyPlayerHuman ? 0 : 1; final int v2 = p2.getPlayer() instanceof LobbyPlayerHuman ? 0 : 1; diff --git a/forge-gui/src/main/java/forge/gamemodes/net/client/GameClientHandler.java b/forge-gui/src/main/java/forge/gamemodes/net/client/GameClientHandler.java index 13bf6619fa4..6fa78153927 100644 --- a/forge-gui/src/main/java/forge/gamemodes/net/client/GameClientHandler.java +++ b/forge-gui/src/main/java/forge/gamemodes/net/client/GameClientHandler.java @@ -215,7 +215,7 @@ final class GameClientHandler extends GameProtocolHandler { } final List sortedPlayers = Lists.newArrayList(players); - Collections.sort(sortedPlayers, (p1, p2) -> { + sortedPlayers.sort((p1, 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/gamemodes/quest/BoosterUtils.java b/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java index 088c260c17e..280a4ed7af7 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/BoosterUtils.java @@ -580,8 +580,8 @@ public final class BoosterUtils { public static void sort(List cards) { //sort cards alphabetically so colors appear together and rares appear on top - Collections.sort(cards, Comparator.comparing(PaperCard::getName)); - Collections.sort(cards, Comparator.comparing(c -> c.getRules().getColor())); - Collections.sort(cards, Comparator.comparing(PaperCard::getRarity).reversed()); + cards.sort(Comparator.comparing(PaperCard::getName)); + cards.sort(Comparator.comparing(c -> c.getRules().getColor())); + cards.sort(Comparator.comparing(PaperCard::getRarity).reversed()); } } diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java index 1a05e8c4cd4..0da85c1e14c 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDraft.java @@ -1003,7 +1003,7 @@ public class QuestEventDraft implements IQuestEvent { } final boolean oldSetsFirst = sets.get(0).getDate().before(FModel.getMagicDb().getEditions().get("SOM").getDate()); - Collections.sort(allowedSets, (edition1, edition2) -> { + allowedSets.sort((edition1, edition2) -> { if (edition1.getDate().before(edition2.getDate())) { return oldSetsFirst ? -1 : 1; } else if (edition1.getDate().after(edition2.getDate())) { diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java index 2908b93c801..bd6a62365d3 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestUtilUnlockSets.java @@ -167,7 +167,7 @@ public class QuestUtilUnlockSets { } // sort by distance, then by code desc - Collections.sort(excludedWithDistances, (o1, o2) -> { + excludedWithDistances.sort((o1, o2) -> { long delta = o2.right - o1.right; return delta < 0 ? -1 : delta == 0 ? 0 : 1; }); diff --git a/forge-gui/src/main/java/forge/gamemodes/tournament/system/AbstractTournament.java b/forge-gui/src/main/java/forge/gamemodes/tournament/system/AbstractTournament.java index 64f0f14d4c3..9a12e54cdc2 100644 --- a/forge-gui/src/main/java/forge/gamemodes/tournament/system/AbstractTournament.java +++ b/forge-gui/src/main/java/forge/gamemodes/tournament/system/AbstractTournament.java @@ -107,11 +107,11 @@ public abstract class AbstractTournament implements Serializable { public void sortAllPlayers(String sortType) { if (sortType.equals("score")) { - Collections.sort(allPlayers, (o1, o2) -> o2.getScore() - o1.getScore()); + allPlayers.sort((o1, o2) -> o2.getScore() - o1.getScore()); } else if (sortType.equals("index")) { - Collections.sort(allPlayers, (o1, o2) -> o2.getIndex() - o1.getIndex()); + allPlayers.sort((o1, o2) -> o2.getIndex() - o1.getIndex()); } else if (sortType.equals("swiss")) { - Collections.sort(allPlayers, (o1, o2) -> o2.getSwissScore() - o1.getSwissScore()); + allPlayers.sort((o1, o2) -> o2.getSwissScore() - o1.getSwissScore()); } } diff --git a/forge-gui/src/main/java/forge/gamemodes/tournament/system/TournamentSwiss.java b/forge-gui/src/main/java/forge/gamemodes/tournament/system/TournamentSwiss.java index be141f5e287..3f617912ed2 100644 --- a/forge-gui/src/main/java/forge/gamemodes/tournament/system/TournamentSwiss.java +++ b/forge-gui/src/main/java/forge/gamemodes/tournament/system/TournamentSwiss.java @@ -134,7 +134,7 @@ public class TournamentSwiss extends AbstractTournament { return pairSwissGroup(players); } - Collections.sort(players, Comparator.comparingInt(o -> availableOpponents.get(o).size())); + players.sort(Comparator.comparingInt(o -> availableOpponents.get(o).size())); while (players.size() > 1) { TournamentPlayer initialPlayer = players.get(0); diff --git a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java index 8dbf9576f29..8d118052353 100644 --- a/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java +++ b/forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java @@ -297,7 +297,7 @@ public class AdvancedSearch { List cards = FModel.getMagicDb().getCommonCards().getAllCards(input.getName()); if (cards.size() <= 1) { return true; } - Collections.sort(cards, FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR); + cards.sort(FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR); return cards.get(0) == input; } }), @@ -528,7 +528,7 @@ public class AdvancedSearch { List cards = FModel.getMagicDb().getCommonCards().getAllCards(input.getName()); if (cards.size() <= 1) { return true; } - Collections.sort(cards, FModel.getMagicDb().getEditions().CARD_EDITION_COMPARATOR); + cards.sort(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 7824972e50c..38eb53f9244 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java +++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java @@ -124,7 +124,7 @@ public final class ItemManagerModel { public void refreshSort() { final List> list = getOrderedList(); if (list.isEmpty()) { return; } - try { Collections.sort(list, new MyComparator()); } + try { list.sort(new MyComparator()); } //fix NewDeck editor not loading on Android if a user deleted unwanted sets on edition folder catch (IllegalArgumentException ex) {} } diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index b1df411dc1b..55159ad45f5 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1343,7 +1343,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont // create sorted list from map from least to most frequent List> sortedList = Lists.newArrayList(typesInDeck.entrySet()); - Collections.sort(sortedList, Entry.comparingByValue()); + sortedList.sort(Entry.comparingByValue()); // loop through sorted list and move each type to the front of the // validTypes collection diff --git a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java index cebb9259af1..8a83ae5725e 100644 --- a/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java +++ b/forge-lda/src/main/java/forge/lda/LDAModelGenetrator.java @@ -254,7 +254,7 @@ public final class LDAModelGenetrator { } Comparator archetypeComparator = (o1, o2) -> o2.getDeckCount().compareTo(o1.getDeckCount()); - Collections.sort(unfilteredTopics,archetypeComparator); + unfilteredTopics.sort(archetypeComparator); return unfilteredTopics; } @@ -263,7 +263,7 @@ public final class LDAModelGenetrator { @SuppressWarnings("unchecked") private static Map sortByValue(Map map) { List> list = new LinkedList<>(map.entrySet()); - Collections.sort(list, (Comparator) (o1, o2) -> ((Comparable) ((Map.Entry) (o2)).getValue()).compareTo(((Map.Entry) (o1)).getValue())); + list.sort((Comparator) (o1, o2) -> ((Comparable) ((Map.Entry) (o2)).getValue()).compareTo(((Map.Entry) (o1)).getValue())); Map result = new LinkedHashMap<>(); for (Map.Entry entry : list) {