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

Guava migration - Inline Iterables.isEmpty (Collection overload)

Browse Source
This commit is contained in:
Jetz
2024-09-06 19:55:57 -04:00
parent 4c8a94b18a
commit efe55efa43
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ability/UntapAi.java
View File

@@ -21,8 +21,8 @@ import forge.game.player.PlayerCollection;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.spellability.TargetRestrictions; import forge.game.spellability.TargetRestrictions;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.Iterables;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -319,7 +319,7 @@ public class UntapAi extends SpellAbilityAi {
@Override @Override
public Card chooseSingleCard(Player ai, SpellAbility sa, Iterable<Card> list, boolean isOptional, Player targetedPlayer, Map<String, Object> params) { public Card chooseSingleCard(Player ai, SpellAbility sa, Iterable<Card> list, boolean isOptional, Player targetedPlayer, Map<String, Object> params) {
CardCollection pref = CardLists.filterControlledBy(list, ai.getYourTeam()); CardCollection pref = CardLists.filterControlledBy(list, ai.getYourTeam());
if (Iterables.isEmpty(pref)) { if (pref.isEmpty()) {
if (isOptional) { if (isOptional) {
return null; return null;
} }

3
forge-core/src/main/java/forge/util/Iterables.java
View File

@@ -113,9 +113,6 @@ public class Iterables {
public static <T> T getLast(List<? extends T> iterable, T defaultValue) { public static <T> T getLast(List<? extends T> iterable, T defaultValue) {
return iterable.isEmpty() ? defaultValue : iterable.get(iterable.size() - 1); return iterable.isEmpty() ? defaultValue : iterable.get(iterable.size() - 1);
} }
public static boolean isEmpty(Collection<?> iterable) {
return iterable.isEmpty();
}
//TODO: Restore everything below //TODO: Restore everything below
public static <T> Iterable<T> unmodifiableIterable(final Iterable<? extends T> iterable) { public static <T> Iterable<T> unmodifiableIterable(final Iterable<? extends T> iterable) {

3
forge-game/src/main/java/forge/game/event/GameEventPlayerStatsChanged.java
View File

@@ -4,7 +4,6 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import forge.game.player.Player; import forge.game.player.Player;
import forge.util.Iterables;
import forge.util.Lang; import forge.util.Lang;
import forge.util.TextUtil; import forge.util.TextUtil;
@@ -36,7 +35,7 @@ public class GameEventPlayerStatsChanged extends GameEvent {
@Override @Override
public String toString() { public String toString() {
if (null == players || Iterables.isEmpty(players)) { if (null == players || players.isEmpty()) {
return "Player state changes: (empty list)"; return "Player state changes: (empty list)";
} }
return TextUtil.concatWithSpace("Player state changes:", Lang.joinHomogenous(players)); return TextUtil.concatWithSpace("Player state changes:", Lang.joinHomogenous(players));

3
forge-gui-mobile/src/forge/screens/match/MatchController.java
View File

@@ -12,7 +12,6 @@ import forge.ai.GameState;
import forge.deck.Deck; import forge.deck.Deck;
import forge.game.player.Player; import forge.game.player.Player;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.util.Iterables;
import forge.util.collect.FCollection; import forge.util.collect.FCollection;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -680,7 +679,7 @@ public class MatchController extends AbstractGuiGame {
@Override @Override
public GameEntityView chooseSingleEntityForEffect(final String title, final List<? extends GameEntityView> optionList, final DelayedReveal delayedReveal, final boolean isOptional) { public GameEntityView chooseSingleEntityForEffect(final String title, final List<? extends GameEntityView> optionList, final DelayedReveal delayedReveal, final boolean isOptional) {
if (delayedReveal == null || Iterables.isEmpty(delayedReveal.getCards())) { if (delayedReveal == null || delayedReveal.getCards().isEmpty()) {
if (isOptional) { if (isOptional) {
return SGuiChoose.oneOrNone(title, optionList); return SGuiChoose.oneOrNone(title, optionList);
} }