diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java index b484f31ab98..5f1d8518634 100644 --- a/forge-core/src/main/java/forge/deck/CardPool.java +++ b/forge-core/src/main/java/forge/deck/CardPool.java @@ -27,7 +27,6 @@ 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; @@ -198,7 +197,7 @@ public class CardPool extends ItemPool { public String toCardList(String separator) { List> main2sort = Lists.newArrayList(this); - Collections.sort(main2sort, ItemPoolSorter.BY_NAME_THEN_SET); + main2sort.sort(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 3dee5c15371..34f461432d8 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, new Comparator() { + result.sort(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 1a48f019d25..02b0368fa97 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; } - 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 ac523f54560..7e8fef286fd 100644 --- a/forge-core/src/main/java/forge/util/collect/FCollection.java +++ b/forge-core/src/main/java/forge/util/collect/FCollection.java @@ -518,7 +518,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 de1e68f9ae5..d793eded1a3 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())); } - Collections.sort(entries, new Comparator>() { + entries.sort(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 c7dc42ba265..bfa7320e7ef 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,7 +35,6 @@ 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; @@ -165,8 +164,9 @@ public final class ItemListView extends ItemView { columns.add(colOverrides.get(colConfig.getDef())); } } - Collections.sort(columns, new Comparator() { - @Override public int compare(final ItemTableColumn arg0, final ItemTableColumn arg1) { + columns.sort(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 588cf960802..e496a04cfcb 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,7 +4,6 @@ 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; @@ -47,7 +46,7 @@ public class ContestGauntletLister extends JPanel { final List tempRows = new ArrayList(); final List sorted = new ArrayList(); for (final GauntletData gd : gd0) { sorted.add(gd); } - Collections.sort(sorted, new Comparator() { + sorted.sort(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 b0e9d04cfdb..3f02a3062f6 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,7 +4,6 @@ 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; @@ -66,7 +65,7 @@ public class QuickGauntletLister extends JPanel { final List tempRows = new ArrayList(); final List sorted = new ArrayList(); for (final GauntletData gd : gauntlets) { sorted.add(gd); } - Collections.sort(sorted, new Comparator() { + sorted.sort(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 e6224e3b574..0edfa537401 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(); for (QuestData qd : qd0) { sorted.add(qd); } - Collections.sort(sorted, new Comparator() { + sorted.sort(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 94ae1473e17..ff866a62f17 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,7 +19,6 @@ 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; @@ -127,7 +126,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 4daa745c651..c8110863cb7 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())); } } - Collections.sort(cols, new Comparator() { + cols.sort(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 fd123f87f1f..5df4b89ef06 100644 --- a/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java +++ b/forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java @@ -3,7 +3,6 @@ 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; @@ -299,7 +298,7 @@ public class LoadGauntletScreen extends LaunchScreen { for (GauntletData gauntlet : gauntlets) { sorted.add(gauntlet); } - Collections.sort(sorted, new Comparator() { + sorted.sort(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 581d7e47504..39cc1d31d07 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -2,7 +2,6 @@ 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; @@ -337,7 +336,7 @@ public class LoadConquestScreen extends LaunchScreen { for (ConquestData qd : qd0) { sorted.add(qd); } - Collections.sort(sorted, new Comparator() { + sorted.sort(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 c17ba142e31..c80e1787702 100644 --- a/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java +++ b/forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java @@ -4,7 +4,6 @@ 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; @@ -339,7 +338,7 @@ public class LoadQuestScreen extends LaunchScreen { for (QuestData qd : qd0) { sorted.add(qd); } - Collections.sort(sorted, new Comparator() { + sorted.sort(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 0b369d8fe4c..0e6b5a0667d 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 - Collections.sort(choices, comparer); + choices.sort(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 d02c5e76c97..d9fd40b25c5 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; } - 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 4969909ac9d..31c8dc92d7a 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java +++ b/forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java @@ -18,7 +18,6 @@ package forge.itemmanager; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -126,7 +125,7 @@ public final class ItemManagerModel { public void refreshSort() { if (getOrderedList().isEmpty()) { return; } - Collections.sort(getOrderedList(), new MyComparator()); + getOrderedList().sort(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 78a6a894b06..1fb55a4f7b7 100644 --- a/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java +++ b/forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java @@ -12,7 +12,6 @@ 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; @@ -147,7 +146,7 @@ public final class SItemManagerUtil { for (final Entry itemEntry : items) { sorted.add(itemEntry); } - Collections.sort(sorted, new Comparator>() { + sorted.sort(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 09d22dca69e..f3f58037b5b 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 { - Collections.sort(myDrafts, new Comparator() { + myDrafts.sort(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 295acb7c1e9..4fa6b84d7ee 100644 --- a/forge-gui/src/main/java/forge/limited/CardRanker.java +++ b/forge-gui/src/main/java/forge/limited/CardRanker.java @@ -171,7 +171,7 @@ public class CardRanker { } private static List sortAndCreateList(List> cardScores) { - Collections.sort(cardScores, Collections.reverseOrder(new CardRankingComparator())); + cardScores.sort(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 34919b479c2..bfcb5ad06c7 100644 --- a/forge-gui/src/main/java/forge/match/HostedMatch.java +++ b/forge-gui/src/main/java/forge/match/HostedMatch.java @@ -1,7 +1,6 @@ package forge.match; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; @@ -109,8 +108,9 @@ public class HostedMatch { } final List sortedPlayers = Lists.newArrayList(players); - Collections.sort(sortedPlayers, new Comparator() { - @Override public final int compare(final RegisteredPlayer p1, final RegisteredPlayer p2) { + sortedPlayers.sort(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 30d977378a1..60eebcaabfc 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); - Collections.sort(sortedPlayers, new Comparator() { + sortedPlayers.sort(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 16bf87f71b2..b3afc07f7df 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1147,7 +1147,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, new Comparator>() { + sortedList.sort(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 84d6cb768bd..43fe9083c46 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 - Collections.sort(cards, new Comparator() { + cards.sort(new Comparator() { @Override public int compare(PaperCard c1, PaperCard c2) { return c1.getName().compareTo(c2.getName()); } }); - Collections.sort(cards, new Comparator() { + cards.sort(new Comparator() { @Override public int compare(PaperCard c1, PaperCard c2) { return c1.getRules().getColor().compareTo(c2.getRules().getColor()); } }); - Collections.sort(cards, new Comparator() { + cards.sort(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 a846ce2feda..460bb8a4a5e 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()); - Collections.sort(allowedSets, new Comparator() { + allowedSets.sort(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 3e6a5d0fe29..598afcbb667 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 - Collections.sort(excludedWithDistances, new Comparator>() { + excludedWithDistances.sort(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 e658f3cac29..b70a9b526da 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")) { - Collections.sort(allPlayers, new Comparator() { + allPlayers.sort(new Comparator() { @Override public int compare(TournamentPlayer o1, TournamentPlayer o2) { return o2.getScore() - o1.getScore(); } }); } else if (sortType.equals("index")) { - Collections.sort(allPlayers, new Comparator() { + allPlayers.sort(new Comparator() { @Override public int compare(TournamentPlayer o1, TournamentPlayer o2) { return o2.getIndex() - o1.getIndex(); } }); } else if (sortType.equals("swiss")) { - Collections.sort(allPlayers, new Comparator() { + allPlayers.sort(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 31c9ae300ff..1a7df43b495 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); } - Collections.sort(players, new Comparator() { + players.sort(new Comparator() { @Override public int compare(TournamentPlayer o1, TournamentPlayer o2) { return availableOpponents.get(o1).size() - availableOpponents.get(o2).size();