From 0c1a7d5ae835b347ed69e39a7704facf6a7e6fb3 Mon Sep 17 00:00:00 2001 From: lodici Date: Sat, 8 Apr 2017 08:26:41 +0100 Subject: [PATCH] remove unused import statements and sort. --- src/magic/ai/MTDF.java | 12 ++++------ src/magic/model/MagicLogBook.java | 4 +--- src/magic/model/action/BecomesAction.java | 2 -- src/magic/model/action/CastCardAction.java | 6 +---- .../model/action/DequeueTriggerAction.java | 1 - src/magic/model/action/DiscardCardAction.java | 1 - src/magic/model/action/EnterAsCopyAction.java | 8 +++---- src/magic/model/action/PlayCardAction.java | 12 ++++------ .../model/action/PlayCardFromStackAction.java | 10 ++++---- src/magic/model/action/PlayTokenAction.java | 16 ++++++------- .../action/PutStateTriggerOnStackAction.java | 1 - .../action/ShuffleCardsIntoLibraryAction.java | 12 ++++------ .../model/choice/MagicMulliganChoice.java | 17 ++++--------- .../model/choice/MagicSimpleMayChoice.java | 9 ++++--- .../condition/MagicArtificialCondition.java | 3 +-- .../model/event/MagicActivationHints.java | 3 --- src/magic/model/event/MagicAwakenEvent.java | 18 +++++++------- src/magic/model/event/MagicBolsterEvent.java | 2 -- src/magic/model/event/MagicCrewCostEvent.java | 2 -- .../model/event/MagicCyclingActivation.java | 10 ++++---- .../model/event/MagicDashActivation.java | 6 ++--- .../model/event/MagicEmergeCostEvent.java | 5 ++-- .../model/event/MagicFlashbackActivation.java | 6 ++--- .../model/event/MagicHandCastActivation.java | 16 ++++++------- src/magic/model/event/MagicMulliganEvent.java | 3 +-- .../model/event/MagicPutCounterEvent.java | 1 - .../event/MagicPutOntoBattlefieldEvent.java | 8 +++---- .../model/event/MagicRedirectDamageEvent.java | 1 - .../MagicSearchOntoBattlefieldEvent.java | 24 +++++++++---------- .../event/MagicSearchToLocationEvent.java | 5 ++-- .../model/event/MagicSurgeActivation.java | 15 ++++-------- .../model/event/MagicSuspendActivation.java | 7 +----- .../event/MagicTypeCyclingActivation.java | 10 +------- .../model/event/MagicUnearthActivation.java | 7 ++---- src/magic/model/mstatic/MagicCDA.java | 7 ++---- src/magic/model/phase/MagicCleanupPhase.java | 2 -- .../model/phase/MagicEndOfTurnPhase.java | 2 -- src/magic/model/phase/MagicUntapPhase.java | 1 - .../model/target/MagicCMCCardFilter.java | 1 - .../model/target/MagicCardFilterImpl.java | 18 +++++++------- src/magic/model/target/MagicTargetFilter.java | 4 +--- src/magic/model/trigger/ChampionTrigger.java | 3 +-- src/magic/model/trigger/DevourTrigger.java | 1 - src/magic/model/trigger/FlankingTrigger.java | 1 - .../model/trigger/LivingWeaponTrigger.java | 1 - src/magic/model/trigger/MadnessTrigger.java | 6 ++--- src/magic/model/trigger/SacrificeTrigger.java | 3 +-- src/magic/model/trigger/ThisDiesTrigger.java | 3 +-- .../model/trigger/WhenTransformsTrigger.java | 1 - src/magic/test/TestAnafenza.java | 3 +-- src/magic/test/TestAwaken.java | 3 +-- src/magic/test/TestCardBuilder.java | 21 +++++++--------- src/magic/test/TestColfenorsUrn.java | 3 +-- src/magic/test/TestCostIncrease.java | 5 +--- src/magic/test/TestCostReduction.java | 4 +--- src/magic/test/TestEmerge.java | 4 +--- src/magic/test/TestIssue760.java | 3 +-- src/magic/test/TestManaCrash.java | 4 +--- src/magic/test/TestRedundantWasteland.java | 3 +-- src/magic/test/TestSlowLog.java | 3 +-- src/magic/test/TestSurge.java | 4 +--- src/magic/test/TestUlrich.java | 3 +-- .../widget/card/filter/CardFilterPanel.java | 5 ++-- 63 files changed, 127 insertions(+), 258 deletions(-) diff --git a/src/magic/ai/MTDF.java b/src/magic/ai/MTDF.java index af02273079..7deb7280b3 100644 --- a/src/magic/ai/MTDF.java +++ b/src/magic/ai/MTDF.java @@ -1,15 +1,13 @@ package magic.ai; -import magic.model.MagicGame; -import magic.model.event.MagicEvent; -import magic.model.MagicPlayer; -import magic.model.MagicGameLog; -import magic.exception.GameException; - import java.util.Collections; -import java.util.Map; import java.util.HashMap; import java.util.List; +import java.util.Map; +import magic.model.MagicGame; +import magic.model.MagicGameLog; +import magic.model.MagicPlayer; +import magic.model.event.MagicEvent; /* * MTD(f) algorithm by Aske Plaat diff --git a/src/magic/model/MagicLogBook.java b/src/magic/model/MagicLogBook.java index ef25f5a3d8..fb170f431a 100644 --- a/src/magic/model/MagicLogBook.java +++ b/src/magic/model/MagicLogBook.java @@ -1,11 +1,9 @@ package magic.model; -import magic.utility.MagicSystem; - import java.util.ArrayList; import java.util.List; -import java.util.Iterator; import java.util.ListIterator; +import magic.utility.MagicSystem; public class MagicLogBook { diff --git a/src/magic/model/action/BecomesAction.java b/src/magic/model/action/BecomesAction.java index 185dd62bed..7f11987295 100644 --- a/src/magic/model/action/BecomesAction.java +++ b/src/magic/model/action/BecomesAction.java @@ -1,9 +1,7 @@ package magic.model.action; -import java.util.ArrayList; import java.util.Collections; import java.util.Set; - import magic.model.MagicAbilityList; import magic.model.MagicColor; import magic.model.MagicGame; diff --git a/src/magic/model/action/CastCardAction.java b/src/magic/model/action/CastCardAction.java index 1a31064ff7..a4959968dc 100644 --- a/src/magic/model/action/CastCardAction.java +++ b/src/magic/model/action/CastCardAction.java @@ -1,13 +1,9 @@ package magic.model.action; import magic.model.MagicCard; -import magic.model.MagicCardDefinition; import magic.model.MagicGame; -import magic.model.MagicObject; -import magic.model.MagicPayedCost; -import magic.model.MagicPlayer; import magic.model.MagicLocationType; -import magic.model.stack.MagicCardOnStack; +import magic.model.MagicPlayer; import magic.model.event.MagicEvent; import magic.model.event.MagicPutCardOnStackEvent; diff --git a/src/magic/model/action/DequeueTriggerAction.java b/src/magic/model/action/DequeueTriggerAction.java index 2ea42809ee..65d25f3da6 100644 --- a/src/magic/model/action/DequeueTriggerAction.java +++ b/src/magic/model/action/DequeueTriggerAction.java @@ -1,7 +1,6 @@ package magic.model.action; import magic.model.MagicGame; -import magic.model.event.MagicEvent; import magic.model.stack.MagicItemOnStack; public class DequeueTriggerAction extends MagicAction { diff --git a/src/magic/model/action/DiscardCardAction.java b/src/magic/model/action/DiscardCardAction.java index c0ff1f38c2..20f8defd67 100644 --- a/src/magic/model/action/DiscardCardAction.java +++ b/src/magic/model/action/DiscardCardAction.java @@ -1,6 +1,5 @@ package magic.model.action; -import magic.ai.ArtificialScoringSystem; import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicLocationType; diff --git a/src/magic/model/action/EnterAsCopyAction.java b/src/magic/model/action/EnterAsCopyAction.java index 74c9fb3e11..995e534a11 100644 --- a/src/magic/model/action/EnterAsCopyAction.java +++ b/src/magic/model/action/EnterAsCopyAction.java @@ -1,15 +1,13 @@ package magic.model.action; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicObject; import magic.model.stack.MagicCardOnStack; -import java.util.Collections; -import java.util.Arrays; -import java.util.List; -import java.util.LinkedList; - public class EnterAsCopyAction extends MagicAction { private final MagicCardOnStack cardOnStack; diff --git a/src/magic/model/action/PlayCardAction.java b/src/magic/model/action/PlayCardAction.java index ff053bb340..54c723d685 100644 --- a/src/magic/model/action/PlayCardAction.java +++ b/src/magic/model/action/PlayCardAction.java @@ -1,15 +1,13 @@ package magic.model.action; -import magic.model.MagicCard; -import magic.model.MagicGame; -import magic.model.MagicPermanent; -import magic.model.MagicPlayer; -import magic.model.MagicPayedCost; -import magic.model.stack.MagicCardOnStack; - import java.util.Arrays; import java.util.Collections; import java.util.List; +import magic.model.MagicCard; +import magic.model.MagicGame; +import magic.model.MagicPayedCost; +import magic.model.MagicPlayer; +import magic.model.stack.MagicCardOnStack; public class PlayCardAction extends MagicAction { diff --git a/src/magic/model/action/PlayCardFromStackAction.java b/src/magic/model/action/PlayCardFromStackAction.java index 5529d28337..21f9736124 100644 --- a/src/magic/model/action/PlayCardFromStackAction.java +++ b/src/magic/model/action/PlayCardFromStackAction.java @@ -1,21 +1,19 @@ package magic.model.action; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import magic.ai.ArtificialScoringSystem; -import magic.model.MagicPayedCost; import magic.model.MagicCardDefinition; import magic.model.MagicGame; import magic.model.MagicLocationType; -import magic.model.MagicObject; +import magic.model.MagicPayedCost; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; import magic.model.stack.MagicCardOnStack; import magic.model.trigger.MagicTrigger; import magic.model.trigger.MagicTriggerType; -import java.util.Collections; -import java.util.Arrays; -import java.util.List; - public class PlayCardFromStackAction extends MagicAction { private final MagicCardOnStack cardOnStack; diff --git a/src/magic/model/action/PlayTokenAction.java b/src/magic/model/action/PlayTokenAction.java index 3aac844ebb..648b39f99a 100644 --- a/src/magic/model/action/PlayTokenAction.java +++ b/src/magic/model/action/PlayTokenAction.java @@ -1,17 +1,15 @@ package magic.model.action; -import magic.model.MagicCard; -import magic.model.MagicCardDefinition; -import magic.model.MagicGame; -import magic.model.MagicObject; -import magic.model.MagicPermanent; -import magic.model.MagicPlayer; -import magic.model.MagicPayedCost; -import magic.model.stack.MagicCardOnStack; - import java.util.Arrays; import java.util.Collections; import java.util.List; +import magic.model.MagicCard; +import magic.model.MagicCardDefinition; +import magic.model.MagicGame; +import magic.model.MagicObject; +import magic.model.MagicPayedCost; +import magic.model.MagicPlayer; +import magic.model.stack.MagicCardOnStack; public class PlayTokenAction extends MagicAction { diff --git a/src/magic/model/action/PutStateTriggerOnStackAction.java b/src/magic/model/action/PutStateTriggerOnStackAction.java index b6192c3146..55b38d2048 100644 --- a/src/magic/model/action/PutStateTriggerOnStackAction.java +++ b/src/magic/model/action/PutStateTriggerOnStackAction.java @@ -2,7 +2,6 @@ package magic.model.action; import magic.model.MagicGame; import magic.model.event.MagicEvent; -import magic.model.stack.MagicTriggerOnStack; public class PutStateTriggerOnStackAction extends MagicAction { diff --git a/src/magic/model/action/ShuffleCardsIntoLibraryAction.java b/src/magic/model/action/ShuffleCardsIntoLibraryAction.java index 23841e6698..7f55ab4704 100644 --- a/src/magic/model/action/ShuffleCardsIntoLibraryAction.java +++ b/src/magic/model/action/ShuffleCardsIntoLibraryAction.java @@ -1,14 +1,10 @@ package magic.model.action; -import magic.model.MagicGame; -import magic.model.MagicCard; -import magic.model.MagicCardList; -import magic.model.MagicPlayer; -import magic.model.MagicLocationType; - import java.util.List; -import java.util.Set; -import java.util.HashSet; +import magic.model.MagicCard; +import magic.model.MagicGame; +import magic.model.MagicLocationType; +import magic.model.MagicPlayer; public class ShuffleCardsIntoLibraryAction extends MagicAction { diff --git a/src/magic/model/choice/MagicMulliganChoice.java b/src/magic/model/choice/MagicMulliganChoice.java index f7481406fd..d5f1944ce8 100644 --- a/src/magic/model/choice/MagicMulliganChoice.java +++ b/src/magic/model/choice/MagicMulliganChoice.java @@ -1,26 +1,17 @@ package magic.model.choice; +import java.util.Collection; +import java.util.List; +import magic.exception.UndoClickedException; +import magic.model.IUIGameController; import magic.model.MagicCard; -import magic.model.MagicCardDefinition; -import magic.model.MagicCostManaType; import magic.model.MagicGame; -import magic.model.MagicManaCost; import magic.model.MagicPlayer; import magic.model.MagicSource; import magic.model.MagicType; -import magic.model.condition.MagicCondition; -import magic.model.MagicPayedCost; import magic.model.action.PlayCardAction; import magic.model.event.MagicEvent; import magic.model.phase.MagicMainPhase; -import magic.exception.UndoClickedException; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import magic.model.IUIGameController; public class MagicMulliganChoice extends MagicChoice { diff --git a/src/magic/model/choice/MagicSimpleMayChoice.java b/src/magic/model/choice/MagicSimpleMayChoice.java index 8d699a7bd6..674a10e996 100644 --- a/src/magic/model/choice/MagicSimpleMayChoice.java +++ b/src/magic/model/choice/MagicSimpleMayChoice.java @@ -1,15 +1,14 @@ package magic.model.choice; +import java.util.Collection; +import java.util.List; import magic.data.GeneralConfig; +import magic.exception.UndoClickedException; +import magic.model.IUIGameController; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.MagicSource; import magic.model.event.MagicEvent; -import magic.exception.UndoClickedException; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import magic.model.IUIGameController; public class MagicSimpleMayChoice extends MagicChoice { diff --git a/src/magic/model/condition/MagicArtificialCondition.java b/src/magic/model/condition/MagicArtificialCondition.java index b5ab8a5f7a..23510c6e06 100644 --- a/src/magic/model/condition/MagicArtificialCondition.java +++ b/src/magic/model/condition/MagicArtificialCondition.java @@ -1,9 +1,8 @@ package magic.model.condition; -import magic.model.MagicGame; import magic.model.MagicSource; -import magic.model.event.MagicEvent; import magic.model.event.MagicConditionEvent; +import magic.model.event.MagicEvent; public class MagicArtificialCondition extends MagicCondition { diff --git a/src/magic/model/event/MagicActivationHints.java b/src/magic/model/event/MagicActivationHints.java index 5f20f2cd80..82956b0971 100644 --- a/src/magic/model/event/MagicActivationHints.java +++ b/src/magic/model/event/MagicActivationHints.java @@ -1,8 +1,5 @@ package magic.model.event; -import magic.model.MagicPermanent; -import magic.model.MagicSource; - public class MagicActivationHints { /** timing */ diff --git a/src/magic/model/event/MagicAwakenEvent.java b/src/magic/model/event/MagicAwakenEvent.java index 7d4dd13130..b7f6f0fabf 100644 --- a/src/magic/model/event/MagicAwakenEvent.java +++ b/src/magic/model/event/MagicAwakenEvent.java @@ -1,23 +1,21 @@ package magic.model.event; +import java.util.Set; +import magic.model.MagicAbility; +import magic.model.MagicCounterType; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicSource; import magic.model.MagicPlayer; -import magic.model.MagicCounterType; import magic.model.MagicPowerToughness; -import magic.model.MagicAbility; +import magic.model.MagicSource; import magic.model.MagicSubType; import magic.model.MagicType; -import magic.model.mstatic.MagicStatic; -import magic.model.mstatic.MagicLayer; -import magic.model.choice.MagicTargetChoice; -import magic.model.action.ChangeCountersAction; -import magic.model.action.MagicPermanentAction; import magic.model.action.AddStaticAction; +import magic.model.action.ChangeCountersAction; import magic.model.action.GainAbilityAction; - -import java.util.Set; +import magic.model.choice.MagicTargetChoice; +import magic.model.mstatic.MagicLayer; +import magic.model.mstatic.MagicStatic; public class MagicAwakenEvent extends MagicEvent { final private static MagicTargetChoice tchoice = new MagicTargetChoice("target land you control"); diff --git a/src/magic/model/event/MagicBolsterEvent.java b/src/magic/model/event/MagicBolsterEvent.java index 4e0f0f9e65..8f06b0b289 100644 --- a/src/magic/model/event/MagicBolsterEvent.java +++ b/src/magic/model/event/MagicBolsterEvent.java @@ -3,8 +3,6 @@ package magic.model.event; import magic.model.MagicCounterType; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicPlayer; -import magic.model.MagicSource; import magic.model.action.ChangeCountersAction; import magic.model.choice.MagicTargetChoice; import magic.model.target.MagicPTTargetFilter; diff --git a/src/magic/model/event/MagicCrewCostEvent.java b/src/magic/model/event/MagicCrewCostEvent.java index 6b4e9bd8ea..29c8bc6332 100644 --- a/src/magic/model/event/MagicCrewCostEvent.java +++ b/src/magic/model/event/MagicCrewCostEvent.java @@ -2,9 +2,7 @@ package magic.model.event; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.MagicManaCost; import magic.model.action.TapAction; import magic.model.choice.MagicTargetChoice; import magic.model.target.MagicTapTargetPicker; diff --git a/src/magic/model/event/MagicCyclingActivation.java b/src/magic/model/event/MagicCyclingActivation.java index f71230f136..f942258167 100644 --- a/src/magic/model/event/MagicCyclingActivation.java +++ b/src/magic/model/event/MagicCyclingActivation.java @@ -1,17 +1,15 @@ package magic.model.event; -import magic.model.MagicGame; +import java.util.Arrays; import magic.model.MagicCard; +import magic.model.MagicGame; +import magic.model.MagicPayedCost; import magic.model.MagicPermanent; import magic.model.MagicSource; -import magic.model.MagicManaCost; -import magic.model.MagicPayedCost; +import magic.model.action.PutItemOnStackAction; import magic.model.stack.MagicAbilityOnStack; import magic.model.trigger.MagicTrigger; import magic.model.trigger.MagicTriggerType; -import magic.model.action.PutItemOnStackAction; - -import java.util.Arrays; public class MagicCyclingActivation extends MagicCardAbilityActivation { diff --git a/src/magic/model/event/MagicDashActivation.java b/src/magic/model/event/MagicDashActivation.java index 217f467c6b..a4aee6ecf2 100644 --- a/src/magic/model/event/MagicDashActivation.java +++ b/src/magic/model/event/MagicDashActivation.java @@ -1,16 +1,14 @@ package magic.model.event; +import java.util.Arrays; import magic.model.MagicCard; import magic.model.MagicGame; -import magic.model.MagicLocationType; import magic.model.MagicManaCost; import magic.model.MagicPayedCost; -import magic.model.stack.MagicCardOnStack; import magic.model.action.MagicPlayMod; import magic.model.action.PlayCardFromStackAction; import magic.model.condition.MagicCondition; - -import java.util.Arrays; +import magic.model.stack.MagicCardOnStack; public class MagicDashActivation extends MagicHandCastActivation { diff --git a/src/magic/model/event/MagicEmergeCostEvent.java b/src/magic/model/event/MagicEmergeCostEvent.java index 2708a06528..90f34f36bb 100644 --- a/src/magic/model/event/MagicEmergeCostEvent.java +++ b/src/magic/model/event/MagicEmergeCostEvent.java @@ -1,10 +1,9 @@ package magic.model.event; import magic.model.MagicGame; -import magic.model.MagicPermanent; -import magic.model.MagicPlayer; -import magic.model.MagicSource; import magic.model.MagicManaCost; +import magic.model.MagicPermanent; +import magic.model.MagicSource; import magic.model.action.SacrificeAction; import magic.model.choice.MagicTargetChoice; import magic.model.target.MagicSacrificeTargetPicker; diff --git a/src/magic/model/event/MagicFlashbackActivation.java b/src/magic/model/event/MagicFlashbackActivation.java index 0cd1685e16..edf08b1fe1 100644 --- a/src/magic/model/event/MagicFlashbackActivation.java +++ b/src/magic/model/event/MagicFlashbackActivation.java @@ -1,15 +1,13 @@ package magic.model.event; +import java.util.LinkedList; +import java.util.List; import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicSource; import magic.model.action.CastCardAction; -import magic.model.stack.MagicCardOnStack; - -import java.util.LinkedList; -import java.util.List; public class MagicFlashbackActivation extends MagicGraveyardCastActivation { diff --git a/src/magic/model/event/MagicHandCastActivation.java b/src/magic/model/event/MagicHandCastActivation.java index 90224d559c..12094aed70 100644 --- a/src/magic/model/event/MagicHandCastActivation.java +++ b/src/magic/model/event/MagicHandCastActivation.java @@ -1,16 +1,18 @@ package magic.model.event; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import magic.model.MagicAmount; import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicChangeCardDefinition; import magic.model.MagicGame; import magic.model.MagicLocationType; -import magic.model.MagicPayedCost; -import magic.model.MagicSource; -import magic.model.MagicPermanent; import magic.model.MagicManaCost; -import magic.model.MagicCostManaType; -import magic.model.MagicAmount; +import magic.model.MagicPayedCost; +import magic.model.MagicPermanent; +import magic.model.MagicSource; import magic.model.action.PlayCardAction; import magic.model.action.PutItemOnStackAction; import magic.model.action.RemoveCardAction; @@ -19,10 +21,6 @@ import magic.model.condition.MagicCondition; import magic.model.stack.MagicCardOnStack; import magic.model.target.MagicTargetFilter; -import java.util.LinkedList; -import java.util.List; -import java.util.Collections; - public class MagicHandCastActivation extends MagicActivation implements MagicChangeCardDefinition, MagicCardEvent { public static final MagicCondition[] CARD_CONDITION = new MagicCondition[]{ diff --git a/src/magic/model/event/MagicMulliganEvent.java b/src/magic/model/event/MagicMulliganEvent.java index 84faabfd31..a23d385b52 100644 --- a/src/magic/model/event/MagicMulliganEvent.java +++ b/src/magic/model/event/MagicMulliganEvent.java @@ -1,11 +1,10 @@ package magic.model.event; -import magic.model.MagicCard; import magic.model.MagicCardList; import magic.model.MagicGame; -import magic.model.MagicSource; import magic.model.MagicLocationType; import magic.model.MagicPlayer; +import magic.model.MagicSource; import magic.model.action.DrawAction; import magic.model.action.ShuffleCardsIntoLibraryAction; import magic.model.choice.MagicMulliganChoice; diff --git a/src/magic/model/event/MagicPutCounterEvent.java b/src/magic/model/event/MagicPutCounterEvent.java index 290d03d1d7..8160141f78 100644 --- a/src/magic/model/event/MagicPutCounterEvent.java +++ b/src/magic/model/event/MagicPutCounterEvent.java @@ -5,7 +5,6 @@ import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicSource; import magic.model.action.ChangeCountersAction; -import magic.model.action.MagicPermanentAction; import magic.model.choice.MagicTargetChoice; import magic.model.target.MagicPumpTargetPicker; diff --git a/src/magic/model/event/MagicPutOntoBattlefieldEvent.java b/src/magic/model/event/MagicPutOntoBattlefieldEvent.java index 39a6ceb305..de21c64166 100644 --- a/src/magic/model/event/MagicPutOntoBattlefieldEvent.java +++ b/src/magic/model/event/MagicPutOntoBattlefieldEvent.java @@ -1,20 +1,18 @@ package magic.model.event; +import java.util.Arrays; +import java.util.List; import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicLocationType; +import magic.model.MagicMessage; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.action.MagicCardAction; import magic.model.action.MagicPermanentAction; import magic.model.action.ReturnCardAction; import magic.model.choice.MagicChoice; import magic.model.target.MagicGraveyardTargetPicker; -import java.util.Arrays; -import java.util.List; -import magic.model.MagicMessage; - public class MagicPutOntoBattlefieldEvent extends MagicEvent { public MagicPutOntoBattlefieldEvent(final MagicEvent event, final MagicChoice choice, final List mods) { diff --git a/src/magic/model/event/MagicRedirectDamageEvent.java b/src/magic/model/event/MagicRedirectDamageEvent.java index 79e84073b9..c7909663aa 100644 --- a/src/magic/model/event/MagicRedirectDamageEvent.java +++ b/src/magic/model/event/MagicRedirectDamageEvent.java @@ -4,7 +4,6 @@ import magic.model.MagicDamage; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.action.DealDamageAction; -import magic.model.action.MagicPermanentAction; import magic.model.choice.MagicMayChoice; import magic.model.choice.MagicTargetChoice; diff --git a/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java b/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java index c03e30b710..4a0654fc3d 100644 --- a/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java +++ b/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java @@ -1,21 +1,19 @@ package magic.model.event; -import magic.model.MagicCard; -import magic.model.MagicGame; -import magic.model.MagicPlayer; -import magic.model.MagicSource; -import magic.model.action.MagicCardAction; -import magic.model.action.ReturnCardAction; -import magic.model.action.ShuffleLibraryAction; -import magic.model.action.AIRevealAction; -import magic.model.action.MagicPermanentAction; -import magic.model.choice.MagicChoice; -import magic.model.choice.MagicCardChoiceResult; -import magic.model.target.MagicGraveyardTargetPicker; - import java.util.Arrays; import java.util.List; +import magic.model.MagicCard; +import magic.model.MagicGame; import magic.model.MagicMessage; +import magic.model.MagicPlayer; +import magic.model.MagicSource; +import magic.model.action.AIRevealAction; +import magic.model.action.MagicPermanentAction; +import magic.model.action.ReturnCardAction; +import magic.model.action.ShuffleLibraryAction; +import magic.model.choice.MagicCardChoiceResult; +import magic.model.choice.MagicChoice; +import magic.model.target.MagicGraveyardTargetPicker; public class MagicSearchOntoBattlefieldEvent extends MagicEvent { public MagicSearchOntoBattlefieldEvent(final MagicEvent event, final MagicChoice choice, final MagicPermanentAction... mods) { diff --git a/src/magic/model/event/MagicSearchToLocationEvent.java b/src/magic/model/event/MagicSearchToLocationEvent.java index b31e69dae5..07b0ef0ea8 100644 --- a/src/magic/model/event/MagicSearchToLocationEvent.java +++ b/src/magic/model/event/MagicSearchToLocationEvent.java @@ -6,12 +6,11 @@ import magic.model.MagicLocationType; import magic.model.MagicMessage; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.action.MagicCardAction; +import magic.model.action.AIRevealAction; import magic.model.action.ShiftCardAction; import magic.model.action.ShuffleLibraryAction; -import magic.model.action.AIRevealAction; -import magic.model.choice.MagicChoice; import magic.model.choice.MagicCardChoiceResult; +import magic.model.choice.MagicChoice; import magic.model.target.MagicGraveyardTargetPicker; public class MagicSearchToLocationEvent extends MagicEvent { diff --git a/src/magic/model/event/MagicSurgeActivation.java b/src/magic/model/event/MagicSurgeActivation.java index 5c36051a59..ca2d5d600d 100644 --- a/src/magic/model/event/MagicSurgeActivation.java +++ b/src/magic/model/event/MagicSurgeActivation.java @@ -1,17 +1,10 @@ - package magic.model.event; -import magic.model.MagicCard; -import magic.model.MagicGame; -import magic.model.MagicManaCost; -import magic.model.MagicPayedCost; -import magic.model.MagicCardDefinition; -import magic.model.stack.MagicCardOnStack; -import magic.model.action.MagicPlayMod; -import magic.model.action.PlayCardFromStackAction; -import magic.model.condition.MagicCondition; - import java.util.Arrays; +import magic.model.MagicCard; +import magic.model.MagicCardDefinition; +import magic.model.MagicManaCost; +import magic.model.condition.MagicCondition; public class MagicSurgeActivation extends MagicHandCastActivation { diff --git a/src/magic/model/event/MagicSuspendActivation.java b/src/magic/model/event/MagicSuspendActivation.java index 01e3b2a48d..2f978d8094 100644 --- a/src/magic/model/event/MagicSuspendActivation.java +++ b/src/magic/model/event/MagicSuspendActivation.java @@ -1,20 +1,15 @@ package magic.model.event; +import java.util.Arrays; import magic.model.MagicCard; import magic.model.MagicCounterType; import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicManaCost; import magic.model.MagicPayedCost; -import magic.model.MagicPermanent; import magic.model.MagicSource; import magic.model.action.ChangeCountersAction; import magic.model.action.ShiftCardAction; -import magic.model.stack.MagicAbilityOnStack; -import magic.model.trigger.MagicTrigger; -import magic.model.trigger.MagicTriggerType; - -import java.util.Arrays; public class MagicSuspendActivation extends MagicCardAbilityActivation { diff --git a/src/magic/model/event/MagicTypeCyclingActivation.java b/src/magic/model/event/MagicTypeCyclingActivation.java index 33e799f2a9..69e489eac6 100644 --- a/src/magic/model/event/MagicTypeCyclingActivation.java +++ b/src/magic/model/event/MagicTypeCyclingActivation.java @@ -2,17 +2,9 @@ package magic.model.event; import magic.model.MagicCard; import magic.model.MagicGame; -import magic.model.MagicManaCost; -import magic.model.MagicPayedCost; import magic.model.MagicLocationType; -import magic.model.MagicPermanent; -import magic.model.MagicSource; +import magic.model.MagicPayedCost; import magic.model.choice.MagicTargetChoice; -import magic.model.stack.MagicAbilityOnStack; -import magic.model.trigger.MagicTrigger; -import magic.model.trigger.MagicTriggerType; - -import java.util.Arrays; public class MagicTypeCyclingActivation extends MagicCyclingActivation { diff --git a/src/magic/model/event/MagicUnearthActivation.java b/src/magic/model/event/MagicUnearthActivation.java index 8778b9f27d..ea7a78bbc6 100644 --- a/src/magic/model/event/MagicUnearthActivation.java +++ b/src/magic/model/event/MagicUnearthActivation.java @@ -1,17 +1,14 @@ package magic.model.event; +import java.util.Arrays; import magic.model.MagicCard; +import magic.model.MagicCardDefinition; import magic.model.MagicGame; import magic.model.MagicManaCost; import magic.model.MagicPayedCost; -import magic.model.MagicSource; -import magic.model.MagicCardDefinition; import magic.model.action.MagicPlayMod; import magic.model.action.ReanimateAction; -import magic.model.choice.MagicChoice; import magic.model.condition.MagicCondition; -import magic.model.stack.MagicAbilityOnStack; -import java.util.Arrays; public class MagicUnearthActivation extends MagicCardAbilityActivation { diff --git a/src/magic/model/mstatic/MagicCDA.java b/src/magic/model/mstatic/MagicCDA.java index 7f9e53e900..2d6f9f1d91 100644 --- a/src/magic/model/mstatic/MagicCDA.java +++ b/src/magic/model/mstatic/MagicCDA.java @@ -1,5 +1,7 @@ package magic.model.mstatic; +import java.util.Set; +import magic.model.MagicAmount; import magic.model.MagicCardDefinition; import magic.model.MagicChangeCardDefinition; import magic.model.MagicGame; @@ -7,11 +9,6 @@ import magic.model.MagicPermanent; import magic.model.MagicPlayer; import magic.model.MagicPowerToughness; import magic.model.MagicSubType; -import magic.model.MagicAmount; -import magic.model.target.MagicTargetFilter; -import magic.model.target.MagicTarget; - -import java.util.Set; /* 604.3a A static ability is a characteristic-defining ability if it meets diff --git a/src/magic/model/phase/MagicCleanupPhase.java b/src/magic/model/phase/MagicCleanupPhase.java index bf70008811..5d29efe063 100644 --- a/src/magic/model/phase/MagicCleanupPhase.java +++ b/src/magic/model/phase/MagicCleanupPhase.java @@ -3,14 +3,12 @@ package magic.model.phase; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.phase.MagicPhaseType; import magic.model.action.ChangeExtraTurnsAction; import magic.model.action.CleanupPlayerAction; import magic.model.action.CleanupTurnStaticsAction; import magic.model.action.CleanupTurnTriggersAction; import magic.model.action.PayDelayedCostsAction; import magic.model.event.MagicDiscardEvent; -import magic.model.event.MagicEvent; public class MagicCleanupPhase extends MagicPhase { diff --git a/src/magic/model/phase/MagicEndOfTurnPhase.java b/src/magic/model/phase/MagicEndOfTurnPhase.java index b133376958..994efd2533 100644 --- a/src/magic/model/phase/MagicEndOfTurnPhase.java +++ b/src/magic/model/phase/MagicEndOfTurnPhase.java @@ -1,9 +1,7 @@ package magic.model.phase; import magic.model.MagicGame; -import magic.model.MagicSource; import magic.model.action.ReturnExiledAction; -import magic.model.event.MagicDrawEvent; import magic.model.trigger.MagicTriggerType; import magic.ui.MagicSound; diff --git a/src/magic/model/phase/MagicUntapPhase.java b/src/magic/model/phase/MagicUntapPhase.java index 6982dcbd35..c538ebe96c 100644 --- a/src/magic/model/phase/MagicUntapPhase.java +++ b/src/magic/model/phase/MagicUntapPhase.java @@ -5,7 +5,6 @@ import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; import magic.model.MagicPlayer; -import magic.model.MagicPlayerState; import magic.model.action.ChangeStateAction; import magic.model.action.UntapAction; import magic.model.trigger.MagicTriggerType; diff --git a/src/magic/model/target/MagicCMCCardFilter.java b/src/magic/model/target/MagicCMCCardFilter.java index 2cf3e41865..4a673d8060 100644 --- a/src/magic/model/target/MagicCMCCardFilter.java +++ b/src/magic/model/target/MagicCMCCardFilter.java @@ -1,7 +1,6 @@ package magic.model.target; import magic.model.MagicCard; -import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.MagicSource; diff --git a/src/magic/model/target/MagicCardFilterImpl.java b/src/magic/model/target/MagicCardFilterImpl.java index 85efa85aff..850d1987f2 100644 --- a/src/magic/model/target/MagicCardFilterImpl.java +++ b/src/magic/model/target/MagicCardFilterImpl.java @@ -1,19 +1,17 @@ package magic.model.target; -import magic.model.MagicCard; -import magic.model.MagicColor; -import magic.model.MagicAbility; -import magic.model.MagicGame; -import magic.model.MagicPlayer; -import magic.model.MagicType; -import magic.model.MagicSubType; -import magic.model.MagicSource; -import magic.model.event.MagicEvent; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; +import magic.model.MagicAbility; +import magic.model.MagicCard; +import magic.model.MagicColor; +import magic.model.MagicPlayer; +import magic.model.MagicSource; +import magic.model.MagicSubType; +import magic.model.MagicType; +import magic.model.event.MagicEvent; public abstract class MagicCardFilterImpl implements MagicTargetFilter { public List filter(final MagicSource source) { diff --git a/src/magic/model/target/MagicTargetFilter.java b/src/magic/model/target/MagicTargetFilter.java index 2cc3331106..3d68a0d152 100644 --- a/src/magic/model/target/MagicTargetFilter.java +++ b/src/magic/model/target/MagicTargetFilter.java @@ -1,12 +1,10 @@ package magic.model.target; -import magic.model.MagicGame; +import java.util.List; import magic.model.MagicPlayer; import magic.model.MagicSource; import magic.model.event.MagicEvent; -import java.util.List; - public interface MagicTargetFilter { default boolean isStatic() { diff --git a/src/magic/model/trigger/ChampionTrigger.java b/src/magic/model/trigger/ChampionTrigger.java index d84745eb14..7f49947b63 100644 --- a/src/magic/model/trigger/ChampionTrigger.java +++ b/src/magic/model/trigger/ChampionTrigger.java @@ -1,13 +1,12 @@ package magic.model.trigger; import magic.model.MagicGame; -import magic.model.MagicSource; import magic.model.MagicPayedCost; import magic.model.MagicPermanent; import magic.model.MagicPlayer; +import magic.model.MagicSource; import magic.model.MagicSubType; import magic.model.action.ExileLinkAction; -import magic.model.action.MagicPermanentAction; import magic.model.action.SacrificeAction; import magic.model.choice.MagicMayChoice; import magic.model.choice.MagicTargetChoice; diff --git a/src/magic/model/trigger/DevourTrigger.java b/src/magic/model/trigger/DevourTrigger.java index 33fe5c141c..134d64b284 100644 --- a/src/magic/model/trigger/DevourTrigger.java +++ b/src/magic/model/trigger/DevourTrigger.java @@ -5,7 +5,6 @@ import magic.model.MagicGame; import magic.model.MagicPayedCost; import magic.model.MagicPermanent; import magic.model.action.ChangeCountersAction; -import magic.model.action.MagicPermanentAction; import magic.model.action.SacrificeAction; import magic.model.choice.MagicMayChoice; import magic.model.choice.MagicTargetChoice; diff --git a/src/magic/model/trigger/FlankingTrigger.java b/src/magic/model/trigger/FlankingTrigger.java index a6fa125eab..ada4befc85 100644 --- a/src/magic/model/trigger/FlankingTrigger.java +++ b/src/magic/model/trigger/FlankingTrigger.java @@ -3,7 +3,6 @@ package magic.model.trigger; import magic.model.MagicAbility; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicPermanentList; import magic.model.action.ChangeTurnPTAction; import magic.model.event.MagicEvent; diff --git a/src/magic/model/trigger/LivingWeaponTrigger.java b/src/magic/model/trigger/LivingWeaponTrigger.java index 8095467261..5c793104e6 100644 --- a/src/magic/model/trigger/LivingWeaponTrigger.java +++ b/src/magic/model/trigger/LivingWeaponTrigger.java @@ -6,7 +6,6 @@ import magic.model.MagicPayedCost; import magic.model.MagicPermanent; import magic.model.action.AttachAction; import magic.model.action.PlayTokenAction; -import magic.model.action.MagicPermanentAction; import magic.model.event.MagicEvent; /** diff --git a/src/magic/model/trigger/MadnessTrigger.java b/src/magic/model/trigger/MadnessTrigger.java index f7b7f4026c..08f120a204 100644 --- a/src/magic/model/trigger/MadnessTrigger.java +++ b/src/magic/model/trigger/MadnessTrigger.java @@ -1,18 +1,16 @@ package magic.model.trigger; -import magic.model.MagicGame; import magic.model.MagicCard; +import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicManaCost; import magic.model.MagicPermanent; +import magic.model.action.CastCardAction; import magic.model.action.MoveCardAction; import magic.model.action.ShiftCardAction; -import magic.model.action.CastCardAction; -import magic.model.action.EnqueueTriggerAction; import magic.model.choice.MagicMayChoice; import magic.model.choice.MagicPayManaCostChoice; import magic.model.event.MagicEvent; -import magic.model.event.MagicEventAction; public class MadnessTrigger extends ThisPutIntoGraveyardTrigger { diff --git a/src/magic/model/trigger/SacrificeTrigger.java b/src/magic/model/trigger/SacrificeTrigger.java index 1b9debc9d1..a7a97508d3 100644 --- a/src/magic/model/trigger/SacrificeTrigger.java +++ b/src/magic/model/trigger/SacrificeTrigger.java @@ -2,11 +2,10 @@ package magic.model.trigger; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicLocationType; +import magic.model.action.RemoveFromPlayAction; import magic.model.event.MagicEvent; import magic.model.event.MagicSourceEvent; import magic.model.target.MagicTargetFilter; -import magic.model.action.RemoveFromPlayAction; public abstract class SacrificeTrigger extends MagicTrigger { public SacrificeTrigger(final int priority) { diff --git a/src/magic/model/trigger/ThisDiesTrigger.java b/src/magic/model/trigger/ThisDiesTrigger.java index d684d6be86..e116a7d193 100644 --- a/src/magic/model/trigger/ThisDiesTrigger.java +++ b/src/magic/model/trigger/ThisDiesTrigger.java @@ -1,9 +1,8 @@ package magic.model.trigger; +import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicCard; -import magic.model.MagicSource; import magic.model.MagicPlayer; import magic.model.event.MagicEvent; import magic.model.event.MagicHauntEvent; diff --git a/src/magic/model/trigger/WhenTransformsTrigger.java b/src/magic/model/trigger/WhenTransformsTrigger.java index 30f9703505..db0043f834 100644 --- a/src/magic/model/trigger/WhenTransformsTrigger.java +++ b/src/magic/model/trigger/WhenTransformsTrigger.java @@ -2,7 +2,6 @@ package magic.model.trigger; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicPermanentState; import magic.model.event.MagicEvent; import magic.model.event.MagicSourceEvent; diff --git a/src/magic/test/TestAnafenza.java b/src/magic/test/TestAnafenza.java index 4e59c287c3..9050e9d75d 100644 --- a/src/magic/test/TestAnafenza.java +++ b/src/magic/test/TestAnafenza.java @@ -1,11 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; class TestAnafenza extends TestGameBuilder { public MagicGame getGame() { diff --git a/src/magic/test/TestAwaken.java b/src/magic/test/TestAwaken.java index fd34665b43..ef9faa7cd4 100644 --- a/src/magic/test/TestAwaken.java +++ b/src/magic/test/TestAwaken.java @@ -1,11 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; class TestAwaken extends TestGameBuilder { public MagicGame getGame() { diff --git a/src/magic/test/TestCardBuilder.java b/src/magic/test/TestCardBuilder.java index f29b1d36b7..075d5fc125 100644 --- a/src/magic/test/TestCardBuilder.java +++ b/src/magic/test/TestCardBuilder.java @@ -1,22 +1,17 @@ package magic.test; -import magic.model.MagicDuel; -import magic.model.MagicGame; -import magic.model.MagicPlayer; -import magic.model.MagicCardDefinition; -import magic.model.MagicDeckProfile; -import magic.model.phase.*; -import magic.ai.MagicAIImpl; -import magic.ui.MagicImages; -import magic.data.CardDefinitions; -import magic.cardBuilder.renderers.CardBuilder; - import java.awt.image.BufferedImage; import java.awt.image.DataBufferInt; -import javax.imageio.ImageIO; -import java.util.Arrays; import java.io.File; import java.io.IOException; +import java.util.Arrays; +import javax.imageio.ImageIO; +import magic.ai.MagicAIImpl; +import magic.cardBuilder.renderers.CardBuilder; +import magic.data.CardDefinitions; +import magic.model.MagicCardDefinition; +import magic.model.MagicDuel; +import magic.model.MagicGame; class TestCardBuilder extends TestGameBuilder { public MagicGame getGame() { diff --git a/src/magic/test/TestColfenorsUrn.java b/src/magic/test/TestColfenorsUrn.java index d68f13aedb..e373bfc7d3 100644 --- a/src/magic/test/TestColfenorsUrn.java +++ b/src/magic/test/TestColfenorsUrn.java @@ -1,12 +1,11 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; class TestColfenorsUrn extends TestGameBuilder { public MagicGame getGame() { diff --git a/src/magic/test/TestCostIncrease.java b/src/magic/test/TestCostIncrease.java index 454aa116eb..f028f55698 100644 --- a/src/magic/test/TestCostIncrease.java +++ b/src/magic/test/TestCostIncrease.java @@ -1,13 +1,10 @@ - - package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; class TestCostIncrease extends TestGameBuilder { public MagicGame getGame() { diff --git a/src/magic/test/TestCostReduction.java b/src/magic/test/TestCostReduction.java index e9b88c580c..f73271dc7a 100644 --- a/src/magic/test/TestCostReduction.java +++ b/src/magic/test/TestCostReduction.java @@ -1,12 +1,10 @@ - package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; class TestCostReduction extends TestGameBuilder { /* diff --git a/src/magic/test/TestEmerge.java b/src/magic/test/TestEmerge.java index ff2173b7cd..83b868ef06 100644 --- a/src/magic/test/TestEmerge.java +++ b/src/magic/test/TestEmerge.java @@ -1,12 +1,10 @@ - package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; class TestEmerge extends TestGameBuilder { public MagicGame getGame() { diff --git a/src/magic/test/TestIssue760.java b/src/magic/test/TestIssue760.java index 1c9dc35b7d..f105173851 100644 --- a/src/magic/test/TestIssue760.java +++ b/src/magic/test/TestIssue760.java @@ -1,11 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; class TestIssue760 extends TestGameBuilder { public MagicGame getGame() { diff --git a/src/magic/test/TestManaCrash.java b/src/magic/test/TestManaCrash.java index 13473dd482..2c3a504fc5 100644 --- a/src/magic/test/TestManaCrash.java +++ b/src/magic/test/TestManaCrash.java @@ -1,12 +1,10 @@ - package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; class TestManaCrash extends TestGameBuilder { public MagicGame getGame() { diff --git a/src/magic/test/TestRedundantWasteland.java b/src/magic/test/TestRedundantWasteland.java index efd2d31b59..66a1f29d5f 100644 --- a/src/magic/test/TestRedundantWasteland.java +++ b/src/magic/test/TestRedundantWasteland.java @@ -1,11 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; /* * AI should attack with Bears and kill player in two turns. diff --git a/src/magic/test/TestSlowLog.java b/src/magic/test/TestSlowLog.java index b051009143..292d56e457 100644 --- a/src/magic/test/TestSlowLog.java +++ b/src/magic/test/TestSlowLog.java @@ -1,11 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; // 1. Click on Lighting Bolt // 2. Click on Undo diff --git a/src/magic/test/TestSurge.java b/src/magic/test/TestSurge.java index 240e1af10a..b1ded9af1f 100644 --- a/src/magic/test/TestSurge.java +++ b/src/magic/test/TestSurge.java @@ -1,12 +1,10 @@ - package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; class TestSurge extends TestGameBuilder { public MagicGame getGame() { diff --git a/src/magic/test/TestUlrich.java b/src/magic/test/TestUlrich.java index 1102a99570..aea94a07a6 100644 --- a/src/magic/test/TestUlrich.java +++ b/src/magic/test/TestUlrich.java @@ -1,11 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicDeckProfile; import magic.model.phase.*; -import magic.ai.MagicAIImpl; class TestUlrich extends TestGameBuilder { public MagicGame getGame() { diff --git a/src/magic/ui/widget/card/filter/CardFilterPanel.java b/src/magic/ui/widget/card/filter/CardFilterPanel.java index 73f7cac645..b1af5c80b1 100644 --- a/src/magic/ui/widget/card/filter/CardFilterPanel.java +++ b/src/magic/ui/widget/card/filter/CardFilterPanel.java @@ -11,11 +11,11 @@ import java.util.stream.Stream; import javax.swing.AbstractAction; import javax.swing.JButton; import magic.data.CardDefinitions; -import magic.data.GeneralConfig; import magic.model.MagicCardDefinition; import magic.translate.MText; import magic.ui.ICardFilterPanelListener; import magic.ui.helpers.MouseHelper; +import magic.ui.widget.TexturedPanel; import magic.ui.widget.card.filter.button.ColorFilterPanel; import magic.ui.widget.card.filter.button.CostFilterPanel; import magic.ui.widget.card.filter.button.CubeFilterPanel; @@ -29,11 +29,10 @@ import magic.ui.widget.card.filter.button.StatusFilterPanel; import magic.ui.widget.card.filter.button.SubTypeFilterPanel; import magic.ui.widget.card.filter.button.TypeFilterPanel; import magic.ui.widget.card.filter.button.UnsupportedFilterPanel; -import magic.ui.widget.TexturedPanel; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") -public class CardFilterPanel extends TexturedPanel +public class CardFilterPanel extends TexturedPanel implements IFilterListener { // translatable strings