From 07437b7880f3bffa9fa3f26ed62e1df7bd591cd1 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 13 Aug 2017 00:40:48 +0000 Subject: [PATCH] Clean up unused imports that popped up in eclipse warnings List --- .../java/forge/ai/ability/DamageEachAi.java | 4 ---- .../ai/simulation/GameStateEvaluator.java | 1 - .../java/forge/card/BoosterGenerator.java | 2 ++ .../main/java/forge/game/GameActionUtil.java | 2 ++ .../game/ability/effects/AttachEffect.java | 2 -- .../game/ability/effects/BranchEffect.java | 2 -- .../forge/gui/framework/SDisplayUtil.java | 1 - .../home/puzzle/CSubmenuPuzzleSolve.java | 4 +++- .../src/forge/assets/ImageLoader.java | 4 ---- .../forge/limited/CardThemedDeckBuilder.java | 20 ++++++++++++------- .../java/forge/player/HumanCostDecision.java | 2 -- 11 files changed, 20 insertions(+), 24 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageEachAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageEachAi.java index f2f14bc67c9..1ede2d10de1 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DamageEachAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DamageEachAi.java @@ -3,10 +3,6 @@ package forge.ai.ability; import forge.ai.SpecialCardAi; import forge.game.ability.AbilityUtils; -import forge.game.card.Card; -import forge.game.card.CardCollection; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; import forge.game.player.Player; import forge.game.player.PlayerCollection; import forge.game.player.PlayerPredicates; diff --git a/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java b/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java index 31226a189ac..078eae157fc 100644 --- a/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java +++ b/forge-ai/src/main/java/forge/ai/simulation/GameStateEvaluator.java @@ -4,7 +4,6 @@ import forge.ai.CreatureEvaluator; import forge.game.Game; import forge.game.card.Card; import forge.game.card.CounterType; -import forge.game.combat.Combat; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.zone.ZoneType; diff --git a/forge-core/src/main/java/forge/card/BoosterGenerator.java b/forge-core/src/main/java/forge/card/BoosterGenerator.java index 19270ca842f..795b2718c56 100644 --- a/forge-core/src/main/java/forge/card/BoosterGenerator.java +++ b/forge-core/src/main/java/forge/card/BoosterGenerator.java @@ -195,6 +195,8 @@ public class BoosterGenerator { foilSlot = BoosterSlots.SPECIAL; } break; + default: + break; } } diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java index 4cf4876c1c5..a5e0c8e783d 100644 --- a/forge-game/src/main/java/forge/game/GameActionUtil.java +++ b/forge-game/src/main/java/forge/game/GameActionUtil.java @@ -285,6 +285,8 @@ public final class GameActionUtil { case Retrace: result.getRestrictions().setZone(ZoneType.Graveyard); break; + default: + break; } } return result; diff --git a/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java index 9aaee3a398c..2576a8e227e 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java @@ -19,8 +19,6 @@ import forge.util.Lang; import java.util.List; -import com.google.common.collect.Iterables; - public class AttachEffect extends SpellAbilityEffect { @Override public void resolve(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/BranchEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BranchEffect.java index ae86e0f5458..2cc32e40ee9 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/BranchEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/BranchEffect.java @@ -8,8 +8,6 @@ import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; import forge.util.Expressions; -import java.util.List; - public class BranchEffect extends SpellAbilityEffect { @Override public void resolve(SpellAbility sa) { diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SDisplayUtil.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SDisplayUtil.java index 726ff7a84d3..4455ab6033d 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/framework/SDisplayUtil.java +++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SDisplayUtil.java @@ -18,7 +18,6 @@ import javax.swing.JPanel; import javax.swing.SwingUtilities; import forge.FThreads; -import forge.toolbox.FButton; import forge.view.FFrame; /** diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java index a6d1b28976b..d5e71555d41 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/puzzle/CSubmenuPuzzleSolve.java @@ -44,7 +44,9 @@ public enum CSubmenuPuzzleSolve implements ICDoc, IMenuProvider { } private final UiCommand cmdStart = new UiCommand() { - @Override public void run() { + private static final long serialVersionUID = -367368436333443417L; + + @Override public void run() { startPuzzleSolve(); } }; diff --git a/forge-gui-mobile/src/forge/assets/ImageLoader.java b/forge-gui-mobile/src/forge/assets/ImageLoader.java index 30ac24cd744..b2f656393c0 100644 --- a/forge-gui-mobile/src/forge/assets/ImageLoader.java +++ b/forge-gui-mobile/src/forge/assets/ImageLoader.java @@ -2,13 +2,9 @@ package forge.assets; import java.io.File; -import com.badlogic.gdx.Gdx; import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.utils.BufferUtils; import com.google.common.cache.CacheLoader; -import java.nio.FloatBuffer; import forge.Forge; import forge.ImageKeys; diff --git a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java index 5bc3ac31676..10306a8f820 100644 --- a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java @@ -1,10 +1,22 @@ package forge.limited; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.card.*; + +import forge.card.CardEdition; +import forge.card.CardRules; +import forge.card.CardRulesPredicates; +import forge.card.ColorSet; +import forge.card.MagicColor; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; import forge.deck.CardPool; @@ -14,16 +26,10 @@ import forge.deck.DeckSection; import forge.deck.generation.DeckGenPool; import forge.deck.generation.DeckGeneratorBase; import forge.game.GameFormat; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; import forge.item.IPaperCard; import forge.item.PaperCard; import forge.model.FModel; import forge.util.MyRandom; -import forge.util.PredicateString; - -import java.awt.print.Paper; -import java.util.*; /** * Limited format deck. diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index e94c8c20b1f..b998e035138 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -11,8 +11,6 @@ import java.util.Map.Entry; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import forge.GuiBase; - import forge.card.CardType; import forge.game.Game; import forge.game.GameEntity;