external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Initial migration

Browse Source
This commit is contained in:
Anthony Calosa
2019-09-05 08:24:58 +08:00
parent 5876ee8220
commit 2b0e47dd14
28 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/itemmanager/AdvancedSearch.java
View File

@@ -209,7 +209,7 @@ public class AdvancedSearch {
List<PaperCard> 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;
}
}),

3
forge-gui/src/main/java/forge/itemmanager/ItemManagerModel.java
View File

@@ -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<T extends InventoryItem> {
public void refreshSort() {
if (getOrderedList().isEmpty()) { return; }
Collections.sort(getOrderedList(), new MyComparator());
getOrderedList().sort(new MyComparator());
}
//Manages sorting orders for multiple depths of sorting

3
forge-gui/src/main/java/forge/itemmanager/SItemManagerUtil.java
View File

@@ -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<InventoryItem, Integer> itemEntry : items) {
sorted.add(itemEntry);
}
Collections.sort(sorted, new Comparator<Entry<InventoryItem, Integer>>() {
sorted.sort(new Comparator<Entry<InventoryItem, Integer>>() {
@Override
public int compare(final Entry<InventoryItem, Integer> x, final Entry<InventoryItem, Integer> y) {
return x.getKey().toString().compareTo(y.getKey().toString());

2
forge-gui/src/main/java/forge/limited/BoosterDraft.java
View File

@@ -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<CustomLimited>() {
myDrafts.sort(new Comparator<CustomLimited>() {
@Override
public int compare(CustomLimited o1, CustomLimited o2) {
return o1.getName().compareTo(o2.getName());

2
forge-gui/src/main/java/forge/limited/CardRanker.java
View File

@@ -171,7 +171,7 @@ public class CardRanker {
}
private static List<PaperCard> sortAndCreateList(List<Pair<Double, PaperCard>> cardScores) {
Collections.sort(cardScores, Collections.reverseOrder(new CardRankingComparator()));
cardScores.sort(Collections.reverseOrder(new CardRankingComparator()));
List<PaperCard> rankedCards = new ArrayList<>(cardScores.size());
for (Pair<Double, PaperCard> pair : cardScores) {

6
forge-gui/src/main/java/forge/match/HostedMatch.java
View File

@@ -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<RegisteredPlayer> sortedPlayers = Lists.newArrayList(players);
Collections.sort(sortedPlayers, new Comparator<RegisteredPlayer>() {
@Override public final int compare(final RegisteredPlayer p1, final RegisteredPlayer p2) {
sortedPlayers.sort(new Comparator<RegisteredPlayer>() {
@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);

2
forge-gui/src/main/java/forge/net/client/GameClientHandler.java
View File

@@ -206,7 +206,7 @@ final class GameClientHandler extends GameProtocolHandler<IGuiGame> {
}
final List<RegisteredPlayer> sortedPlayers = Lists.newArrayList(players);
Collections.sort(sortedPlayers, new Comparator<RegisteredPlayer>() {
sortedPlayers.sort(new Comparator<RegisteredPlayer>() {
@Override
public final int compare(final RegisteredPlayer p1, final RegisteredPlayer p2) {
final int v1 = p1.getPlayer() instanceof LobbyPlayerHuman ? 0 : 1;

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1147,7 +1147,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
// create sorted list from map from least to most frequent
List<Entry<String, Integer>> sortedList = Lists.newArrayList(typesInDeck.entrySet());
Collections.sort(sortedList, new Comparator<Entry<String, Integer>>() {
sortedList.sort(new Comparator<Entry<String, Integer>>() {
public int compare(Entry<String, Integer> o1, Entry<String, Integer> o2) {
return o1.getValue().compareTo(o2.getValue());
}

6
forge-gui/src/main/java/forge/quest/BoosterUtils.java
View File

@@ -551,19 +551,19 @@ public final class BoosterUtils {
public static void sort(List<PaperCard> cards) {
//sort cards alphabetically so colors appear together and rares appear on top
Collections.sort(cards, new Comparator<PaperCard>() {
cards.sort(new Comparator<PaperCard>() {
@Override
public int compare(PaperCard c1, PaperCard c2) {
return c1.getName().compareTo(c2.getName());
}
});
Collections.sort(cards, new Comparator<PaperCard>() {
cards.sort(new Comparator<PaperCard>() {
@Override
public int compare(PaperCard c1, PaperCard c2) {
return c1.getRules().getColor().compareTo(c2.getRules().getColor());
}
});
Collections.sort(cards, new Comparator<PaperCard>() {
cards.sort(new Comparator<PaperCard>() {
@Override
public int compare(PaperCard c1, PaperCard c2) {
return c2.getRarity().compareTo(c1.getRarity());

2
forge-gui/src/main/java/forge/quest/QuestEventDraft.java
View File

@@ -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<CardEdition>() {
allowedSets.sort(new Comparator<CardEdition>() {
@Override
public int compare(final CardEdition edition1, final CardEdition edition2) {
if (edition1.getDate().before(edition2.getDate())) {

2
forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java
View File

@@ -168,7 +168,7 @@ public class QuestUtilUnlockSets {
}
// sort by distance, then by code desc
Collections.sort(excludedWithDistances, new Comparator<ImmutablePair<CardEdition, Long>>() {
excludedWithDistances.sort(new Comparator<ImmutablePair<CardEdition, Long>>() {
@Override
public int compare(ImmutablePair<CardEdition, Long> o1, ImmutablePair<CardEdition, Long> o2) {
long delta = o2.right - o1.right;

6
forge-gui/src/main/java/forge/tournament/system/AbstractTournament.java
View File

@@ -109,21 +109,21 @@ public abstract class AbstractTournament implements Serializable {
public void sortAllPlayers(String sortType) {
if (sortType.equals("score")) {
Collections.sort(allPlayers, new Comparator<TournamentPlayer>() {
allPlayers.sort(new Comparator<TournamentPlayer>() {
@Override
public int compare(TournamentPlayer o1, TournamentPlayer o2) {
return o2.getScore() - o1.getScore();
}
});
} else if (sortType.equals("index")) {
Collections.sort(allPlayers, new Comparator<TournamentPlayer>() {
allPlayers.sort(new Comparator<TournamentPlayer>() {
@Override
public int compare(TournamentPlayer o1, TournamentPlayer o2) {
return o2.getIndex() - o1.getIndex();
}
});
} else if (sortType.equals("swiss")) {
Collections.sort(allPlayers, new Comparator<TournamentPlayer>() {
allPlayers.sort(new Comparator<TournamentPlayer>() {
@Override
public int compare(TournamentPlayer o1, TournamentPlayer o2) {
return o2.getSwissScore() - o1.getSwissScore();

2
forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java
View File

@@ -129,7 +129,7 @@ public class TournamentSwiss extends AbstractTournament {
return pairSwissGroup(players);
}
Collections.sort(players, new Comparator<TournamentPlayer>() {
players.sort(new Comparator<TournamentPlayer>() {
@Override
public int compare(TournamentPlayer o1, TournamentPlayer o2) {
return availableOpponents.get(o1).size() - availableOpponents.get(o2).size();