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

Guava migration - Fix lingering build errors

Browse Source
This commit is contained in:
Jetz
2024-09-02 19:51:21 -04:00
parent 055dff71ce
commit 16c0fa1095
10 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java
View File

@@ -16,7 +16,6 @@ import forge.model.FModel;
import forge.screens.home.quest.DialogChooseFormats;
import forge.screens.home.quest.DialogChooseSets;
import forge.screens.match.controllers.CDetailPicture;
import forge.util.CollectionSuppliers;
import forge.util.Iterables;
import forge.util.Localizer;
@@ -56,7 +55,7 @@ public class CardManager extends ItemManager<PaperCard> {
@Override
protected Iterable<Entry<PaperCard, Integer>> getUnique(Iterable<Entry<PaperCard, Integer>> items) {
ListMultimap<String, Entry<PaperCard, Integer>> entriesByName = Multimaps.newListMultimap(
new TreeMap<>(String.CASE_INSENSITIVE_ORDER), CollectionSuppliers.arrayLists());
new TreeMap<>(String.CASE_INSENSITIVE_ORDER), Lists::newArrayList);
for (Entry<PaperCard, Integer> item : items) {
final String cardName = item.getKey().getName();
entriesByName.put(cardName, item);
@@ -67,7 +66,7 @@ public class CardManager extends ItemManager<PaperCard> {
for (String cardName : entriesByName.keySet()) {
List<Entry<PaperCard, Integer>> entries = entriesByName.get(cardName);
ListMultimap<CardEdition, Entry<PaperCard, Integer>> entriesByEdition = Multimaps.newListMultimap(new HashMap<>(), CollectionSuppliers.arrayLists());
ListMultimap<CardEdition, Entry<PaperCard, Integer>> entriesByEdition = Multimaps.newListMultimap(new HashMap<>(), Lists::newArrayList);
for (Entry<PaperCard, Integer> entry : entries) {
CardEdition ed = StaticData.instance().getCardEdition(entry.getKey().getEdition());
if (ed != null)

2
forge-gui-desktop/src/main/java/forge/itemmanager/filters/StatTypeFilter.java
View File

@@ -59,7 +59,7 @@ public abstract class StatTypeFilter<T extends InventoryItem> extends ToggleButt
protected <U extends InventoryItem> boolean showUnsupportedItem(U item) {
FLabel btnPackOrDeck = buttonMap.get(StatTypes.PACK_OR_DECK); //support special pack/deck case
if (btnPackOrDeck != null && btnPackOrDeck.isSelected()) {
return ItemPredicate.Presets.IS_PACK_OR_DECK.apply(item);
return ItemPredicate.Presets.IS_PACK_OR_DECK.test(item);
}
return false;
}

2
forge-gui-desktop/src/test/java/forge/card/LegacyCardDb.java
View File

@@ -25,7 +25,7 @@ import forge.item.PaperCard;
public class LegacyCardDb {
public CardEdition.Collection editions;
public ListMultimap<String, PaperCard> allCardsByName = Multimaps
.newListMultimap(new TreeMap<>(String.CASE_INSENSITIVE_ORDER), CollectionSuppliers.arrayLists());
.newListMultimap(new TreeMap<>(String.CASE_INSENSITIVE_ORDER), Lists::newArrayList);
public enum LegacySetPreference {
Latest(false), LatestCoreExp(true), Earliest(false), EarliestCoreExp(true), Random(false);