From 4ecb5e17fa121f58da59b553ed4d90568e83614c Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 17 Jul 2016 18:41:00 +0000 Subject: [PATCH] Fix compile warnings --- .../main/java/forge/ai/ability/ChooseGenericEffectAi.java | 7 ++----- forge-ai/src/main/java/forge/ai/ability/TokenAi.java | 2 -- forge-game/src/main/java/forge/game/Game.java | 1 - .../src/main/java/forge/game/ability/AbilityUtils.java | 1 - forge-game/src/main/java/forge/game/cost/CostPart.java | 2 -- .../main/java/forge/game/trigger/TriggerChangesZone.java | 1 - forge-gui/src/main/java/forge/card/CardDetailUtil.java | 1 - .../src/main/java/forge/limited/LimitedDeckBuilder.java | 1 + forge-gui/src/main/java/forge/match/input/InputAttack.java | 1 - .../java/forge/tournament/system/TournamentPairing.java | 2 -- .../main/java/forge/tournament/system/TournamentSwiss.java | 1 - 11 files changed, 3 insertions(+), 17 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java index f634b3df196..036db485c20 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java @@ -1,13 +1,10 @@ package forge.ai.ability; -import forge.ai.ComputerUtilCombat; import forge.ai.ComputerUtilCost; import forge.ai.SpellAbilityAi; import forge.card.MagicColor; import forge.game.card.Card; import forge.game.card.CardUtil; -import forge.game.combat.Combat; -import forge.game.combat.CombatUtil; import forge.game.cost.Cost; import forge.game.player.Player; import forge.game.spellability.SpellAbility; @@ -105,12 +102,12 @@ public class ChooseGenericEffectAi extends SpellAbilityAi { } return others; } else if ("Fatespinner".equals(logic)) { - SpellAbility skipDraw = null, skipMain = null, skipCombat = null; + SpellAbility skipDraw = null, /*skipMain = null,*/ skipCombat = null; for (final SpellAbility sp : spells) { if (sp.getDescription().equals("FatespinnerSkipDraw")) { skipDraw = sp; } else if (sp.getDescription().equals("FatespinnerSkipMain")) { - skipMain = sp; + //skipMain = sp; } else { skipCombat = sp; } diff --git a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java index 2788f3028a1..960b5e2e688 100644 --- a/forge-ai/src/main/java/forge/ai/ability/TokenAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/TokenAi.java @@ -6,8 +6,6 @@ import java.util.List; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilMana; diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java index 4a63336c59a..702fba2233c 100644 --- a/forge-game/src/main/java/forge/game/Game.java +++ b/forge-game/src/main/java/forge/game/Game.java @@ -37,7 +37,6 @@ import forge.game.card.CardUtil; import forge.game.card.CardView; import forge.game.combat.Combat; import forge.game.cost.Cost; -import forge.game.cost.IndividualCostPaymentInstance; import forge.game.event.Event; import forge.game.event.GameEventGameOutcome; import forge.game.phase.Phase; diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index 13622b34f64..aa02ab951f8 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -511,7 +511,6 @@ public class AbilityUtils { sub = sub.getSubAbility(); } // Count Math - final String[] l = calcX[1].split("/"); final String m = CardFactoryUtil.extractOperators(calcX[1]); return CardFactoryUtil.doXMath(chosenModes, m, card) * multiplier; } diff --git a/forge-game/src/main/java/forge/game/cost/CostPart.java b/forge-game/src/main/java/forge/game/cost/CostPart.java index b498c9a5a45..2da7c8db74d 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPart.java +++ b/forge-game/src/main/java/forge/game/cost/CostPart.java @@ -26,8 +26,6 @@ import forge.game.spellability.SpellAbility; import org.apache.commons.lang3.StringUtils; -import java.util.Comparator; - /** * The Class CostPart. */ diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java index 028af3ea97f..14a915f4b1d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java @@ -20,7 +20,6 @@ package forge.game.trigger; import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardFactoryUtil; -import forge.game.cost.CostPayment; import forge.game.cost.IndividualCostPaymentInstance; import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityStackInstance; diff --git a/forge-gui/src/main/java/forge/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/card/CardDetailUtil.java index dd0f663dba7..bdedcbe11bc 100644 --- a/forge-gui/src/main/java/forge/card/CardDetailUtil.java +++ b/forge-gui/src/main/java/forge/card/CardDetailUtil.java @@ -1,7 +1,6 @@ package forge.card; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; diff --git a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java index 0572880713f..aa458465b40 100644 --- a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java @@ -129,6 +129,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase { * the set to take basic lands from (pass 'null' for random). * @return the new Deck. */ + @SuppressWarnings("unused") public Deck buildDeck(final String landSetCode) { // 1. Prepare hasColor = Predicates.or(new MatchColorIdentity(colors), COLORLESS_CARDS); diff --git a/forge-gui/src/main/java/forge/match/input/InputAttack.java b/forge-gui/src/main/java/forge/match/input/InputAttack.java index 3eca332b93d..ae482f05cc0 100644 --- a/forge-gui/src/main/java/forge/match/input/InputAttack.java +++ b/forge-gui/src/main/java/forge/match/input/InputAttack.java @@ -17,7 +17,6 @@ */ package forge.match.input; -import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import forge.events.UiEventAttackerDeclared; import forge.game.GameEntity; diff --git a/forge-gui/src/main/java/forge/tournament/system/TournamentPairing.java b/forge-gui/src/main/java/forge/tournament/system/TournamentPairing.java index f1e774803dc..46183c2ab15 100644 --- a/forge-gui/src/main/java/forge/tournament/system/TournamentPairing.java +++ b/forge-gui/src/main/java/forge/tournament/system/TournamentPairing.java @@ -5,9 +5,7 @@ import forge.LobbyPlayer; import forge.game.GameOutcome; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; public class TournamentPairing { private int round; 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 9ca4e506219..0a6b4789aed 100644 --- a/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java +++ b/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java @@ -2,7 +2,6 @@ package forge.tournament.system; import com.google.common.collect.Lists; -import java.lang.reflect.Array; import java.util.*; @SuppressWarnings("serial")