From 2733516cb9cdad7ac4cef98b819d4d01846e5c66 Mon Sep 17 00:00:00 2001 From: Leandro Doctors Date: Wed, 15 Jan 2020 17:02:42 -0300 Subject: [PATCH] Organize imports --- src/magic/CardTest.java | 2 +- src/magic/CommandLineArgs.java | 1 + src/magic/DeckStrCal.java | 1 + src/magic/HeadlessAIGame.java | 1 + src/magic/MagicMain.java | 5 +- src/magic/ai/ArtificialScoringSystem.java | 4 +- src/magic/ai/MCTSAI.java | 1 + src/magic/ai/MMAB.java | 1 + src/magic/ai/MTDF.java | 1 + src/magic/ai/VegasAI.java | 1 + src/magic/awt/MagicFont.java | 1 + src/magic/cardBuilder/ResourceManager.java | 1 + .../cardBuilder/renderers/CardBuilder.java | 2 +- src/magic/cardBuilder/renderers/Frame.java | 8 +- .../cardBuilder/renderers/ImageFrame.java | 6 +- .../cardBuilder/renderers/OracleText.java | 1 + src/magic/cardBuilder/renderers/Overlay.java | 2 +- src/magic/cardBuilder/renderers/PTFrame.java | 8 +- .../cardBuilder/renderers/TitleFrame.java | 7 +- src/magic/cardBuilder/renderers/TypeLine.java | 8 +- src/magic/data/CardDefinitions.java | 15 ++- src/magic/data/CardImageFile.java | 1 + src/magic/data/CardStatistics.java | 1 + src/magic/data/DeckGenerator.java | 1 + src/magic/data/DeckGenerators.java | 1 + src/magic/data/DeckType.java | 1 + src/magic/data/DownloadableFile.java | 1 + src/magic/data/DuelConfig.java | 1 + src/magic/data/GeneralConfig.java | 1 + src/magic/data/ImagesDownloadList.java | 1 + src/magic/data/MagicCustomFormat.java | 14 +- src/magic/data/MagicFormat.java | 3 +- src/magic/data/MagicPredefinedFormat.java | 1 + src/magic/data/MagicSetDefinitions.java | 2 +- src/magic/data/UnimplementedParser.java | 3 +- src/magic/data/json/DownloadableJsonFile.java | 1 + src/magic/data/json/NewVersionJsonParser.java | 4 +- src/magic/data/settings/IntegerSetting.java | 1 + src/magic/data/stats/MagicStats.java | 4 +- src/magic/data/stats/h2/H2Database.java | 4 +- src/magic/data/stats/h2/H2Schema.java | 4 +- .../exception/handler/ExceptionReport.java | 5 +- .../handler/FileExceptionHandler.java | 1 + src/magic/firemind/FiremindClient.java | 10 +- src/magic/firemind/FiremindDuelRunner.java | 4 +- src/magic/firemind/FiremindGameReport.java | 12 +- src/magic/firemind/FiremindJsonReader.java | 4 +- src/magic/firemind/JsonOrgParser.java | 8 +- src/magic/game/state/GameLoader.java | 1 + src/magic/game/state/GamePlayerState.java | 1 + src/magic/game/state/GameStateFileReader.java | 1 + src/magic/game/state/GameStateFileWriter.java | 1 + src/magic/game/state/GameStateSnapshot.java | 3 +- .../generator/Ability_Mono_DeckGenerator.java | 6 +- .../generator/Tribal_Mono_DeckGenerator.java | 8 +- .../headless/HeadlessGameController.java | 2 +- src/magic/model/ARG.java | 3 +- src/magic/model/DuelPlayerConfig.java | 1 + src/magic/model/IRenderableCard.java | 1 + src/magic/model/IUIGameController.java | 1 + src/magic/model/MagicAbility.java | 123 +++++++++++++++++- src/magic/model/MagicAbilityList.java | 16 +-- src/magic/model/MagicCardDefinition.java | 26 +++- src/magic/model/MagicColor.java | 5 +- src/magic/model/MagicDeck.java | 1 + src/magic/model/MagicDuel.java | 1 + src/magic/model/MagicGame.java | 3 +- src/magic/model/MagicGameLog.java | 4 +- src/magic/model/MagicLogBook.java | 1 + src/magic/model/MagicLogMessageBuilder.java | 2 +- src/magic/model/MagicLogger.java | 4 +- src/magic/model/MagicMessage.java | 1 + src/magic/model/MagicPermanent.java | 2 +- src/magic/model/MagicPermanentList.java | 2 +- src/magic/model/MagicRarity.java | 1 + src/magic/model/MagicSetDefinition.java | 2 +- src/magic/model/MagicSource.java | 1 + src/magic/model/MagicTuple.java | 10 +- src/magic/model/MagicType.java | 1 + src/magic/model/action/AIRevealAction.java | 9 +- .../model/action/AbstractMillAction.java | 4 +- src/magic/model/action/AttachAction.java | 6 +- src/magic/model/action/BecomesAction.java | 1 + .../model/action/ChangeCountersAction.java | 2 +- src/magic/model/action/ChangeStateAction.java | 2 +- .../action/CleanupTurnStaticsAction.java | 4 +- .../action/CleanupTurnTriggersAction.java | 4 +- .../model/action/CombatDamageAction.java | 6 +- src/magic/model/action/DestroyAction.java | 8 +- src/magic/model/action/DetainAction.java | 4 +- src/magic/model/action/DrawAction.java | 6 +- src/magic/model/action/EnterAsCopyAction.java | 1 + src/magic/model/action/FlipAction.java | 6 +- src/magic/model/action/GainAbilityAction.java | 8 +- src/magic/model/action/GoadAction.java | 4 +- src/magic/model/action/LookAction.java | 16 +-- src/magic/model/action/LoseAbilityAction.java | 8 +- .../model/action/MagicPermanentAction.java | 2 +- src/magic/model/action/MagicPlayMod.java | 2 +- .../model/action/ManifestCardAction.java | 2 +- src/magic/model/action/MillLibraryAction.java | 4 +- .../model/action/MillLibraryUntilAction.java | 4 +- src/magic/model/action/PlayCardAction.java | 1 + .../model/action/PlayCardFromStackAction.java | 1 + src/magic/model/action/PlayTokenAction.java | 1 + .../action/PutOntoBattlefieldAction.java | 1 + .../model/action/RemoveAllFromPlayAction.java | 6 +- .../action/RemoveTriggersStaticsAction.java | 4 +- src/magic/model/action/RevealAction.java | 1 + src/magic/model/action/SacrificeAction.java | 2 +- .../action/ShuffleCardsIntoLibraryAction.java | 1 + src/magic/model/action/TransformAction.java | 6 +- .../model/action/TurnFaceDownAction.java | 6 +- src/magic/model/action/TurnFaceUpAction.java | 6 +- .../model/choice/MagicBasicLandChoice.java | 1 + .../model/choice/MagicBuilderManaCost.java | 6 +- .../choice/MagicBuilderPayManaCostResult.java | 14 +- src/magic/model/choice/MagicCardChoice.java | 1 + src/magic/model/choice/MagicChoice.java | 18 +-- .../model/choice/MagicChoiceFactory.java | 4 +- src/magic/model/choice/MagicColorChoice.java | 1 + .../model/choice/MagicCombatCreature.java | 1 + .../choice/MagicCombatCreatureBuilder.java | 1 + .../choice/MagicDeclareAttackersChoice.java | 1 + .../MagicDeclareAttackersResultBuilder.java | 10 +- .../choice/MagicDeclareBlockersChoice.java | 1 + .../MagicDeclareBlockersResultBuilder.java | 18 +-- .../choice/MagicDelayedPayManaCostResult.java | 2 +- .../model/choice/MagicExcludeChoice.java | 1 + .../choice/MagicFromCardFilterChoice.java | 1 + .../model/choice/MagicFromCardListChoice.java | 1 + src/magic/model/choice/MagicKickerChoice.java | 1 + src/magic/model/choice/MagicMayChoice.java | 1 + .../model/choice/MagicMulliganChoice.java | 1 + src/magic/model/choice/MagicOrChoice.java | 1 + .../model/choice/MagicPayManaCostChoice.java | 1 + .../model/choice/MagicPayManaCostResult.java | 6 +- .../choice/MagicPayManaCostResultBuilder.java | 1 + src/magic/model/choice/MagicPlayChoice.java | 1 + .../choice/MagicPlayerPayManaCostResult.java | 2 +- .../model/choice/MagicRandomCardChoice.java | 8 +- .../model/choice/MagicSimpleMayChoice.java | 1 + .../condition/MagicConditionFactory.java | 2 +- .../model/condition/MagicConditionParser.java | 2 +- src/magic/model/event/MagicActivation.java | 2 +- src/magic/model/event/MagicAwakenEvent.java | 1 + .../event/MagicBecomesChosenBasicLand.java | 10 +- .../event/MagicCardAbilityActivation.java | 10 +- .../model/event/MagicChainEventFactory.java | 2 +- .../model/event/MagicConditionEvent.java | 2 +- src/magic/model/event/MagicCostEvent.java | 26 ++-- .../model/event/MagicCrewActivation.java | 8 +- src/magic/model/event/MagicCrewCostEvent.java | 2 +- .../model/event/MagicCyclingActivation.java | 1 + src/magic/model/event/MagicDiscardEvent.java | 2 +- src/magic/model/event/MagicETBEvent.java | 18 +-- .../model/event/MagicEmbalmActivation.java | 2 +- .../model/event/MagicEquipActivation.java | 2 +- .../event/MagicEternalizeActivation.java | 2 +- src/magic/model/event/MagicEvent.java | 23 +++- src/magic/model/event/MagicEventFactory.java | 4 +- .../model/event/MagicEvokeActivation.java | 4 +- .../event/MagicExileTopLibraryEvent.java | 2 +- src/magic/model/event/MagicExploreEvent.java | 12 +- .../model/event/MagicFlashbackActivation.java | 1 + .../model/event/MagicHandCastActivation.java | 1 + .../model/event/MagicJumpStartActivation.java | 1 + .../model/event/MagicLevelUpActivation.java | 4 +- .../model/event/MagicManaActivation.java | 4 +- .../model/event/MagicMegamorphActivation.java | 9 +- src/magic/model/event/MagicMillEvent.java | 2 +- .../model/event/MagicMorphActivation.java | 8 +- .../model/event/MagicMorphCastActivation.java | 16 +-- .../model/event/MagicNinjutsuActivation.java | 4 +- .../model/event/MagicPayEnergyEvent.java | 4 +- src/magic/model/event/MagicPayLifeEvent.java | 2 +- .../model/event/MagicPayManaCostEvent.java | 2 +- .../model/event/MagicPermanentActivation.java | 8 +- .../event/MagicPlaneswalkerActivation.java | 12 +- .../model/event/MagicPlayAbilityEvent.java | 2 +- src/magic/model/event/MagicPlayCardEvent.java | 2 +- .../model/event/MagicPlayerTriggerEvent.java | 4 +- .../model/event/MagicProcessorEvent.java | 4 +- .../model/event/MagicPutCardOnStackEvent.java | 8 +- .../event/MagicPutOntoBattlefieldEvent.java | 1 + .../model/event/MagicRegularCostEvent.java | 8 +- .../model/event/MagicReinforceActivation.java | 4 +- .../model/event/MagicRemoveCounterEvent.java | 2 +- .../model/event/MagicRepeatedCostEvent.java | 6 +- .../model/event/MagicRetraceActivation.java | 4 +- .../model/event/MagicRuleEventAction.java | 115 +++++++++++++++- .../model/event/MagicSacrificeEvent.java | 2 +- .../event/MagicSacrificeManaActivation.java | 5 +- .../MagicSacrificeTapManaActivation.java | 6 +- .../MagicSearchOntoBattlefieldEvent.java | 1 + src/magic/model/event/MagicSourceEvent.java | 16 +-- .../event/MagicSourceManaActivation.java | 2 +- .../MagicSourceManaActivationResult.java | 4 +- .../model/event/MagicSpectacleActivation.java | 1 + .../event/MagicStackGetChoicesEvent.java | 4 +- .../model/event/MagicSurgeActivation.java | 1 + .../model/event/MagicTapEnchantedEvent.java | 2 +- src/magic/model/event/MagicTapEvent.java | 2 +- .../model/event/MagicTapOrUntapEvent.java | 4 +- .../model/event/MagicTransmuteActivation.java | 10 +- src/magic/model/event/MagicTutorTopEvent.java | 14 +- src/magic/model/event/MagicUntapEvent.java | 2 +- .../model/event/PermanentSpecParser.java | 16 +-- src/magic/model/mstatic/MagicCDA.java | 1 + .../model/mstatic/MagicDummyModifier.java | 8 +- src/magic/model/mstatic/MagicModifier.java | 8 +- src/magic/model/mstatic/MagicStatic.java | 5 +- src/magic/model/player/AiProfile.java | 3 +- src/magic/model/player/PlayerProfile.java | 1 + src/magic/model/player/PlayerProfiles.java | 1 + src/magic/model/player/PlayerStatistics.java | 1 + .../model/stack/MagicAbilityOnStack.java | 2 +- src/magic/model/target/DetectedPrefixes.java | 8 +- .../model/target/MagicCMCPermanentFilter.java | 2 +- .../model/target/MagicCardFilterImpl.java | 1 + .../model/target/MagicDamageTargetPicker.java | 6 +- .../target/MagicDefaultPermanentPicker.java | 4 +- .../MagicDefaultPermanentTargetPicker.java | 4 +- .../target/MagicDefaultTargetPicker.java | 4 +- .../model/target/MagicEquipTargetPicker.java | 4 +- .../target/MagicLegendaryCopiesFilter.java | 2 +- .../model/target/MagicNameTargetFilter.java | 2 +- .../target/MagicOtherCardTargetFilter.java | 2 +- .../MagicOtherPermanentTargetFilter.java | 2 +- .../model/target/MagicOtherTargetFilter.java | 2 +- .../model/target/MagicPTTargetFilter.java | 2 +- .../target/MagicPermanentFilterImpl.java | 6 +- .../target/MagicPermanentTargetFilter.java | 2 +- .../model/target/MagicPlayerFilterImpl.java | 6 +- .../model/target/MagicStackFilterImpl.java | 8 +- src/magic/model/target/MagicTargetFilter.java | 1 + .../target/MagicTargetFilterFactory.java | 2 +- .../model/target/MagicTargetFilterParser.java | 21 ++- .../model/trigger/AtEndOfTurnTrigger.java | 6 +- src/magic/model/trigger/AtUpkeepTrigger.java | 16 +-- src/magic/model/trigger/BattleCryTrigger.java | 4 +- .../model/trigger/BecomesBlockedTrigger.java | 6 +- .../model/trigger/BecomesTargetTrigger.java | 2 +- .../model/trigger/CantBeBlockedTrigger.java | 2 +- src/magic/model/trigger/CantBlockTrigger.java | 2 +- src/magic/model/trigger/CascadeTrigger.java | 4 +- .../model/trigger/DamageIsDealtTrigger.java | 2 +- .../trigger/EntersBattlefieldTrigger.java | 2 +- .../trigger/EntersWithCounterTrigger.java | 6 +- .../trigger/IfDamageWouldBeDealtTrigger.java | 2 +- .../trigger/LeavesBattlefieldTrigger.java | 4 +- .../trigger/LeavesReturnExiledTrigger.java | 2 +- .../trigger/MagicPermanentTriggerMap.java | 5 +- src/magic/model/trigger/MagicTrigger.java | 2 +- src/magic/model/trigger/MiracleTrigger.java | 8 +- .../model/trigger/OtherCycleTrigger.java | 2 +- .../model/trigger/OtherDrawnTrigger.java | 2 +- .../model/trigger/PreventDamageTrigger.java | 2 +- .../model/trigger/ProtectionTrigger.java | 2 +- src/magic/model/trigger/ReboundTrigger.java | 8 +- .../model/trigger/SagaChapterTrigger.java | 1 - .../model/trigger/ThisAttacksTrigger.java | 10 +- .../trigger/ThisBecomesBlockedTrigger.java | 2 +- .../ThisCombatDamagePlayerTrigger.java | 8 +- src/magic/model/trigger/ThisCycleTrigger.java | 4 +- .../trigger/ThisPutIntoGraveyardTrigger.java | 2 +- .../model/trigger/ThisSpellIsCastTrigger.java | 8 +- src/magic/test/TestAnafenza.java | 2 +- src/magic/test/TestAttackZeroPower.java | 2 +- src/magic/test/TestAwaken.java | 2 +- src/magic/test/TestCanopyVistaVigor.java | 2 +- src/magic/test/TestCardBuilder.java | 2 + src/magic/test/TestColfenorsUrn.java | 2 +- src/magic/test/TestCostIncrease.java | 2 +- src/magic/test/TestCostReduction.java | 2 +- src/magic/test/TestEmerge.java | 2 +- src/magic/test/TestGameBuilder.java | 11 +- src/magic/test/TestIssue760.java | 2 +- src/magic/test/TestIssue763.java | 2 +- src/magic/test/TestManaCrash.java | 2 +- src/magic/test/TestRedundantWasteland.java | 2 +- src/magic/test/TestSlowLog.java | 2 +- src/magic/test/TestSpineToHand.java | 2 +- src/magic/test/TestSurge.java | 2 +- src/magic/test/TestUlrich.java | 2 +- src/magic/test/TestXXCMC.java | 2 +- src/magic/translate/MText.java | 3 +- src/magic/ui/FileDropTargetListener.java | 1 + src/magic/ui/FontsAndBorders.java | 6 +- src/magic/ui/ImageFileIO.java | 3 +- src/magic/ui/ImportWorker.java | 15 ++- src/magic/ui/MagarenaDirectoryChooser.java | 4 +- src/magic/ui/MagicCardImages.java | 1 + src/magic/ui/MagicFileChoosers.java | 5 +- src/magic/ui/MagicFrame.java | 5 +- src/magic/ui/MagicFramePanel.java | 2 + src/magic/ui/MagicImages.java | 5 +- src/magic/ui/MagicLogFile.java | 8 +- src/magic/ui/MagicLogs.java | 1 + src/magic/ui/MagicSound.java | 3 +- src/magic/ui/MagicStickyFrame.java | 2 + src/magic/ui/PrintedCardImage.java | 1 + src/magic/ui/ProxyCardImage.java | 1 + src/magic/ui/ScreenController.java | 2 + src/magic/ui/ScreenOptionsOverlay.java | 10 +- src/magic/ui/SplashProgressReporter.java | 5 +- src/magic/ui/UiExceptionHandler.java | 10 +- src/magic/ui/deck/games/DeckCellRenderer.java | 2 + src/magic/ui/deck/games/DeckColorLabel.java | 2 + src/magic/ui/deck/games/DeckGame.java | 1 + src/magic/ui/deck/games/DeckGamesJTable.java | 2 + src/magic/ui/deck/games/DeckGamesPanel.java | 4 +- .../ui/deck/games/DeckGamesTableModel.java | 2 + src/magic/ui/deck/games/GameCellRenderer.java | 1 + .../ui/deck/games/PlayerCellRenderer.java | 2 + .../ui/deck/games/ResultCellRenderer.java | 2 + src/magic/ui/dialog/AiPropertiesDialog.java | 2 + src/magic/ui/dialog/DeckChooserDialog.java | 2 + src/magic/ui/dialog/DeckImportDialog.java | 2 + src/magic/ui/dialog/DecksFilterDialog.java | 2 + src/magic/ui/dialog/DuelPropertiesDialog.java | 2 + .../ui/dialog/DuelSidebarLayoutDialog.java | 2 + src/magic/ui/dialog/FiremindWorkerDialog.java | 2 + src/magic/ui/dialog/GameStateRunner.java | 2 + src/magic/ui/dialog/MagicDialog.java | 6 +- .../ui/dialog/RandomDeckGeneratorDialog.java | 4 +- src/magic/ui/dialog/button/CancelButton.java | 2 +- src/magic/ui/dialog/button/CloseButton.java | 2 +- .../ui/dialog/button/MagicDialogButton.java | 1 + src/magic/ui/dialog/button/SaveButton.java | 2 +- .../ui/dialog/prefs/AnimationFlagsPanel.java | 2 + .../ui/dialog/prefs/AnimationsPanel.java | 2 + src/magic/ui/dialog/prefs/AudioPanel.java | 2 + .../ui/dialog/prefs/GameplayImagesPanel.java | 2 + src/magic/ui/dialog/prefs/GeneralPanel.java | 2 + .../ui/dialog/prefs/ImageSizePresets.java | 1 + .../ui/dialog/prefs/PreferencesDialog.java | 2 + .../ui/dialog/prefs/PreferredSizePanel.java | 2 + .../ui/dialog/prefs/ScrollablePanel.java | 11 +- .../ui/dialog/prefs/ThemesActionPanel.java | 6 +- src/magic/ui/dialog/prefs/ThemesComboBox.java | 2 + src/magic/ui/dialog/prefs/ThemesPanel.java | 2 + .../ui/dialog/prefs/TranslationPanel.java | 2 + .../ui/dialog/prefs/VolumeSliderPanel.java | 2 + .../resolution/DefaultResolutionProfile.java | 1 + .../ui/duel/viewerinfo/CardViewerInfo.java | 1 + .../ui/duel/viewerinfo/GameViewerInfo.java | 1 + .../duel/viewerinfo/PermanentViewerInfo.java | 1 + .../ui/duel/viewerinfo/PlayerViewerInfo.java | 2 + .../duel/viewerinfo/StackItemViewerInfo.java | 1 + src/magic/ui/helpers/DesktopHelper.java | 2 + src/magic/ui/helpers/ImageHelper.java | 2 + src/magic/ui/helpers/KeyEventAction.java | 2 + src/magic/ui/helpers/LaFHelper.java | 2 + src/magic/ui/helpers/MouseHelper.java | 1 + src/magic/ui/helpers/UrlHelper.java | 2 + src/magic/ui/mwidgets/MCheckBox.java | 2 + src/magic/ui/mwidgets/MFileLink.java | 2 + src/magic/ui/mwidgets/MPlainTextViewer.java | 2 + src/magic/ui/mwidgets/MScrollPane.java | 2 + src/magic/ui/mwidgets/MTextFileViewer.java | 2 + src/magic/ui/mwidgets/MWidget.java | 1 + src/magic/ui/screen/CardsLoadingPanel.java | 2 + src/magic/ui/screen/CardsLoadingWorker.java | 2 + .../ui/screen/HandCanvasLayeredPane.java | 2 + .../ui/screen/HandCanvasOptionsPanel.java | 2 + src/magic/ui/screen/HeaderFooterScreen.java | 1 + src/magic/ui/screen/MScreen.java | 2 + src/magic/ui/screen/MScreenHelper.java | 2 + src/magic/ui/screen/ScreenHelper.java | 1 + src/magic/ui/screen/ScreenOptionsPanel.java | 2 + .../ui/screen/about/AboutContentPanel.java | 7 +- .../ui/screen/about/AboutHeaderPanel.java | 2 + src/magic/ui/screen/about/LicenseButton.java | 2 + src/magic/ui/screen/card/CardScriptPanel.java | 2 + src/magic/ui/screen/card/ContentPanel.java | 1 + src/magic/ui/screen/card/TabsContainer.java | 2 + src/magic/ui/screen/card/TabsPanel.java | 2 + .../card/explorer/ExplorerContentPanel.java | 2 + .../card/explorer/ExplorerHeaderPanel.java | 4 +- .../screen/card/explorer/ExplorerScreen.java | 2 + .../screen/card/explorer/ExplorerSideBar.java | 2 + .../ui/screen/card/explorer/OptionsPanel.java | 2 + .../screen/card/explorer/SplitterButton.java | 2 + .../screen/cardflow/CardFlowLayeredPane.java | 1 + .../ui/screen/cardflow/CardFlowPanel.java | 7 +- .../ui/screen/cardflow/CardFlowScreen.java | 1 + .../ui/screen/cardflow/FlashTextOverlay.java | 2 + .../ui/screen/cardflow/OptionsPanel.java | 2 + src/magic/ui/screen/deck/DeckScreenPanel.java | 1 + .../screen/deck/editor/CardPoolViewPanel.java | 2 + .../deck/editor/CardQuantityActionPanel.java | 2 + .../screen/deck/editor/CardRecallPanel.java | 2 + .../ui/screen/deck/editor/ContentPanel.java | 1 + .../screen/deck/editor/DeckActionPanel.java | 2 + .../screen/deck/editor/DeckEditorScreen.java | 2 + .../deck/editor/DeckEditorSplitPanel.java | 8 +- .../deck/editor/DeckEditorSplitScreen.java | 2 + .../ui/screen/deck/editor/DeckPanel.java | 2 + .../deck/editor/FilteredCardPoolPanel.java | 2 + .../screen/deck/editor/IDeckEditorView.java | 1 + .../ui/screen/deck/editor/MainViewsPanel.java | 2 + .../screen/deck/editor/ViewToggleButton.java | 4 +- .../ui/screen/deck/hand/SampleHandScreen.java | 1 + .../ui/screen/deck/tiled/ContentPanel.java | 4 +- .../deck/tiled/DeckTiledCardsScreen.java | 2 + .../ui/screen/deck/tiled/HeaderPanel.java | 2 + src/magic/ui/screen/decks/DeckPanel.java | 1 + src/magic/ui/screen/decks/DeckViewsPanel.java | 2 + .../ui/screen/decks/DecksScreenPanel.java | 2 + src/magic/ui/screen/decks/SidebarPanel.java | 2 + .../ui/screen/duel/decks/DuelDecksPanel.java | 2 + .../ui/screen/duel/decks/DuelDecksScreen.java | 2 + .../ui/screen/duel/decks/NewGameWorker.java | 2 + .../ui/screen/duel/decks/OptionsPanel.java | 2 + .../ui/screen/duel/decks/PlayerPanel.java | 2 + .../ui/screen/duel/decks/StartGameButton.java | 1 + .../ui/screen/duel/game/BattlefieldPanel.java | 2 + .../duel/game/BattlefieldTextOverlay.java | 1 + .../ui/screen/duel/game/DuelGameScreen.java | 1 + .../ui/screen/duel/game/DuelLayeredPane.java | 2 + src/magic/ui/screen/duel/game/DuelPanel.java | 2 + .../screen/duel/game/GameOptionsOverlay.java | 2 + .../ui/screen/duel/game/GameplayReport.java | 4 +- .../ui/screen/duel/game/PermanentFilter.java | 1 + .../screen/duel/game/SwingGameController.java | 2 + .../screen/duel/game/log/GameLogScreen.java | 4 +- .../ui/screen/duel/mulligan/HeaderPanel.java | 2 + .../screen/duel/mulligan/MulliganScreen.java | 2 + .../ui/screen/duel/player/AiPlayerJList.java | 2 +- .../duel/player/PlayerMiniStatsPanel.java | 2 + .../ui/screen/duel/player/PlayersJList.java | 4 +- .../duel/player/SelectAiPlayerScreen.java | 1 + .../duel/player/SelectHumanPlayerScreen.java | 2 + .../duel/player/SelectPlayerScreen.java | 2 + .../duel/player/avatar/AvatarImageSet.java | 10 +- .../player/avatar/AvatarImagesScreen.java | 10 +- .../player/avatar/AvatarListCellRenderer.java | 2 + .../duel/player/avatar/ContentPanel.java | 2 + .../duel/player/avatar/ImageSetsPanel.java | 2 + .../duel/player/zone/CardZoneScreen.java | 1 + .../duel/player/zone/LibraryZoneScreen.java | 1 + .../duel/setup/DuelPlayerDeckPanel.java | 2 + .../ui/screen/duel/setup/DuelPlayerPanel.java | 2 + .../screen/duel/setup/PlayerProfilePanel.java | 2 + .../screen/duel/setup/PlayerStatsPanel.java | 2 + .../screen/duel/setup/ScreenContentPanel.java | 2 + .../images/download/DialogMainPanel.java | 2 + .../images/download/DirectoryChooser.java | 2 + .../images/download/DownloadDialogPanel.java | 2 + .../images/download/DownloadImagesScreen.java | 1 + .../screen/images/download/DownloadPanel.java | 2 + .../images/download/DownloadWorker.java | 2 + .../ui/screen/images/download/ErrorPanel.java | 4 +- .../ui/screen/images/download/HintPanel.java | 2 + .../screen/images/download/IScanListener.java | 1 + .../screen/images/download/OptionsPanel.java | 2 + .../screen/images/download/PlayablePanel.java | 1 + .../ui/screen/images/download/ScanWorker.java | 2 + .../images/download/UnimplementedPanel.java | 1 + .../ui/screen/interfaces/IDeckConsumer.java | 1 + .../ui/screen/keywords/ContentPanelA.java | 1 + .../ui/screen/keywords/ContentPanelB.java | 1 + src/magic/ui/screen/keywords/Keyword.java | 1 + .../ui/screen/keywords/KeywordPanelA.java | 4 +- .../ui/screen/keywords/KeywordPanelB.java | 2 + .../ui/screen/keywords/KeywordsHelper.java | 1 + .../keywords/KeywordsListCellRenderer.java | 2 + .../ui/screen/keywords/KeywordsListPane.java | 1 + .../ui/screen/keywords/KeywordsScreen.java | 1 + .../screen/keywords/KeywordsScrollPane.java | 1 + .../keywords/KeywordsScrollablePanel.java | 2 + .../screen/keywords/ScreenContentPanel.java | 1 + .../ui/screen/menu/CustomMenuButton.java | 2 + src/magic/ui/screen/menu/MenuButton.java | 2 + .../screen/menu/MenuScreenContentPanel.java | 2 + src/magic/ui/screen/menu/NewMenuPanel.java | 2 + .../menu/NewMenuScreenContentPanel.java | 2 + .../menu/dev/DeckDescriptionPreview.java | 2 + .../screen/menu/dev/DevMenuContentPanel.java | 3 +- .../ui/screen/menu/language/StartScreen.java | 2 + .../ui/screen/menu/main/MainMenuScreen.java | 1 + .../ui/screen/menu/migrate/ImportScreen.java | 14 +- .../settings/SettingsMenuContentPanel.java | 1 + .../screen/menu/wip/WipMenuContentPanel.java | 2 + src/magic/ui/screen/player/ScreenPanel.java | 2 + src/magic/ui/screen/readme/ReadmeScreen.java | 3 +- .../ui/screen/stats/DeckCellRenderer.java | 1 + .../ui/screen/stats/GameStatsJTable.java | 2 + .../ui/screen/stats/GameStatsTableModel.java | 4 +- .../ui/screen/stats/PaginationPanel.java | 2 + .../ui/screen/stats/PlayerCellRenderer.java | 2 + .../screen/stats/StartTimeCellRenderer.java | 1 + .../ui/screen/stats/StatsContentPanel.java | 2 + .../ui/screen/stats/StatsHeaderPanel.java | 2 + .../ui/screen/stats/TableColumnAdjuster.java | 25 +++- src/magic/ui/screen/stats/TestGameRunner.java | 2 + .../ui/screen/test/TestContentPanel.java | 2 + .../ui/screen/widget/ActionBarButton.java | 2 + src/magic/ui/screen/widget/BigDialButton.java | 2 + src/magic/ui/screen/widget/DialButton.java | 2 + .../ui/screen/widget/DuelSettingsPanel.java | 2 + src/magic/ui/screen/widget/MenuPanel.java | 2 + .../ui/screen/widget/PlainMenuButton.java | 2 + .../screen/widget/SampleHandActionButton.java | 2 + .../ui/screen/widget/ScreenFooterPanel.java | 2 + .../ui/screen/widget/ScreenHeaderPanel.java | 2 + src/magic/ui/screen/widget/ScreenSideBar.java | 2 + .../ui/screen/widget/ToggleButtonsPanel.java | 2 + src/magic/ui/theme/AbilityIcon.java | 4 +- src/magic/ui/theme/AbstractTheme.java | 2 + src/magic/ui/theme/CustomTheme.java | 2 + src/magic/ui/theme/PlayerAvatar.java | 2 + src/magic/ui/theme/Theme.java | 1 + src/magic/ui/theme/ThemeFactory.java | 1 + src/magic/ui/utility/ImageDrawingUtils.java | 2 + src/magic/ui/utility/MagicStyle.java | 2 + src/magic/ui/widget/ActionButtonTitleBar.java | 2 + .../ui/widget/ChoiceBorderPanelButton.java | 6 +- .../ui/widget/ChoiceOverlayPanelButton.java | 1 + src/magic/ui/widget/ChoicePanelButton.java | 1 + src/magic/ui/widget/ColorButton.java | 2 + src/magic/ui/widget/CostPanel.java | 8 +- src/magic/ui/widget/ImagePanel.java | 1 + src/magic/ui/widget/KeysStripPanel.java | 2 + src/magic/ui/widget/PanelButton.java | 2 + src/magic/ui/widget/SliderPanel.java | 2 + src/magic/ui/widget/TabSelector.java | 2 + src/magic/ui/widget/TextPrompt.java | 14 +- src/magic/ui/widget/TexturedPanel.java | 10 +- src/magic/ui/widget/TitleBar.java | 2 + src/magic/ui/widget/WrapLayout.java | 6 +- src/magic/ui/widget/ZoneBackgroundLabel.java | 2 + src/magic/ui/widget/about/AboutButton.java | 6 +- src/magic/ui/widget/about/AboutPanel.java | 1 + src/magic/ui/widget/about/ScreenLabel.java | 2 + src/magic/ui/widget/about/TitlePanel.java | 1 + src/magic/ui/widget/about/VersionLabel.java | 2 + src/magic/ui/widget/alerter/AlertButton.java | 2 + src/magic/ui/widget/alerter/AlertPanel.java | 2 + .../alerter/MissingImagesAlertButton.java | 2 + .../widget/alerter/NewVersionAlertButton.java | 6 +- .../alerter/UpgradeJavaAlertButton.java | 4 +- src/magic/ui/widget/button/LayoutButton.java | 2 + .../ui/widget/card/AnnotatedCardPanel.java | 7 +- src/magic/ui/widget/card/MagicInfoWindow.java | 7 +- .../card/decks/CardDecksListCellRenderer.java | 2 + .../ui/widget/card/decks/CardDecksPanel.java | 2 + .../widget/card/filter/CardFilterPanel.java | 2 + .../card/filter/CardFilterTextField.java | 6 +- .../filter/CheckBoxFilterValuesPanel.java | 3 +- .../card/filter/CheckboxValuesPanel.java | 1 + .../card/filter/ColorCheckBoxPanel.java | 2 + .../widget/card/filter/ColorValuesPanel.java | 2 +- .../card/filter/FilterOptionButton.java | 2 + .../card/filter/FilterOptionsPanel.java | 3 +- .../widget/card/filter/FilterResetButton.java | 4 +- .../card/filter/ScrollableFilterPane.java | 4 +- .../ui/widget/card/filter/SearchOperand.java | 1 + .../card/filter/SearchOperandCombo.java | 4 +- .../filter/button/CheckBoxFilterPanel.java | 1 + .../card/filter/button/ColorFilterPanel.java | 1 + .../card/filter/button/CostFilterPanel.java | 1 + .../card/filter/button/FilterButton.java | 4 +- .../card/filter/button/FilterPanel.java | 2 + .../card/filter/button/FormatFilterPanel.java | 1 + .../card/filter/button/RarityFilterPanel.java | 1 + .../card/filter/button/SearchFilterPanel.java | 1 + .../card/filter/button/SetsFilterPanel.java | 3 +- .../card/filter/button/StatusFilterPanel.java | 1 + .../filter/button/SubTypeFilterPanel.java | 1 + .../card/filter/button/TypeFilterPanel.java | 3 +- .../filter/button/UnsupportedFilterPanel.java | 1 + .../filter/dialog/CheckboxFilterDialog.java | 2 +- .../card/filter/dialog/FilterDialog.java | 4 +- .../dialog/MultiSelectFilterDialog.java | 1 + .../ui/widget/cards/canvas/CardCanvas.java | 1 + .../widget/cards/canvas/CardImageOverlay.java | 2 + .../ui/widget/cards/canvas/CardsCanvas.java | 2 + .../ui/widget/cards/canvas/ImageHandler.java | 5 +- .../cards/table/BasicDeckTablePanel.java | 2 + .../ui/widget/cards/table/CardTableModel.java | 2 + .../widget/cards/table/CardTablePanelA.java | 2 + .../widget/cards/table/CardTablePanelB.java | 2 + .../ui/widget/cards/table/CardsJTable.java | 2 + .../widget/cards/table/CardsTablePanel.java | 2 + .../widget/cards/table/CardsTableStyle.java | 1 + .../ui/widget/cards/table/DeckTablePanel.java | 2 + .../cards/table/DeckViewTablePanel.java | 2 + .../ui/widget/deck/DeckDescriptionViewer.java | 2 + .../ui/widget/deck/DeckFilesComboBox.java | 2 + src/magic/ui/widget/deck/DeckInfoPanel.java | 2 +- src/magic/ui/widget/deck/DeckPicker.java | 2 + src/magic/ui/widget/deck/DeckStatusPanel.java | 2 + .../ui/widget/deck/DecksListCellRenderer.java | 4 +- .../ui/widget/deck/RandomDecksComboBox.java | 18 +-- .../deck/legality/CardsLegalityPanel.java | 4 +- .../legality/CardsLegalityTableModel.java | 2 + .../deck/legality/FormatsLegalityPanel.java | 6 +- .../widget/deck/legality/LegalityPanel.java | 2 + .../deck/stats/CardColorStatsPanel.java | 2 + .../widget/deck/stats/CardTypeStatsPanel.java | 4 +- .../deck/stats/DeckStatisticsViewer.java | 2 + .../ui/widget/deck/stats/ManaCurvePanel.java | 2 + .../widget/deck/stats/ManaCurveUnitPanel.java | 2 + src/magic/ui/widget/deck/stats/PwlWorker.java | 2 + .../ui/widget/deck/stats/StatsTable.java | 2 + src/magic/ui/widget/duel/DuelDialogPanel.java | 1 + .../ui/widget/duel/EndGameMessagePanel.java | 2 + .../widget/duel/animation/AnimationPanel.java | 2 + .../widget/duel/animation/CardAnimation.java | 11 +- .../duel/animation/DrawCardAnimation.java | 1 + .../ui/widget/duel/animation/ImageScaler.java | 1 + .../widget/duel/animation/MagicAnimation.java | 1 + .../duel/animation/MagicAnimations.java | 2 + .../duel/animation/PlayCardAnimation.java | 1 + .../widget/duel/choice/ColorChoicePanel.java | 6 +- .../duel/choice/ManaCostXChoicePanel.java | 6 +- .../ui/widget/duel/choice/MayChoicePanel.java | 6 +- .../widget/duel/choice/ModeChoicePanel.java | 6 +- .../duel/choice/MulliganChoicePanel.java | 6 +- .../duel/choice/MultiKickerChoicePanel.java | 6 +- .../widget/duel/choice/PlayChoicePanel.java | 6 +- .../ui/widget/duel/player/AnimationPanel.java | 9 +- .../widget/duel/player/GamePlayerPanel.java | 2 + .../duel/player/PlayerAvatarButton.java | 1 + .../duel/player/PlayerCounterPanel.java | 2 + .../duel/player/PlayerCountersPanel.java | 1 + .../widget/duel/player/PlayerImagePanel.java | 7 +- .../duel/player/PlayerZoneButtonsPanel.java | 2 + .../widget/duel/player/ZoneToggleButton.java | 5 +- .../widget/duel/sidebar/DuelSideBarPanel.java | 2 + .../widget/duel/sidebar/LogStackViewer.java | 2 + .../ui/widget/duel/sidebar/LogViewer.java | 6 +- .../ui/widget/duel/sidebar/MessagePanel.java | 4 +- .../ui/widget/duel/sidebar/StackButton.java | 2 + .../ui/widget/duel/sidebar/StackViewer.java | 2 + .../widget/duel/viewer/CardImageWorker.java | 2 + .../ui/widget/duel/viewer/CardViewer.java | 2 + .../widget/duel/viewer/GameStatusPanel.java | 2 + .../duel/viewer/ImageBattlefieldViewer.java | 20 +-- .../duel/viewer/ImageCardListViewer.java | 2 + .../widget/duel/viewer/ImageCombatViewer.java | 2 + .../duel/viewer/ImagePermanentViewer.java | 2 + .../duel/viewer/ImagePermanentsViewer.java | 2 + .../ui/widget/duel/viewer/NewTurnPanel.java | 1 + .../widget/duel/viewer/PhaseStepViewer.java | 2 + .../widget/duel/viewer/PlayerZoneViewer.java | 2 + .../widget/duel/viewer/TurnStatusPanel.java | 1 + .../ui/widget/duel/viewer/TurnTitlePanel.java | 2 + .../widget/duel/viewer/UserActionPanel.java | 2 + .../widget/firemind/FiremindWorkerPanel.java | 4 +- .../ui/widget/message/EmptyComponent.java | 1 + .../ui/widget/message/IconComponent.java | 1 + src/magic/ui/widget/message/TComponent.java | 1 + .../ui/widget/message/TComponentBuilder.java | 4 +- .../ui/widget/message/TextComponent.java | 2 + src/magic/ui/widget/message/TextLabel.java | 2 + .../ui/widget/player/PlayerDetailsPanel.java | 2 + .../ui/widget/scrollbar/MScrollBarUI.java | 1 + src/magic/ui/widget/scrollbar/NoButton.java | 1 + .../ui/widget/throbber/AbstractThrobber.java | 5 +- .../ui/widget/throbber/ImageThrobber.java | 1 + src/magic/utility/DeckParser.java | 1 + src/magic/utility/DeckUtils.java | 9 +- src/magic/utility/FileIO.java | 7 +- src/magic/utility/MagicFileSystem.java | 6 +- src/magic/utility/MagicResources.java | 4 +- src/magic/utility/MagicSystem.java | 1 + test/magic/model/MagicManaCostTest.java | 4 +- test/magic/model/MagicMessageTest.java | 7 +- 671 files changed, 1774 insertions(+), 707 deletions(-) diff --git a/src/magic/CardTest.java b/src/magic/CardTest.java index bb5f75d27c..6ebfd6b512 100644 --- a/src/magic/CardTest.java +++ b/src/magic/CardTest.java @@ -1,6 +1,5 @@ package magic; -import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; @@ -11,6 +10,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; + import magic.ai.MagicAI; import magic.ai.MagicAIImpl; import magic.data.CardDefinitions; diff --git a/src/magic/CommandLineArgs.java b/src/magic/CommandLineArgs.java index 89f99619c3..974e8c43da 100644 --- a/src/magic/CommandLineArgs.java +++ b/src/magic/CommandLineArgs.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.function.Function; + import magic.ai.MagicAI; import magic.ai.MagicAIImpl; import magic.data.DuelConfig; diff --git a/src/magic/DeckStrCal.java b/src/magic/DeckStrCal.java index 850d44fd87..8b694be659 100644 --- a/src/magic/DeckStrCal.java +++ b/src/magic/DeckStrCal.java @@ -1,6 +1,7 @@ package magic; import java.io.File; + import magic.ai.MagicAIImpl; import magic.data.DeckGenerators; import magic.data.DuelConfig; diff --git a/src/magic/HeadlessAIGame.java b/src/magic/HeadlessAIGame.java index c09070e174..d174c63d92 100644 --- a/src/magic/HeadlessAIGame.java +++ b/src/magic/HeadlessAIGame.java @@ -1,6 +1,7 @@ package magic; import java.util.Collections; + import magic.ai.MagicAI; import magic.data.DuelConfig; import magic.data.GeneralConfig; diff --git a/src/magic/MagicMain.java b/src/magic/MagicMain.java index d9ac0d6ed6..141224dfe0 100644 --- a/src/magic/MagicMain.java +++ b/src/magic/MagicMain.java @@ -8,7 +8,11 @@ import java.io.File; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; + import javax.swing.SwingUtilities; + +import org.pushingpixels.trident.TridentConfig; + import magic.ai.MagicAI; import magic.data.DeckGenerators; import magic.data.DuelConfig; @@ -30,7 +34,6 @@ import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem.DataPath; import magic.utility.MagicSystem; import magic.utility.ProgressReporter; -import org.pushingpixels.trident.TridentConfig; public class MagicMain { diff --git a/src/magic/ai/ArtificialScoringSystem.java b/src/magic/ai/ArtificialScoringSystem.java index 356a75cc10..c3bb91d327 100644 --- a/src/magic/ai/ArtificialScoringSystem.java +++ b/src/magic/ai/ArtificialScoringSystem.java @@ -1,5 +1,7 @@ package magic.ai; +import java.util.Set; + import magic.model.MagicAbility; import magic.model.MagicCard; import magic.model.MagicCardDefinition; @@ -9,8 +11,6 @@ import magic.model.MagicPermanent; import magic.model.MagicPowerToughness; import magic.model.choice.MagicCombatCreature; -import java.util.Set; - public class ArtificialScoringSystem { public static final int WIN_GAME_SCORE=100000000; diff --git a/src/magic/ai/MCTSAI.java b/src/magic/ai/MCTSAI.java index ba9cd842dc..d56e83d67f 100644 --- a/src/magic/ai/MCTSAI.java +++ b/src/magic/ai/MCTSAI.java @@ -11,6 +11,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; + import magic.data.LRUCache; import magic.exception.GameException; import magic.model.MagicGame; diff --git a/src/magic/ai/MMAB.java b/src/magic/ai/MMAB.java index acfed9272e..ec098b35b9 100644 --- a/src/magic/ai/MMAB.java +++ b/src/magic/ai/MMAB.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; + import magic.model.MagicGame; import magic.model.MagicGameLog; import magic.model.MagicPlayer; diff --git a/src/magic/ai/MTDF.java b/src/magic/ai/MTDF.java index b45fe9134c..683426af6e 100644 --- a/src/magic/ai/MTDF.java +++ b/src/magic/ai/MTDF.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; + import magic.model.MagicGame; import magic.model.MagicGameLog; import magic.model.MagicPlayer; diff --git a/src/magic/ai/VegasAI.java b/src/magic/ai/VegasAI.java index 842802a325..91e64ef3f7 100644 --- a/src/magic/ai/VegasAI.java +++ b/src/magic/ai/VegasAI.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; + import magic.model.MagicGame; import magic.model.MagicGameLog; import magic.model.MagicPlayer; diff --git a/src/magic/awt/MagicFont.java b/src/magic/awt/MagicFont.java index 435801eeca..8cde4ad8f1 100644 --- a/src/magic/awt/MagicFont.java +++ b/src/magic/awt/MagicFont.java @@ -6,6 +6,7 @@ import java.awt.font.TextAttribute; import java.io.InputStream; import java.util.HashMap; import java.util.Map; + import magic.utility.MagicResources; public enum MagicFont { diff --git a/src/magic/cardBuilder/ResourceManager.java b/src/magic/cardBuilder/ResourceManager.java index 4177beeb73..0904b5615a 100644 --- a/src/magic/cardBuilder/ResourceManager.java +++ b/src/magic/cardBuilder/ResourceManager.java @@ -4,6 +4,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.io.InputStream; import java.util.Map; + import javax.imageio.ImageIO; import magic.data.LRUCache; diff --git a/src/magic/cardBuilder/renderers/CardBuilder.java b/src/magic/cardBuilder/renderers/CardBuilder.java index bfa75d00d7..1ea655ab8b 100644 --- a/src/magic/cardBuilder/renderers/CardBuilder.java +++ b/src/magic/cardBuilder/renderers/CardBuilder.java @@ -4,10 +4,10 @@ import java.awt.Graphics2D; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; +import magic.model.IRenderableCard; import magic.model.MagicAbility; import magic.model.MagicSubType; import magic.model.MagicType; -import magic.model.IRenderableCard; public class CardBuilder { diff --git a/src/magic/cardBuilder/renderers/Frame.java b/src/magic/cardBuilder/renderers/Frame.java index b05c13a7e0..1a8dc4f9d2 100644 --- a/src/magic/cardBuilder/renderers/Frame.java +++ b/src/magic/cardBuilder/renderers/Frame.java @@ -9,18 +9,18 @@ import java.util.Collections; import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.Locale; +import java.util.Set; import java.util.stream.Collectors; +import magic.cardBuilder.CardResource; +import magic.cardBuilder.ResourceManager; +import magic.model.IRenderableCard; import magic.model.MagicColor; import magic.model.MagicManaType; import magic.model.MagicSubType; import magic.model.MagicType; import magic.model.event.MagicManaActivation; -import magic.model.IRenderableCard; -import magic.cardBuilder.ResourceManager; -import magic.cardBuilder.CardResource; public class Frame { diff --git a/src/magic/cardBuilder/renderers/ImageFrame.java b/src/magic/cardBuilder/renderers/ImageFrame.java index 08bf42b8f4..006e73f45a 100644 --- a/src/magic/cardBuilder/renderers/ImageFrame.java +++ b/src/magic/cardBuilder/renderers/ImageFrame.java @@ -7,13 +7,13 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import magic.cardBuilder.CardResource; +import magic.cardBuilder.ResourceManager; +import magic.model.IRenderableCard; import magic.model.MagicColor; import magic.model.MagicType; import magic.ui.ImageFileIO; import magic.ui.MagicImages; -import magic.model.IRenderableCard; -import magic.cardBuilder.ResourceManager; -import magic.cardBuilder.CardResource; import magic.ui.helpers.ImageHelper; import magic.utility.MagicFileSystem; diff --git a/src/magic/cardBuilder/renderers/OracleText.java b/src/magic/cardBuilder/renderers/OracleText.java index 7ecd83d4e1..463b38bf98 100644 --- a/src/magic/cardBuilder/renderers/OracleText.java +++ b/src/magic/cardBuilder/renderers/OracleText.java @@ -23,6 +23,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; + import magic.awt.MagicFont; import magic.cardBuilder.CardResource; import magic.cardBuilder.ResourceManager; diff --git a/src/magic/cardBuilder/renderers/Overlay.java b/src/magic/cardBuilder/renderers/Overlay.java index 7a39eae673..b800fe11d8 100644 --- a/src/magic/cardBuilder/renderers/Overlay.java +++ b/src/magic/cardBuilder/renderers/Overlay.java @@ -8,8 +8,8 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import magic.cardBuilder.ResourceManager; import magic.cardBuilder.CardResource; +import magic.cardBuilder.ResourceManager; import magic.model.IRenderableCard; import magic.model.MagicAbility; import magic.model.MagicColor; diff --git a/src/magic/cardBuilder/renderers/PTFrame.java b/src/magic/cardBuilder/renderers/PTFrame.java index 9cd2ee5a68..2b3b08e131 100644 --- a/src/magic/cardBuilder/renderers/PTFrame.java +++ b/src/magic/cardBuilder/renderers/PTFrame.java @@ -11,15 +11,15 @@ import java.awt.font.TextLayout; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.util.ArrayList; -import magic.awt.MagicFont; +import magic.awt.MagicFont; +import magic.cardBuilder.CardResource; +import magic.cardBuilder.ResourceManager; +import magic.model.IRenderableCard; import magic.model.MagicAbility; import magic.model.MagicColor; import magic.model.MagicSubType; import magic.model.MagicType; -import magic.model.IRenderableCard; -import magic.cardBuilder.ResourceManager; -import magic.cardBuilder.CardResource; public class PTFrame { diff --git a/src/magic/cardBuilder/renderers/TitleFrame.java b/src/magic/cardBuilder/renderers/TitleFrame.java index 8661e53dec..a058e59089 100644 --- a/src/magic/cardBuilder/renderers/TitleFrame.java +++ b/src/magic/cardBuilder/renderers/TitleFrame.java @@ -14,13 +14,14 @@ import java.awt.geom.Ellipse2D; import java.awt.image.BufferedImage; import java.text.AttributedString; import java.util.List; -import javax.swing.ImageIcon; -import magic.awt.MagicFont; +import javax.swing.ImageIcon; + +import magic.awt.MagicFont; import magic.data.MagicIcon; +import magic.model.IRenderableCard; import magic.model.MagicType; import magic.ui.MagicImages; -import magic.model.IRenderableCard; public class TitleFrame { diff --git a/src/magic/cardBuilder/renderers/TypeLine.java b/src/magic/cardBuilder/renderers/TypeLine.java index a3abb8c014..359aee7d82 100644 --- a/src/magic/cardBuilder/renderers/TypeLine.java +++ b/src/magic/cardBuilder/renderers/TypeLine.java @@ -7,12 +7,12 @@ import java.awt.FontMetrics; import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.image.BufferedImage; -import magic.awt.MagicFont; -import magic.model.MagicType; -import magic.model.IRenderableCard; -import magic.cardBuilder.ResourceManager; +import magic.awt.MagicFont; import magic.cardBuilder.CardResource; +import magic.cardBuilder.ResourceManager; +import magic.model.IRenderableCard; +import magic.model.MagicType; public class TypeLine { private static final Font cardTypeFont = MagicFont.JaceBelerenBold.get().deriveFont(Font.PLAIN, 16); diff --git a/src/magic/data/CardDefinitions.java b/src/magic/data/CardDefinitions.java index 565756cec0..dd2897669b 100644 --- a/src/magic/data/CardDefinitions.java +++ b/src/magic/data/CardDefinitions.java @@ -1,7 +1,7 @@ package magic.data; -import groovy.lang.GroovyShell; -import groovy.transform.CompileStatic; +import static java.nio.charset.StandardCharsets.UTF_8; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -27,6 +27,13 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.Stream; + +import org.codehaus.groovy.control.CompilerConfiguration; +import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer; +import org.codehaus.groovy.control.customizers.ImportCustomizer; + +import groovy.lang.GroovyShell; +import groovy.transform.CompileStatic; import magic.model.MagicCardDefinition; import magic.model.MagicChangeCardDefinition; import magic.model.MagicColor; @@ -37,10 +44,6 @@ import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem.DataPath; import magic.utility.MagicSystem; import magic.utility.ProgressReporter; -import org.codehaus.groovy.control.CompilerConfiguration; -import org.codehaus.groovy.control.customizers.ASTTransformationCustomizer; -import org.codehaus.groovy.control.customizers.ImportCustomizer; -import static java.nio.charset.StandardCharsets.UTF_8; public class CardDefinitions { diff --git a/src/magic/data/CardImageFile.java b/src/magic/data/CardImageFile.java index 452494946c..0115950cae 100644 --- a/src/magic/data/CardImageFile.java +++ b/src/magic/data/CardImageFile.java @@ -2,6 +2,7 @@ package magic.data; import java.net.MalformedURLException; import java.net.URL; + import magic.model.IRenderableCard; import magic.model.MagicCardDefinition; import magic.utility.MagicFileSystem; diff --git a/src/magic/data/CardStatistics.java b/src/magic/data/CardStatistics.java index 07993331cc..19886a8318 100644 --- a/src/magic/data/CardStatistics.java +++ b/src/magic/data/CardStatistics.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; + import magic.model.MagicCardDefinition; import magic.model.MagicColor; import magic.model.MagicManaCost; diff --git a/src/magic/data/DeckGenerator.java b/src/magic/data/DeckGenerator.java index 8d3ab30453..a3a3020b6f 100644 --- a/src/magic/data/DeckGenerator.java +++ b/src/magic/data/DeckGenerator.java @@ -1,6 +1,7 @@ package magic.data; import java.util.Collection; + import magic.generator.RandomDeckGenerator; import magic.model.MagicCardDefinition; import magic.model.MagicColor; diff --git a/src/magic/data/DeckGenerators.java b/src/magic/data/DeckGenerators.java index 712355dfe7..c341e3614f 100644 --- a/src/magic/data/DeckGenerators.java +++ b/src/magic/data/DeckGenerators.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.Scanner; import java.util.Set; import java.util.TreeMap; + import magic.generator.RandomDeckGenerator; import magic.model.DuelPlayerConfig; import magic.model.MagicDeck; diff --git a/src/magic/data/DeckType.java b/src/magic/data/DeckType.java index b5f36acc1b..7997a8557f 100644 --- a/src/magic/data/DeckType.java +++ b/src/magic/data/DeckType.java @@ -3,6 +3,7 @@ package magic.data; import java.nio.file.Path; import java.util.EnumSet; import java.util.Set; + import magic.translate.MText; import magic.utility.DeckUtils; diff --git a/src/magic/data/DownloadableFile.java b/src/magic/data/DownloadableFile.java index 4d3d9b35e6..05126da586 100644 --- a/src/magic/data/DownloadableFile.java +++ b/src/magic/data/DownloadableFile.java @@ -10,6 +10,7 @@ import java.net.Proxy; import java.net.URL; import java.nio.file.Files; import java.nio.file.StandardCopyOption; + import org.apache.commons.io.FileUtils; public class DownloadableFile { diff --git a/src/magic/data/DuelConfig.java b/src/magic/data/DuelConfig.java index c39c5aecd3..ebb7b266f3 100644 --- a/src/magic/data/DuelConfig.java +++ b/src/magic/data/DuelConfig.java @@ -2,6 +2,7 @@ package magic.data; import java.io.File; import java.util.Properties; + import magic.model.DuelPlayerConfig; import magic.model.MagicDeckProfile; import magic.model.MagicDuel; diff --git a/src/magic/data/GeneralConfig.java b/src/magic/data/GeneralConfig.java index 7a0ea0b99d..cf5588a22b 100644 --- a/src/magic/data/GeneralConfig.java +++ b/src/magic/data/GeneralConfig.java @@ -10,6 +10,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Properties; + import magic.data.settings.BooleanSetting; import magic.data.settings.IntegerSetting; import magic.data.settings.StringSetting; diff --git a/src/magic/data/ImagesDownloadList.java b/src/magic/data/ImagesDownloadList.java index e02f0f88d3..5edeb12521 100644 --- a/src/magic/data/ImagesDownloadList.java +++ b/src/magic/data/ImagesDownloadList.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.stream.Collectors; import java.util.stream.Stream; + import magic.model.MagicCardDefinition; @SuppressWarnings("serial") diff --git a/src/magic/data/MagicCustomFormat.java b/src/magic/data/MagicCustomFormat.java index 710059b6c7..8eb9475778 100644 --- a/src/magic/data/MagicCustomFormat.java +++ b/src/magic/data/MagicCustomFormat.java @@ -1,19 +1,19 @@ package magic.data; -import java.util.Set; -import java.util.HashSet; -import java.util.List; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; import java.io.File; import java.io.FileFilter; import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import magic.model.MagicCardDefinition; import magic.utility.FileIO; import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem.DataPath; -import magic.model.MagicCardDefinition; public class MagicCustomFormat extends MagicFormat { diff --git a/src/magic/data/MagicFormat.java b/src/magic/data/MagicFormat.java index c5efaa445a..e8c4b9e90f 100644 --- a/src/magic/data/MagicFormat.java +++ b/src/magic/data/MagicFormat.java @@ -1,8 +1,9 @@ package magic.data; -import java.util.List; import java.util.ArrayList; +import java.util.List; import java.util.stream.Collectors; + import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.translate.MText; diff --git a/src/magic/data/MagicPredefinedFormat.java b/src/magic/data/MagicPredefinedFormat.java index 63f303495e..b548bf7a8b 100644 --- a/src/magic/data/MagicPredefinedFormat.java +++ b/src/magic/data/MagicPredefinedFormat.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Scanner; + import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.utility.DeckUtils; diff --git a/src/magic/data/MagicSetDefinitions.java b/src/magic/data/MagicSetDefinitions.java index ba51389be6..4121a4ea7f 100644 --- a/src/magic/data/MagicSetDefinitions.java +++ b/src/magic/data/MagicSetDefinitions.java @@ -2,13 +2,13 @@ package magic.data; import static java.nio.charset.StandardCharsets.UTF_8; -import java.awt.Desktop; import java.io.IOException; import java.io.PrintWriter; import java.nio.file.Path; import java.util.HashMap; import java.util.List; import java.util.Scanner; + import magic.model.MagicCardDefinition; import magic.model.MagicSetDefinition; import magic.ui.helpers.DesktopHelper; diff --git a/src/magic/data/UnimplementedParser.java b/src/magic/data/UnimplementedParser.java index bd90bcfe1c..174c47e8e3 100644 --- a/src/magic/data/UnimplementedParser.java +++ b/src/magic/data/UnimplementedParser.java @@ -4,14 +4,15 @@ import static java.nio.charset.StandardCharsets.UTF_8; import java.io.File; import java.io.FileNotFoundException; -import java.io.UnsupportedEncodingException; import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Properties; + import magic.model.MagicCardDefinition; import magic.utility.FileIO; import magic.utility.MagicFileSystem; diff --git a/src/magic/data/json/DownloadableJsonFile.java b/src/magic/data/json/DownloadableJsonFile.java index c8e47fa4e7..f00536889b 100644 --- a/src/magic/data/json/DownloadableJsonFile.java +++ b/src/magic/data/json/DownloadableJsonFile.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URL; + import magic.data.DownloadableFile; public class DownloadableJsonFile extends DownloadableFile { diff --git a/src/magic/data/json/NewVersionJsonParser.java b/src/magic/data/json/NewVersionJsonParser.java index 6c4759a815..4d8f38fd83 100644 --- a/src/magic/data/json/NewVersionJsonParser.java +++ b/src/magic/data/json/NewVersionJsonParser.java @@ -2,10 +2,12 @@ package magic.data.json; import java.io.File; import java.io.IOException; + +import org.json.JSONObject; + import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem.DataPath; import magic.utility.MagicSystem; -import org.json.JSONObject; public final class NewVersionJsonParser { private NewVersionJsonParser() {} diff --git a/src/magic/data/settings/IntegerSetting.java b/src/magic/data/settings/IntegerSetting.java index 9af1900c31..f7f98a593c 100644 --- a/src/magic/data/settings/IntegerSetting.java +++ b/src/magic/data/settings/IntegerSetting.java @@ -1,6 +1,7 @@ package magic.data.settings; import java.awt.Color; + import magic.ui.MagicStickyFrame; public enum IntegerSetting { diff --git a/src/magic/data/stats/MagicStats.java b/src/magic/data/stats/MagicStats.java index 8a2b1f38f3..ec9ff8b3ee 100644 --- a/src/magic/data/stats/MagicStats.java +++ b/src/magic/data/stats/MagicStats.java @@ -3,6 +3,9 @@ package magic.data.stats; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; + +import org.h2.api.ErrorCode; + import magic.data.DeckType; import magic.data.DuelConfig; import magic.data.GeneralConfig; @@ -13,7 +16,6 @@ import magic.model.MagicGame; import magic.ui.ScreenController; import magic.utility.DeckUtils; import magic.utility.MagicSystem; -import org.h2.api.ErrorCode; public final class MagicStats { private MagicStats() {} diff --git a/src/magic/data/stats/h2/H2Database.java b/src/magic/data/stats/h2/H2Database.java index a4bd040544..2f66a1ce7b 100644 --- a/src/magic/data/stats/h2/H2Database.java +++ b/src/magic/data/stats/h2/H2Database.java @@ -11,6 +11,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; import java.util.stream.IntStream; + +import org.h2.jdbcx.JdbcConnectionPool; + import magic.data.stats.DeckStatsInfo; import magic.data.stats.GameStatsInfo; import magic.model.MagicDeck; @@ -21,7 +24,6 @@ import magic.model.player.PlayerProfile; import magic.utility.DeckUtils; import magic.utility.MagicFileSystem; import magic.utility.MagicSystem; -import org.h2.jdbcx.JdbcConnectionPool; public class H2Database { diff --git a/src/magic/data/stats/h2/H2Schema.java b/src/magic/data/stats/h2/H2Schema.java index e1e1a1ee4f..d024582a47 100644 --- a/src/magic/data/stats/h2/H2Schema.java +++ b/src/magic/data/stats/h2/H2Schema.java @@ -4,9 +4,11 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import magic.utility.MagicResources; + import org.h2.tools.RunScript; +import magic.utility.MagicResources; + enum H2Schema { /** diff --git a/src/magic/exception/handler/ExceptionReport.java b/src/magic/exception/handler/ExceptionReport.java index bccf2911a6..7873eecae6 100644 --- a/src/magic/exception/handler/ExceptionReport.java +++ b/src/magic/exception/handler/ExceptionReport.java @@ -2,8 +2,11 @@ package magic.exception.handler; import java.io.PrintWriter; import java.io.StringWriter; + +import magic.exception.GameException; import magic.model.MagicCard; import magic.model.MagicGame; +import magic.model.MagicLogger; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; import magic.model.MagicPlayer; @@ -11,8 +14,6 @@ import magic.model.MagicPowerToughness; import magic.model.action.MagicAction; import magic.model.stack.MagicItemOnStack; import magic.utility.MagicSystem; -import magic.exception.GameException; -import magic.model.MagicLogger; public class ExceptionReport { diff --git a/src/magic/exception/handler/FileExceptionHandler.java b/src/magic/exception/handler/FileExceptionHandler.java index 965c182b3d..30f061153c 100644 --- a/src/magic/exception/handler/FileExceptionHandler.java +++ b/src/magic/exception/handler/FileExceptionHandler.java @@ -2,6 +2,7 @@ package magic.exception.handler; import java.io.IOException; import java.nio.file.Path; + import magic.utility.FileIO; import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem.DataPath; diff --git a/src/magic/firemind/FiremindClient.java b/src/magic/firemind/FiremindClient.java index ebb7f9fc48..b21aca1eb4 100644 --- a/src/magic/firemind/FiremindClient.java +++ b/src/magic/firemind/FiremindClient.java @@ -22,15 +22,17 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.TimeZone; -import magic.data.CardDefinitions; -import magic.data.GeneralConfig; -import magic.utility.MagicFileSystem; -import magic.utility.MagicFileSystem.DataPath; + import org.apache.commons.io.FileUtils; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import magic.data.CardDefinitions; +import magic.data.GeneralConfig; +import magic.utility.MagicFileSystem; +import magic.utility.MagicFileSystem.DataPath; + public class FiremindClient { protected static final GeneralConfig CONFIG = GeneralConfig.getInstance(); diff --git a/src/magic/firemind/FiremindDuelRunner.java b/src/magic/firemind/FiremindDuelRunner.java index b6e7db88b3..fe3cb6db9f 100644 --- a/src/magic/firemind/FiremindDuelRunner.java +++ b/src/magic/firemind/FiremindDuelRunner.java @@ -1,5 +1,7 @@ package magic.firemind; +import static java.nio.charset.StandardCharsets.UTF_8; + import java.io.BufferedWriter; import java.io.File; import java.io.IOException; @@ -10,6 +12,7 @@ import java.nio.file.Files; import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; + import magic.ai.MagicAIImpl; import magic.data.CardDefinitions; import magic.data.DuelConfig; @@ -25,7 +28,6 @@ import magic.model.MagicRandom; import magic.model.player.AiProfile; import magic.utility.DeckUtils; import magic.utility.MagicSystem; -import static java.nio.charset.StandardCharsets.UTF_8; public class FiremindDuelRunner { private static int games; diff --git a/src/magic/firemind/FiremindGameReport.java b/src/magic/firemind/FiremindGameReport.java index 6f84c036da..b888a73829 100644 --- a/src/magic/firemind/FiremindGameReport.java +++ b/src/magic/firemind/FiremindGameReport.java @@ -1,23 +1,23 @@ package magic.firemind; -import magic.utility.FileIO; -import magic.model.action.MagicAction; -import magic.model.stack.MagicItemOnStack; -import magic.utility.MagicFileSystem; -import magic.utility.MagicFileSystem.DataPath; - import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.Date; + import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; import magic.model.MagicPlayer; import magic.model.MagicPowerToughness; +import magic.model.action.MagicAction; +import magic.model.stack.MagicItemOnStack; +import magic.utility.FileIO; +import magic.utility.MagicFileSystem; +import magic.utility.MagicFileSystem.DataPath; import magic.utility.MagicSystem; public class FiremindGameReport implements Thread.UncaughtExceptionHandler { diff --git a/src/magic/firemind/FiremindJsonReader.java b/src/magic/firemind/FiremindJsonReader.java index 25a53ad890..0aac1ac1b3 100644 --- a/src/magic/firemind/FiremindJsonReader.java +++ b/src/magic/firemind/FiremindJsonReader.java @@ -6,12 +6,14 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Calendar; import java.util.List; + +import org.apache.commons.io.FileUtils; + import magic.data.json.DownloadableJsonFile; import magic.model.MagicDeck; import magic.utility.DeckUtils; import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem.DataPath; -import org.apache.commons.io.FileUtils; public final class FiremindJsonReader { private FiremindJsonReader() {} diff --git a/src/magic/firemind/JsonOrgParser.java b/src/magic/firemind/JsonOrgParser.java index fa52743f0b..4f4bdf4166 100644 --- a/src/magic/firemind/JsonOrgParser.java +++ b/src/magic/firemind/JsonOrgParser.java @@ -5,12 +5,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import magic.utility.DeckUtils; + +import org.json.JSONArray; +import org.json.JSONObject; + import magic.data.json.DownloadableJsonFile; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; -import org.json.JSONArray; -import org.json.JSONObject; +import magic.utility.DeckUtils; public final class JsonOrgParser { private JsonOrgParser() {} diff --git a/src/magic/game/state/GameLoader.java b/src/magic/game/state/GameLoader.java index 8173dda2fd..db540a8cd3 100644 --- a/src/magic/game/state/GameLoader.java +++ b/src/magic/game/state/GameLoader.java @@ -2,6 +2,7 @@ package magic.game.state; import java.io.File; import java.util.List; + import magic.ai.MagicAIImpl; import magic.model.DuelPlayerConfig; import magic.model.MagicDeckProfile; diff --git a/src/magic/game/state/GamePlayerState.java b/src/magic/game/state/GamePlayerState.java index b8d36f3e98..eabd7adaf5 100644 --- a/src/magic/game/state/GamePlayerState.java +++ b/src/magic/game/state/GamePlayerState.java @@ -2,6 +2,7 @@ package magic.game.state; import java.util.ArrayList; import java.util.List; + import magic.model.DuelPlayerConfig; public class GamePlayerState { diff --git a/src/magic/game/state/GameStateFileReader.java b/src/magic/game/state/GameStateFileReader.java index 9d716f3b1b..5f5a9c73ee 100644 --- a/src/magic/game/state/GameStateFileReader.java +++ b/src/magic/game/state/GameStateFileReader.java @@ -4,6 +4,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Properties; + import magic.utility.FileIO; public final class GameStateFileReader { diff --git a/src/magic/game/state/GameStateFileWriter.java b/src/magic/game/state/GameStateFileWriter.java index 5d96497b2e..11e541e578 100644 --- a/src/magic/game/state/GameStateFileWriter.java +++ b/src/magic/game/state/GameStateFileWriter.java @@ -5,6 +5,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.List; import java.util.Properties; + import magic.utility.MagicFileSystem; import magic.utility.MagicSystem; import magic.utility.SortedProperties; diff --git a/src/magic/game/state/GameStateSnapshot.java b/src/magic/game/state/GameStateSnapshot.java index 648313b2f0..526d7bdaeb 100644 --- a/src/magic/game/state/GameStateSnapshot.java +++ b/src/magic/game/state/GameStateSnapshot.java @@ -3,13 +3,14 @@ package magic.game.state; import java.util.HashMap; import java.util.List; import java.util.Map; + +import magic.model.DuelPlayerConfig; import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPlayer; -import magic.model.DuelPlayerConfig; public final class GameStateSnapshot { private GameStateSnapshot() {} diff --git a/src/magic/generator/Ability_Mono_DeckGenerator.java b/src/magic/generator/Ability_Mono_DeckGenerator.java index b09675bcd3..aca2972f46 100644 --- a/src/magic/generator/Ability_Mono_DeckGenerator.java +++ b/src/magic/generator/Ability_Mono_DeckGenerator.java @@ -1,5 +1,8 @@ package magic.generator; +import java.util.ArrayList; +import java.util.HashMap; + import magic.data.CardDefinitions; import magic.model.MagicAbility; import magic.model.MagicCardDefinition; @@ -7,9 +10,6 @@ import magic.model.MagicColor; import magic.model.MagicDeckProfile; import magic.model.MagicRandom; -import java.util.ArrayList; -import java.util.HashMap; - public class Ability_Mono_DeckGenerator extends RandomDeckGenerator { private static final int MIN_NUM_CARDS_WITH_SUBTYPE = 30; diff --git a/src/magic/generator/Tribal_Mono_DeckGenerator.java b/src/magic/generator/Tribal_Mono_DeckGenerator.java index a098bbeac5..105786acb1 100644 --- a/src/magic/generator/Tribal_Mono_DeckGenerator.java +++ b/src/magic/generator/Tribal_Mono_DeckGenerator.java @@ -1,14 +1,14 @@ package magic.generator; +import java.util.ArrayList; +import java.util.HashMap; + import magic.data.CardDefinitions; import magic.model.MagicCardDefinition; import magic.model.MagicColor; import magic.model.MagicDeckProfile; -import magic.model.MagicSubType; import magic.model.MagicRandom; - -import java.util.ArrayList; -import java.util.HashMap; +import magic.model.MagicSubType; public class Tribal_Mono_DeckGenerator extends RandomDeckGenerator { diff --git a/src/magic/headless/HeadlessGameController.java b/src/magic/headless/HeadlessGameController.java index d356e3d896..ed3411f2ba 100644 --- a/src/magic/headless/HeadlessGameController.java +++ b/src/magic/headless/HeadlessGameController.java @@ -1,10 +1,10 @@ package magic.headless; import magic.ai.MagicAI; +import magic.model.IGameController; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.event.MagicEvent; -import magic.model.IGameController; public class HeadlessGameController implements IGameController { diff --git a/src/magic/model/ARG.java b/src/magic/model/ARG.java index ecccc4b74a..ad38ba4a39 100644 --- a/src/magic/model/ARG.java +++ b/src/magic/model/ARG.java @@ -4,15 +4,16 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.regex.Matcher; + import magic.data.EnglishToInt; import magic.data.RomanToInt; import magic.model.action.MagicPlayMod; import magic.model.event.MagicEvent; import magic.model.stack.MagicItemOnStack; import magic.model.target.MagicTarget; -import magic.model.target.MagicTargetHint; import magic.model.target.MagicTargetFilter; import magic.model.target.MagicTargetFilterFactory; +import magic.model.target.MagicTargetHint; public class ARG { public static final String COLON = "\\s*:\\s*"; diff --git a/src/magic/model/DuelPlayerConfig.java b/src/magic/model/DuelPlayerConfig.java index 3543301244..b7461c1a3a 100644 --- a/src/magic/model/DuelPlayerConfig.java +++ b/src/magic/model/DuelPlayerConfig.java @@ -3,6 +3,7 @@ package magic.model; import java.util.HashMap; import java.util.Map; import java.util.Properties; + import magic.data.DeckType; import magic.model.player.PlayerProfile; import magic.utility.DeckParser; diff --git a/src/magic/model/IRenderableCard.java b/src/magic/model/IRenderableCard.java index 3512ec18db..2c6e490be9 100644 --- a/src/magic/model/IRenderableCard.java +++ b/src/magic/model/IRenderableCard.java @@ -5,6 +5,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; + import magic.model.event.MagicManaActivation; public interface IRenderableCard { diff --git a/src/magic/model/IUIGameController.java b/src/magic/model/IUIGameController.java index 583c4a2a0e..89d6b810fa 100644 --- a/src/magic/model/IUIGameController.java +++ b/src/magic/model/IUIGameController.java @@ -2,6 +2,7 @@ package magic.model; import java.util.List; import java.util.Set; + import magic.exception.UndoClickedException; import magic.model.choice.MagicPlayChoiceResult; diff --git a/src/magic/model/MagicAbility.java b/src/magic/model/MagicAbility.java index ed49fe280a..15e0487a2d 100644 --- a/src/magic/model/MagicAbility.java +++ b/src/magic/model/MagicAbility.java @@ -11,12 +11,131 @@ import magic.exception.ScriptParseException; import magic.model.condition.MagicCondition; import magic.model.condition.MagicConditionFactory; import magic.model.condition.MagicConditionParser; -import magic.model.event.*; +import magic.model.event.MagicAdditionalCost; +import magic.model.event.MagicBestowActivation; +import magic.model.event.MagicCardAbilityActivation; +import magic.model.event.MagicCrewActivation; +import magic.model.event.MagicCyclingActivation; +import magic.model.event.MagicDashActivation; +import magic.model.event.MagicETBEvent; +import magic.model.event.MagicEmbalmActivation; +import magic.model.event.MagicEquipActivation; +import magic.model.event.MagicEternalizeActivation; +import magic.model.event.MagicEventFactory; +import magic.model.event.MagicEvokeActivation; +import magic.model.event.MagicFlashbackActivation; +import magic.model.event.MagicHandCastActivation; +import magic.model.event.MagicJumpStartActivation; +import magic.model.event.MagicKickerCost; +import magic.model.event.MagicLevelUpActivation; +import magic.model.event.MagicManaActivation; +import magic.model.event.MagicMatchedCostEvent; +import magic.model.event.MagicMegamorphActivation; +import magic.model.event.MagicMorphActivation; +import magic.model.event.MagicMorphCastActivation; +import magic.model.event.MagicMultikickerCost; +import magic.model.event.MagicNinjutsuActivation; +import magic.model.event.MagicOutlastActivation; +import magic.model.event.MagicPermanentActivation; +import magic.model.event.MagicPlaneswalkerActivation; +import magic.model.event.MagicRegularCostEvent; +import magic.model.event.MagicReinforceActivation; +import magic.model.event.MagicRetraceActivation; +import magic.model.event.MagicRuleEventAction; +import magic.model.event.MagicSacrificeManaActivation; +import magic.model.event.MagicSacrificeTapManaActivation; +import magic.model.event.MagicScavengeActivation; +import magic.model.event.MagicSourceEvent; +import magic.model.event.MagicSpectacleActivation; +import magic.model.event.MagicSurgeActivation; +import magic.model.event.MagicSuspendActivation; +import magic.model.event.MagicTransmuteActivation; +import magic.model.event.MagicTypeCyclingActivation; +import magic.model.event.MagicUnearthActivation; import magic.model.mstatic.MagicCDA; import magic.model.mstatic.MagicStatic; import magic.model.target.MagicTargetFilter; import magic.model.target.MagicTargetFilterFactory; -import magic.model.trigger.*; +import magic.model.trigger.ACounterIsPutTrigger; +import magic.model.trigger.AnnihilatorTrigger; +import magic.model.trigger.AtBeginOfCombatTrigger; +import magic.model.trigger.AtDrawTrigger; +import magic.model.trigger.AtEndOfCombatTrigger; +import magic.model.trigger.AtEndOfTurnTrigger; +import magic.model.trigger.AtUntapTrigger; +import magic.model.trigger.AtUpkeepTrigger; +import magic.model.trigger.AtYourUpkeepTrigger; +import magic.model.trigger.AttacksTrigger; +import magic.model.trigger.AttacksUnblockedTrigger; +import magic.model.trigger.BattalionTrigger; +import magic.model.trigger.BattleCryTrigger; +import magic.model.trigger.BecomesBlockedPumpTrigger; +import magic.model.trigger.BecomesBlockedTrigger; +import magic.model.trigger.BecomesStateTrigger; +import magic.model.trigger.BecomesTappedTrigger; +import magic.model.trigger.BecomesTargetTrigger; +import magic.model.trigger.BecomesUntappedTrigger; +import magic.model.trigger.BlocksPumpTrigger; +import magic.model.trigger.BlocksTrigger; +import magic.model.trigger.BloodthirstTrigger; +import magic.model.trigger.CantBeBlockedTrigger; +import magic.model.trigger.CantBlockTrigger; +import magic.model.trigger.CardIsDiscardedTrigger; +import magic.model.trigger.CascadeTrigger; +import magic.model.trigger.ChampionTrigger; +import magic.model.trigger.CumulativeUpkeepTrigger; +import magic.model.trigger.DamageIsDealtTrigger; +import magic.model.trigger.DethroneTrigger; +import magic.model.trigger.DevourTrigger; +import magic.model.trigger.EchoTrigger; +import magic.model.trigger.EntersBattlefieldTrigger; +import magic.model.trigger.EntersTappedTrigger; +import magic.model.trigger.EntersWithCounterTrigger; +import magic.model.trigger.ExaltedTrigger; +import magic.model.trigger.ExtortTrigger; +import magic.model.trigger.FadeVanishCounterTrigger; +import magic.model.trigger.FlankingTrigger; +import magic.model.trigger.FromGraveyardIntoLibraryTrigger; +import magic.model.trigger.HeroicTrigger; +import magic.model.trigger.LeavesBattlefieldTrigger; +import magic.model.trigger.LeavesReturnExiledTrigger; +import magic.model.trigger.LifeIsGainedTrigger; +import magic.model.trigger.LivingWeaponTrigger; +import magic.model.trigger.MadnessTrigger; +import magic.model.trigger.MiracleTrigger; +import magic.model.trigger.ModularTrigger; +import magic.model.trigger.OneOrMoreCountersArePutTrigger; +import magic.model.trigger.OtherCycleTrigger; +import magic.model.trigger.OtherDiesTrigger; +import magic.model.trigger.OtherDrawnTrigger; +import magic.model.trigger.OtherEntersBattlefieldTrigger; +import magic.model.trigger.OtherSpellIsCastTrigger; +import magic.model.trigger.PersistTrigger; +import magic.model.trigger.PreventDamageTrigger; +import magic.model.trigger.ProtectionTrigger; +import magic.model.trigger.ProwessTrigger; +import magic.model.trigger.RampageTrigger; +import magic.model.trigger.SacrificeTrigger; +import magic.model.trigger.SagaChapterTrigger; +import magic.model.trigger.SoulshiftTrigger; +import magic.model.trigger.StormTrigger; +import magic.model.trigger.ThisAttacksTrigger; +import magic.model.trigger.ThisBecomesBlockedByTrigger; +import magic.model.trigger.ThisBecomesBlockedTrigger; +import magic.model.trigger.ThisBecomesTargetTrigger; +import magic.model.trigger.ThisBlocksTrigger; +import magic.model.trigger.ThisCombatDamagePlayerTrigger; +import magic.model.trigger.ThisCycleTrigger; +import magic.model.trigger.ThisDiesTrigger; +import magic.model.trigger.ThisPutIntoGraveyardTrigger; +import magic.model.trigger.ThisSpellIsCastTrigger; +import magic.model.trigger.TributeTrigger; +import magic.model.trigger.TurnedFaceUpTrigger; +import magic.model.trigger.UndyingTrigger; +import magic.model.trigger.UnleashTrigger; +import magic.model.trigger.WhenTransformsTrigger; +import magic.model.trigger.YouScryTrigger; +import magic.model.trigger.YouSurveilTrigger; public enum MagicAbility { diff --git a/src/magic/model/MagicAbilityList.java b/src/magic/model/MagicAbilityList.java index 430bdf5c74..d629e7c751 100644 --- a/src/magic/model/MagicAbilityList.java +++ b/src/magic/model/MagicAbilityList.java @@ -1,17 +1,17 @@ package magic.model; -import magic.model.event.MagicActivation; -import magic.model.event.MagicManaActivation; -import magic.model.event.MagicPermanentActivation; -import magic.model.trigger.MagicTrigger; -import magic.model.mstatic.MagicStatic; -import magic.model.action.AddTriggerAction; -import magic.model.action.AddStaticAction; - import java.util.LinkedList; import java.util.List; import java.util.Set; +import magic.model.action.AddStaticAction; +import magic.model.action.AddTriggerAction; +import magic.model.event.MagicActivation; +import magic.model.event.MagicManaActivation; +import magic.model.event.MagicPermanentActivation; +import magic.model.mstatic.MagicStatic; +import magic.model.trigger.MagicTrigger; + public class MagicAbilityList implements MagicAbilityStore { private List abilities = new LinkedList<>(); diff --git a/src/magic/model/MagicCardDefinition.java b/src/magic/model/MagicCardDefinition.java index 2cb126a2a4..bc2b9f0d45 100644 --- a/src/magic/model/MagicCardDefinition.java +++ b/src/magic/model/MagicCardDefinition.java @@ -1,14 +1,34 @@ package magic.model; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.EnumSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Set; import magic.ai.ArtificialScoringSystem; import magic.data.CardDefinitions; import magic.data.CardProperty; -import magic.model.event.*; +import magic.model.condition.MagicCondition; +import magic.model.event.MagicActivation; +import magic.model.event.MagicActivationHints; +import magic.model.event.MagicAdditionalCost; +import magic.model.event.MagicCardEvent; +import magic.model.event.MagicEvent; +import magic.model.event.MagicEventSource; +import magic.model.event.MagicHandCastActivation; +import magic.model.event.MagicManaActivation; +import magic.model.event.MagicPayManaCostEvent; +import magic.model.event.MagicPermanentActivation; +import magic.model.event.MagicPlayCardEvent; +import magic.model.event.MagicTiming; import magic.model.mstatic.MagicCDA; import magic.model.mstatic.MagicStatic; -import magic.model.condition.MagicCondition; import magic.model.trigger.AtBeginOfFirstMainPhaseTrigger; import magic.model.trigger.EntersBattlefieldTrigger; import magic.model.trigger.EntersWithCounterTrigger; diff --git a/src/magic/model/MagicColor.java b/src/magic/model/MagicColor.java index 0d187c68cd..08e66eb018 100644 --- a/src/magic/model/MagicColor.java +++ b/src/magic/model/MagicColor.java @@ -1,10 +1,11 @@ package magic.model; -import java.util.Iterator; import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import java.util.EnumSet; +import java.util.Iterator; +import java.util.List; + import magic.translate.MText; public enum MagicColor { diff --git a/src/magic/model/MagicDeck.java b/src/magic/model/MagicDeck.java index c2b1ad11ff..c14d5b1390 100644 --- a/src/magic/model/MagicDeck.java +++ b/src/magic/model/MagicDeck.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; + import magic.data.DeckType; import magic.utility.DeckUtils; diff --git a/src/magic/model/MagicDuel.java b/src/magic/model/MagicDuel.java index 277015c194..b8119163fd 100644 --- a/src/magic/model/MagicDuel.java +++ b/src/magic/model/MagicDuel.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.util.Properties; + import magic.data.DeckGenerators; import magic.data.DuelConfig; import magic.data.stats.MagicStats; diff --git a/src/magic/model/MagicGame.java b/src/magic/model/MagicGame.java index a0527be5d7..6422f565e9 100644 --- a/src/magic/model/MagicGame.java +++ b/src/magic/model/MagicGame.java @@ -8,6 +8,7 @@ import java.util.Collections; import java.util.List; import java.util.SortedSet; import java.util.TreeSet; + import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.exception.GameException; @@ -46,6 +47,7 @@ import magic.model.target.MagicTargetFilterFactory; import magic.model.target.MagicTargetHint; import magic.model.target.MagicTargetNone; import magic.model.trigger.AtEndOfTurnTrigger; +import magic.model.trigger.AtUpkeepTrigger; import magic.model.trigger.DamageIsDealtTrigger; import magic.model.trigger.MagicPermanentTrigger; import magic.model.trigger.MagicPermanentTriggerMap; @@ -53,7 +55,6 @@ import magic.model.trigger.MagicTrigger; import magic.model.trigger.MagicTriggerType; import magic.model.trigger.OtherEntersBattlefieldTrigger; import magic.model.trigger.PreventDamageTrigger; -import magic.model.trigger.AtUpkeepTrigger; import magic.ui.MagicSound; public class MagicGame { diff --git a/src/magic/model/MagicGameLog.java b/src/magic/model/MagicGameLog.java index 4c8a22a1f7..0f6b3ce6d2 100644 --- a/src/magic/model/MagicGameLog.java +++ b/src/magic/model/MagicGameLog.java @@ -1,11 +1,13 @@ package magic.model; +import static java.nio.charset.StandardCharsets.UTF_8; + import java.io.FileNotFoundException; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; + import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem.DataPath; -import static java.nio.charset.StandardCharsets.UTF_8; public class MagicGameLog { private MagicGameLog() {} diff --git a/src/magic/model/MagicLogBook.java b/src/magic/model/MagicLogBook.java index 00f5793f2b..7013ae9d3b 100644 --- a/src/magic/model/MagicLogBook.java +++ b/src/magic/model/MagicLogBook.java @@ -3,6 +3,7 @@ package magic.model; import java.util.ArrayList; import java.util.List; import java.util.ListIterator; + import magic.utility.MagicSystem; public class MagicLogBook { diff --git a/src/magic/model/MagicLogMessageBuilder.java b/src/magic/model/MagicLogMessageBuilder.java index 13c8815a43..b74e1adac2 100644 --- a/src/magic/model/MagicLogMessageBuilder.java +++ b/src/magic/model/MagicLogMessageBuilder.java @@ -1,7 +1,7 @@ package magic.model; -import java.util.List; import java.util.ArrayList; +import java.util.List; public class MagicLogMessageBuilder { diff --git a/src/magic/model/MagicLogger.java b/src/magic/model/MagicLogger.java index adbde9b0ba..b247bd814a 100644 --- a/src/magic/model/MagicLogger.java +++ b/src/magic/model/MagicLogger.java @@ -1,14 +1,16 @@ package magic.model; +import static java.nio.charset.StandardCharsets.UTF_8; + import java.io.File; import java.io.FileNotFoundException; import java.io.PrintWriter; import java.io.UnsupportedEncodingException; import java.text.SimpleDateFormat; import java.util.Date; + import magic.utility.MagicFileSystem; import magic.utility.MagicSystem; -import static java.nio.charset.StandardCharsets.UTF_8; public class MagicLogger { diff --git a/src/magic/model/MagicMessage.java b/src/magic/model/MagicMessage.java index c916d0a02f..ac82586730 100644 --- a/src/magic/model/MagicMessage.java +++ b/src/magic/model/MagicMessage.java @@ -6,6 +6,7 @@ import java.util.Iterator; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; + import magic.model.choice.MagicCardChoiceResult; import magic.model.phase.MagicPhaseType; import magic.model.stack.MagicCardOnStack; diff --git a/src/magic/model/MagicPermanent.java b/src/magic/model/MagicPermanent.java index 3e423aef0f..779331ce23 100644 --- a/src/magic/model/MagicPermanent.java +++ b/src/magic/model/MagicPermanent.java @@ -1,5 +1,6 @@ package magic.model; +import java.util.AbstractMap.SimpleImmutableEntry; import java.util.Collection; import java.util.Collections; import java.util.EnumMap; @@ -9,7 +10,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.AbstractMap.SimpleImmutableEntry; import java.util.Set; import magic.ai.ArtificialScoringSystem; diff --git a/src/magic/model/MagicPermanentList.java b/src/magic/model/MagicPermanentList.java index 7e69593e08..6a5110aace 100644 --- a/src/magic/model/MagicPermanentList.java +++ b/src/magic/model/MagicPermanentList.java @@ -1,8 +1,8 @@ package magic.model; -import java.util.List; import java.util.ArrayList; import java.util.Arrays; +import java.util.List; @SuppressWarnings("serial") public class MagicPermanentList extends ArrayList implements MagicCopyable { diff --git a/src/magic/model/MagicRarity.java b/src/magic/model/MagicRarity.java index add85a1e48..8e4044286c 100644 --- a/src/magic/model/MagicRarity.java +++ b/src/magic/model/MagicRarity.java @@ -1,6 +1,7 @@ package magic.model; import java.util.EnumSet; + import magic.translate.MText; public enum MagicRarity { diff --git a/src/magic/model/MagicSetDefinition.java b/src/magic/model/MagicSetDefinition.java index 970df4a4ef..c5d2e768c8 100644 --- a/src/magic/model/MagicSetDefinition.java +++ b/src/magic/model/MagicSetDefinition.java @@ -1,7 +1,7 @@ package magic.model; -import java.util.Set; import java.util.HashSet; +import java.util.Set; public class MagicSetDefinition { diff --git a/src/magic/model/MagicSource.java b/src/magic/model/MagicSource.java index 78081986e3..f095d7b454 100644 --- a/src/magic/model/MagicSource.java +++ b/src/magic/model/MagicSource.java @@ -1,6 +1,7 @@ package magic.model; import java.util.Collection; + import magic.model.event.MagicSourceActivation; public interface MagicSource extends MagicObject { diff --git a/src/magic/model/MagicTuple.java b/src/magic/model/MagicTuple.java index 461792f5f2..295832dd8e 100644 --- a/src/magic/model/MagicTuple.java +++ b/src/magic/model/MagicTuple.java @@ -1,11 +1,11 @@ package magic.model; -import magic.model.stack.MagicItemOnStack; -import magic.model.event.MagicChainEventFactory; -import magic.model.action.MagicPermanentAction; - -import java.util.List; import java.util.ArrayList; +import java.util.List; + +import magic.model.action.MagicPermanentAction; +import magic.model.event.MagicChainEventFactory; +import magic.model.stack.MagicItemOnStack; public class MagicTuple implements MagicCopyable { diff --git a/src/magic/model/MagicType.java b/src/magic/model/MagicType.java index 6d4b1396b1..c35fe0701a 100644 --- a/src/magic/model/MagicType.java +++ b/src/magic/model/MagicType.java @@ -5,6 +5,7 @@ import java.util.EnumSet; import java.util.Iterator; import java.util.List; import java.util.Set; + import magic.translate.MText; public enum MagicType { diff --git a/src/magic/model/action/AIRevealAction.java b/src/magic/model/action/AIRevealAction.java index de05690f58..e64c52aa3b 100644 --- a/src/magic/model/action/AIRevealAction.java +++ b/src/magic/model/action/AIRevealAction.java @@ -1,11 +1,12 @@ package magic.model.action; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + import magic.model.MagicCard; import magic.model.MagicGame; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Arrays; public class AIRevealAction extends MagicAction { diff --git a/src/magic/model/action/AbstractMillAction.java b/src/magic/model/action/AbstractMillAction.java index f54861c09c..13245a2ea8 100644 --- a/src/magic/model/action/AbstractMillAction.java +++ b/src/magic/model/action/AbstractMillAction.java @@ -1,5 +1,7 @@ package magic.model.action; +import java.util.List; + import magic.ai.ArtificialScoringSystem; import magic.model.MagicCard; import magic.model.MagicGame; @@ -7,8 +9,6 @@ import magic.model.MagicLocationType; import magic.model.MagicMessage; import magic.model.MagicPlayer; -import java.util.List; - /** * Ancestor of various library-milling actions */ diff --git a/src/magic/model/action/AttachAction.java b/src/magic/model/action/AttachAction.java index 8a0ae0abb8..b94d12ed31 100644 --- a/src/magic/model/action/AttachAction.java +++ b/src/magic/model/action/AttachAction.java @@ -1,14 +1,14 @@ package magic.model.action; +import java.util.Collection; +import java.util.Collections; + import magic.ai.ArtificialScoringSystem; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.choice.MagicTargetChoice; import magic.model.mstatic.MagicPermanentStatic; -import java.util.Collection; -import java.util.Collections; - /** * Unattaches attachable from currently attached creature. * Attaches attachable to new creature when not MagicPermanent.NONE. diff --git a/src/magic/model/action/BecomesAction.java b/src/magic/model/action/BecomesAction.java index 7d6236ddf4..69383ea55b 100644 --- a/src/magic/model/action/BecomesAction.java +++ b/src/magic/model/action/BecomesAction.java @@ -2,6 +2,7 @@ package magic.model.action; 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/ChangeCountersAction.java b/src/magic/model/action/ChangeCountersAction.java index 28dcfab923..6829e596cb 100644 --- a/src/magic/model/action/ChangeCountersAction.java +++ b/src/magic/model/action/ChangeCountersAction.java @@ -3,8 +3,8 @@ package magic.model.action; import magic.model.MagicCounterType; import magic.model.MagicGame; import magic.model.MagicObject; -import magic.model.MagicPlayer; import magic.model.MagicPermanent; +import magic.model.MagicPlayer; import magic.model.trigger.MagicCounterChangeTriggerData; import magic.model.trigger.MagicTriggerType; diff --git a/src/magic/model/action/ChangeStateAction.java b/src/magic/model/action/ChangeStateAction.java index 2ea6e1ae39..5102ce37fa 100644 --- a/src/magic/model/action/ChangeStateAction.java +++ b/src/magic/model/action/ChangeStateAction.java @@ -1,9 +1,9 @@ package magic.model.action; import magic.model.MagicGame; -import magic.model.MagicPlayer; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; +import magic.model.MagicPlayer; import magic.model.trigger.MagicTriggerType; public class ChangeStateAction extends MagicAction { diff --git a/src/magic/model/action/CleanupTurnStaticsAction.java b/src/magic/model/action/CleanupTurnStaticsAction.java index 94cb5c9699..52eecffd63 100644 --- a/src/magic/model/action/CleanupTurnStaticsAction.java +++ b/src/magic/model/action/CleanupTurnStaticsAction.java @@ -1,10 +1,10 @@ package magic.model.action; +import java.util.Collection; + import magic.model.MagicGame; import magic.model.mstatic.MagicPermanentStatic; -import java.util.Collection; - public class CleanupTurnStaticsAction extends MagicAction { private Collection removedStatics; diff --git a/src/magic/model/action/CleanupTurnTriggersAction.java b/src/magic/model/action/CleanupTurnTriggersAction.java index ccae85121c..f6d0709dc3 100644 --- a/src/magic/model/action/CleanupTurnTriggersAction.java +++ b/src/magic/model/action/CleanupTurnTriggersAction.java @@ -1,10 +1,10 @@ package magic.model.action; +import java.util.List; + import magic.model.MagicGame; import magic.model.trigger.MagicPermanentTrigger; -import java.util.List; - public class CleanupTurnTriggersAction extends MagicAction { private List removedTriggers; diff --git a/src/magic/model/action/CombatDamageAction.java b/src/magic/model/action/CombatDamageAction.java index a4783398ae..470a6e470d 100644 --- a/src/magic/model/action/CombatDamageAction.java +++ b/src/magic/model/action/CombatDamageAction.java @@ -1,5 +1,8 @@ package magic.model.action; +import java.util.ArrayList; +import java.util.Collection; + import magic.model.MagicAbility; import magic.model.MagicDamage; import magic.model.MagicGame; @@ -8,9 +11,6 @@ import magic.model.MagicPermanentList; import magic.model.MagicPermanentState; import magic.model.MagicPlayer; -import java.util.ArrayList; -import java.util.Collection; - /** * Simplification of the rules: * - the first blocker gets all remaining damage when the attacker does not have trample. diff --git a/src/magic/model/action/DestroyAction.java b/src/magic/model/action/DestroyAction.java index 5045092026..3e51e683a3 100644 --- a/src/magic/model/action/DestroyAction.java +++ b/src/magic/model/action/DestroyAction.java @@ -1,15 +1,15 @@ package magic.model.action; +import java.util.ArrayList; +import java.util.Collection; + import magic.model.MagicAbility; import magic.model.MagicGame; import magic.model.MagicLocationType; +import magic.model.MagicMessage; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; -import java.util.ArrayList; -import java.util.Collection; -import magic.model.MagicMessage; - public class DestroyAction extends MagicAction { private final Collection targets = new ArrayList<>(); diff --git a/src/magic/model/action/DetainAction.java b/src/magic/model/action/DetainAction.java index d129c22d9b..ed370a6e33 100644 --- a/src/magic/model/action/DetainAction.java +++ b/src/magic/model/action/DetainAction.java @@ -1,5 +1,7 @@ package magic.model.action; +import java.util.Set; + import magic.model.MagicAbility; import magic.model.MagicGame; import magic.model.MagicPermanent; @@ -9,8 +11,6 @@ import magic.model.mstatic.MagicLayer; import magic.model.mstatic.MagicStatic; import magic.model.trigger.AtUpkeepTrigger; -import java.util.Set; - public class DetainAction extends MagicAction { private final MagicPermanent targetPermanent; diff --git a/src/magic/model/action/DrawAction.java b/src/magic/model/action/DrawAction.java index f336bdfdc1..e14cba2f07 100644 --- a/src/magic/model/action/DrawAction.java +++ b/src/magic/model/action/DrawAction.java @@ -1,5 +1,8 @@ package magic.model.action; +import java.util.ArrayList; +import java.util.List; + import magic.ai.ArtificialScoringSystem; import magic.model.MagicCard; import magic.model.MagicCardList; @@ -9,9 +12,6 @@ import magic.model.MagicPlayer; import magic.model.trigger.MagicTrigger; import magic.model.trigger.MagicTriggerType; -import java.util.ArrayList; -import java.util.List; - public class DrawAction extends MagicAction { private final MagicPlayer player; diff --git a/src/magic/model/action/EnterAsCopyAction.java b/src/magic/model/action/EnterAsCopyAction.java index 249e1f9c0a..19feef2ec1 100644 --- a/src/magic/model/action/EnterAsCopyAction.java +++ b/src/magic/model/action/EnterAsCopyAction.java @@ -3,6 +3,7 @@ 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; diff --git a/src/magic/model/action/FlipAction.java b/src/magic/model/action/FlipAction.java index 745a74ca0b..9278eee12a 100644 --- a/src/magic/model/action/FlipAction.java +++ b/src/magic/model/action/FlipAction.java @@ -1,13 +1,13 @@ package magic.model.action; +import java.util.Collection; +import java.util.Collections; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; import magic.model.mstatic.MagicStatic; -import java.util.Collections; -import java.util.Collection; - public class FlipAction extends MagicAction { public final MagicPermanent permanent; diff --git a/src/magic/model/action/GainAbilityAction.java b/src/magic/model/action/GainAbilityAction.java index 7547075fdc..0145df057b 100644 --- a/src/magic/model/action/GainAbilityAction.java +++ b/src/magic/model/action/GainAbilityAction.java @@ -1,5 +1,9 @@ package magic.model.action; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; + import magic.model.MagicAbility; import magic.model.MagicAbilityList; import magic.model.MagicGame; @@ -8,10 +12,6 @@ import magic.model.MurmurHash3; import magic.model.mstatic.MagicLayer; import magic.model.mstatic.MagicStatic; -import java.util.EnumSet; -import java.util.List; -import java.util.Set; - // Set an ability until end of turn. public class GainAbilityAction extends MagicAction { diff --git a/src/magic/model/action/GoadAction.java b/src/magic/model/action/GoadAction.java index 56409f0aa4..8b6b0a1120 100644 --- a/src/magic/model/action/GoadAction.java +++ b/src/magic/model/action/GoadAction.java @@ -1,5 +1,7 @@ package magic.model.action; +import java.util.Set; + import magic.model.MagicAbility; import magic.model.MagicGame; import magic.model.MagicPermanent; @@ -9,8 +11,6 @@ import magic.model.mstatic.MagicLayer; import magic.model.mstatic.MagicStatic; import magic.model.trigger.AtUpkeepTrigger; -import java.util.Set; - public class GoadAction extends MagicAction { private final MagicPermanent targetPermanent; diff --git a/src/magic/model/action/LookAction.java b/src/magic/model/action/LookAction.java index 2ea2dbbdee..c02c15bbf6 100644 --- a/src/magic/model/action/LookAction.java +++ b/src/magic/model/action/LookAction.java @@ -1,17 +1,17 @@ package magic.model.action; -import magic.model.MagicCard; -import magic.model.MagicGame; -import magic.model.MagicSource; -import magic.model.MagicPlayer; -import magic.model.choice.MagicFromCardListChoice; -import magic.model.event.MagicEvent; -import magic.model.event.MagicEventAction; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import magic.model.MagicCard; +import magic.model.MagicGame; +import magic.model.MagicPlayer; +import magic.model.MagicSource; +import magic.model.choice.MagicFromCardListChoice; +import magic.model.event.MagicEvent; +import magic.model.event.MagicEventAction; + public class LookAction extends MagicAction { private final List cards = new ArrayList<>(); diff --git a/src/magic/model/action/LoseAbilityAction.java b/src/magic/model/action/LoseAbilityAction.java index 0e009017d0..978723031f 100644 --- a/src/magic/model/action/LoseAbilityAction.java +++ b/src/magic/model/action/LoseAbilityAction.java @@ -1,5 +1,9 @@ package magic.model.action; +import java.util.EnumSet; +import java.util.List; +import java.util.Set; + import magic.model.MagicAbility; import magic.model.MagicAbilityList; import magic.model.MagicGame; @@ -7,10 +11,6 @@ import magic.model.MagicPermanent; import magic.model.mstatic.MagicLayer; import magic.model.mstatic.MagicStatic; -import java.util.EnumSet; -import java.util.List; -import java.util.Set; - // Set an ability until end of turn. public class LoseAbilityAction extends MagicAction { diff --git a/src/magic/model/action/MagicPermanentAction.java b/src/magic/model/action/MagicPermanentAction.java index a2b88f2310..8fef83a94b 100644 --- a/src/magic/model/action/MagicPermanentAction.java +++ b/src/magic/model/action/MagicPermanentAction.java @@ -1,7 +1,7 @@ package magic.model.action; -import magic.model.MagicPermanent; import magic.model.MagicCopyable; +import magic.model.MagicPermanent; @FunctionalInterface public interface MagicPermanentAction extends MagicCopyable { diff --git a/src/magic/model/action/MagicPlayMod.java b/src/magic/model/action/MagicPlayMod.java index 33dd8170c2..1fae4ab111 100644 --- a/src/magic/model/action/MagicPlayMod.java +++ b/src/magic/model/action/MagicPlayMod.java @@ -4,6 +4,7 @@ import java.util.LinkedList; import java.util.List; import java.util.regex.Pattern; +import magic.model.ARG; import magic.model.MagicAbility; import magic.model.MagicAbilityList; import magic.model.MagicCounterType; @@ -11,7 +12,6 @@ import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; import magic.model.MagicPlayer; -import magic.model.ARG; import magic.model.condition.MagicConditionFactory; import magic.model.event.MagicMorphActivation; import magic.model.mstatic.MagicStatic; diff --git a/src/magic/model/action/ManifestCardAction.java b/src/magic/model/action/ManifestCardAction.java index f53ccb5cfb..853650ae55 100644 --- a/src/magic/model/action/ManifestCardAction.java +++ b/src/magic/model/action/ManifestCardAction.java @@ -3,8 +3,8 @@ package magic.model.action; import magic.model.MagicCard; import magic.model.MagicGame; -import magic.model.MagicPlayer; import magic.model.MagicPayedCost; +import magic.model.MagicPlayer; import magic.model.event.MagicPlayCardEvent; import magic.model.stack.MagicCardOnStack; diff --git a/src/magic/model/action/MillLibraryAction.java b/src/magic/model/action/MillLibraryAction.java index 7f0d13f309..8b16f6610a 100644 --- a/src/magic/model/action/MillLibraryAction.java +++ b/src/magic/model/action/MillLibraryAction.java @@ -1,10 +1,10 @@ package magic.model.action; +import java.util.List; + import magic.model.MagicCard; import magic.model.MagicPlayer; -import java.util.List; - /** * Action that removes fixed amount of cards from players library and moves them to that player's graveyard. */ diff --git a/src/magic/model/action/MillLibraryUntilAction.java b/src/magic/model/action/MillLibraryUntilAction.java index 967e8ccde5..828b443c15 100644 --- a/src/magic/model/action/MillLibraryUntilAction.java +++ b/src/magic/model/action/MillLibraryUntilAction.java @@ -1,12 +1,12 @@ package magic.model.action; +import java.util.List; + import magic.model.MagicCard; import magic.model.MagicCardList; import magic.model.MagicPlayer; import magic.model.MagicType; -import java.util.List; - /** * Action that removes cards from players library and moves them to that player's graveyard, * until certain card type is seen given number of times (or whole library is milled). diff --git a/src/magic/model/action/PlayCardAction.java b/src/magic/model/action/PlayCardAction.java index 54c723d685..6c243f5ec1 100644 --- a/src/magic/model/action/PlayCardAction.java +++ b/src/magic/model/action/PlayCardAction.java @@ -3,6 +3,7 @@ package magic.model.action; import java.util.Arrays; import java.util.Collections; import java.util.List; + import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicPayedCost; diff --git a/src/magic/model/action/PlayCardFromStackAction.java b/src/magic/model/action/PlayCardFromStackAction.java index 21f9736124..4b96629168 100644 --- a/src/magic/model/action/PlayCardFromStackAction.java +++ b/src/magic/model/action/PlayCardFromStackAction.java @@ -3,6 +3,7 @@ package magic.model.action; import java.util.Arrays; import java.util.Collections; import java.util.List; + import magic.ai.ArtificialScoringSystem; import magic.model.MagicCardDefinition; import magic.model.MagicGame; diff --git a/src/magic/model/action/PlayTokenAction.java b/src/magic/model/action/PlayTokenAction.java index 648b39f99a..75d35c6ff6 100644 --- a/src/magic/model/action/PlayTokenAction.java +++ b/src/magic/model/action/PlayTokenAction.java @@ -3,6 +3,7 @@ package magic.model.action; import java.util.Arrays; import java.util.Collections; import java.util.List; + import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicGame; diff --git a/src/magic/model/action/PutOntoBattlefieldAction.java b/src/magic/model/action/PutOntoBattlefieldAction.java index 41716f7dca..6b3a6ca5a7 100644 --- a/src/magic/model/action/PutOntoBattlefieldAction.java +++ b/src/magic/model/action/PutOntoBattlefieldAction.java @@ -2,6 +2,7 @@ package magic.model.action; import java.util.Arrays; import java.util.List; + import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicLocationType; diff --git a/src/magic/model/action/RemoveAllFromPlayAction.java b/src/magic/model/action/RemoveAllFromPlayAction.java index 647a2fd1ea..cca7a04a46 100644 --- a/src/magic/model/action/RemoveAllFromPlayAction.java +++ b/src/magic/model/action/RemoveAllFromPlayAction.java @@ -1,13 +1,13 @@ package magic.model.action; +import java.util.ArrayList; +import java.util.Collection; + import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicPermanent; import magic.model.MagicPlayer; -import java.util.Collection; -import java.util.ArrayList; - public class RemoveAllFromPlayAction extends MagicAction { private final Collection perms = new ArrayList<>(); diff --git a/src/magic/model/action/RemoveTriggersStaticsAction.java b/src/magic/model/action/RemoveTriggersStaticsAction.java index 37b7112b0a..ca588dbfe2 100644 --- a/src/magic/model/action/RemoveTriggersStaticsAction.java +++ b/src/magic/model/action/RemoveTriggersStaticsAction.java @@ -1,12 +1,12 @@ package magic.model.action; +import java.util.Collection; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.mstatic.MagicPermanentStatic; import magic.model.trigger.MagicPermanentTrigger; -import java.util.Collection; - public class RemoveTriggersStaticsAction extends MagicAction { private final MagicPermanent permanent; diff --git a/src/magic/model/action/RevealAction.java b/src/magic/model/action/RevealAction.java index ccea55e9b6..a6f92b5a29 100644 --- a/src/magic/model/action/RevealAction.java +++ b/src/magic/model/action/RevealAction.java @@ -3,6 +3,7 @@ package magic.model.action; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicMessage; diff --git a/src/magic/model/action/SacrificeAction.java b/src/magic/model/action/SacrificeAction.java index 3298247807..d6256ed258 100644 --- a/src/magic/model/action/SacrificeAction.java +++ b/src/magic/model/action/SacrificeAction.java @@ -1,8 +1,8 @@ package magic.model.action; +import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicPermanent; -import magic.model.MagicGame; import magic.model.trigger.MagicTriggerType; public class SacrificeAction extends RemoveFromPlayAction { diff --git a/src/magic/model/action/ShuffleCardsIntoLibraryAction.java b/src/magic/model/action/ShuffleCardsIntoLibraryAction.java index 7f55ab4704..c57e307b2e 100644 --- a/src/magic/model/action/ShuffleCardsIntoLibraryAction.java +++ b/src/magic/model/action/ShuffleCardsIntoLibraryAction.java @@ -1,6 +1,7 @@ package magic.model.action; import java.util.List; + import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicLocationType; diff --git a/src/magic/model/action/TransformAction.java b/src/magic/model/action/TransformAction.java index 26595edadd..855fea4eb6 100644 --- a/src/magic/model/action/TransformAction.java +++ b/src/magic/model/action/TransformAction.java @@ -1,14 +1,14 @@ package magic.model.action; +import java.util.Collection; +import java.util.Collections; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; import magic.model.mstatic.MagicStatic; import magic.model.trigger.MagicTriggerType; -import java.util.Collections; -import java.util.Collection; - public class TransformAction extends MagicAction { public final MagicPermanent permanent; diff --git a/src/magic/model/action/TurnFaceDownAction.java b/src/magic/model/action/TurnFaceDownAction.java index cdacec1404..7396f0c389 100644 --- a/src/magic/model/action/TurnFaceDownAction.java +++ b/src/magic/model/action/TurnFaceDownAction.java @@ -1,13 +1,13 @@ package magic.model.action; +import java.util.Collection; +import java.util.Collections; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; import magic.model.mstatic.MagicStatic; -import java.util.Collections; -import java.util.Collection; - public class TurnFaceDownAction extends MagicAction { public final MagicPermanent permanent; diff --git a/src/magic/model/action/TurnFaceUpAction.java b/src/magic/model/action/TurnFaceUpAction.java index b45387c98a..3db69da839 100644 --- a/src/magic/model/action/TurnFaceUpAction.java +++ b/src/magic/model/action/TurnFaceUpAction.java @@ -1,14 +1,14 @@ package magic.model.action; +import java.util.Collection; +import java.util.Collections; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; import magic.model.mstatic.MagicStatic; import magic.model.trigger.MagicTriggerType; -import java.util.Collections; -import java.util.Collection; - public class TurnFaceUpAction extends MagicAction { public final MagicPermanent permanent; diff --git a/src/magic/model/choice/MagicBasicLandChoice.java b/src/magic/model/choice/MagicBasicLandChoice.java index e65e833778..4b73cf5890 100644 --- a/src/magic/model/choice/MagicBasicLandChoice.java +++ b/src/magic/model/choice/MagicBasicLandChoice.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; + import magic.exception.UndoClickedException; import magic.model.IUIGameController; import magic.model.MagicGame; diff --git a/src/magic/model/choice/MagicBuilderManaCost.java b/src/magic/model/choice/MagicBuilderManaCost.java index 31daad8ea8..230e5bbc77 100644 --- a/src/magic/model/choice/MagicBuilderManaCost.java +++ b/src/magic/model/choice/MagicBuilderManaCost.java @@ -1,11 +1,11 @@ package magic.model.choice; -import magic.model.MagicCostManaType; -import magic.model.MagicManaCost; - import java.util.Arrays; import java.util.List; +import magic.model.MagicCostManaType; +import magic.model.MagicManaCost; + public class MagicBuilderManaCost { public static final MagicBuilderManaCost ZERO_COST=new MagicBuilderManaCost(); diff --git a/src/magic/model/choice/MagicBuilderPayManaCostResult.java b/src/magic/model/choice/MagicBuilderPayManaCostResult.java index 6c5420d92d..ae606841ca 100644 --- a/src/magic/model/choice/MagicBuilderPayManaCostResult.java +++ b/src/magic/model/choice/MagicBuilderPayManaCostResult.java @@ -1,15 +1,15 @@ package magic.model.choice; -import magic.model.MagicGame; -import magic.model.MagicManaType; -import magic.model.MagicCopyMap; -import magic.model.MagicPlayer; -import magic.model.event.MagicSourceManaActivation; -import magic.model.event.MagicSourceManaActivationResult; - import java.util.Arrays; import java.util.List; +import magic.model.MagicCopyMap; +import magic.model.MagicGame; +import magic.model.MagicManaType; +import magic.model.MagicPlayer; +import magic.model.event.MagicSourceManaActivation; +import magic.model.event.MagicSourceManaActivationResult; + public class MagicBuilderPayManaCostResult implements MagicPayManaCostResult, Comparable { private MagicSourceManaActivationResult[] results; diff --git a/src/magic/model/choice/MagicCardChoice.java b/src/magic/model/choice/MagicCardChoice.java index 57e8b8ffdd..38e80fdc7a 100644 --- a/src/magic/model/choice/MagicCardChoice.java +++ b/src/magic/model/choice/MagicCardChoice.java @@ -6,6 +6,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; + import magic.exception.UndoClickedException; import magic.model.IUIGameController; import magic.model.MagicCard; diff --git a/src/magic/model/choice/MagicChoice.java b/src/magic/model/choice/MagicChoice.java index bda99a5f54..b3f9802cb1 100644 --- a/src/magic/model/choice/MagicChoice.java +++ b/src/magic/model/choice/MagicChoice.java @@ -1,20 +1,20 @@ package magic.model.choice; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import magic.exception.GameException; +import magic.exception.UndoClickedException; +import magic.model.IUIGameController; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.MagicRandom; import magic.model.MagicSource; import magic.model.event.MagicEvent; import magic.model.target.MagicTargetNone; -import magic.exception.UndoClickedException; -import magic.exception.GameException; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Arrays; -import magic.model.IUIGameController; public abstract class MagicChoice { diff --git a/src/magic/model/choice/MagicChoiceFactory.java b/src/magic/model/choice/MagicChoiceFactory.java index 456cb2e79f..903ce1a8fc 100644 --- a/src/magic/model/choice/MagicChoiceFactory.java +++ b/src/magic/model/choice/MagicChoiceFactory.java @@ -1,8 +1,8 @@ package magic.model.choice; -import magic.model.MagicSource; -import magic.model.MagicPlayer; import magic.model.MagicCopyable; +import magic.model.MagicPlayer; +import magic.model.MagicSource; public interface MagicChoiceFactory { MagicChoice build(final MagicSource source, final MagicPlayer player, final MagicCopyable ref); diff --git a/src/magic/model/choice/MagicColorChoice.java b/src/magic/model/choice/MagicColorChoice.java index 1c6792b1a9..ca4b27f90b 100644 --- a/src/magic/model/choice/MagicColorChoice.java +++ b/src/magic/model/choice/MagicColorChoice.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; + import magic.exception.UndoClickedException; import magic.model.IUIGameController; import magic.model.MagicColor; diff --git a/src/magic/model/choice/MagicCombatCreature.java b/src/magic/model/choice/MagicCombatCreature.java index fd630f1215..9cea80b9ce 100644 --- a/src/magic/model/choice/MagicCombatCreature.java +++ b/src/magic/model/choice/MagicCombatCreature.java @@ -5,6 +5,7 @@ import java.util.Comparator; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; + import magic.ai.ArtificialScoringSystem; import magic.model.MagicAbility; import magic.model.MagicGame; diff --git a/src/magic/model/choice/MagicCombatCreatureBuilder.java b/src/magic/model/choice/MagicCombatCreatureBuilder.java index ffae83cd21..48d2f76617 100644 --- a/src/magic/model/choice/MagicCombatCreatureBuilder.java +++ b/src/magic/model/choice/MagicCombatCreatureBuilder.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPlayer; diff --git a/src/magic/model/choice/MagicDeclareAttackersChoice.java b/src/magic/model/choice/MagicDeclareAttackersChoice.java index 633802347b..76633c3b62 100644 --- a/src/magic/model/choice/MagicDeclareAttackersChoice.java +++ b/src/magic/model/choice/MagicDeclareAttackersChoice.java @@ -3,6 +3,7 @@ package magic.model.choice; import java.util.Collection; import java.util.HashSet; import java.util.Set; + import magic.exception.UndoClickedException; import magic.model.IUIGameController; import magic.model.MagicAbility; diff --git a/src/magic/model/choice/MagicDeclareAttackersResultBuilder.java b/src/magic/model/choice/MagicDeclareAttackersResultBuilder.java index 26294490c8..f0097b9fc3 100644 --- a/src/magic/model/choice/MagicDeclareAttackersResultBuilder.java +++ b/src/magic/model/choice/MagicDeclareAttackersResultBuilder.java @@ -1,16 +1,16 @@ package magic.model.choice; -import magic.model.MagicAbility; -import magic.model.MagicGame; -import magic.model.MagicPermanent; -import magic.model.MagicPlayer; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.SortedSet; +import magic.model.MagicAbility; +import magic.model.MagicGame; +import magic.model.MagicPermanent; +import magic.model.MagicPlayer; + public class MagicDeclareAttackersResultBuilder { private static final Collection EMPTY_RESULT=Collections.singletonList(new MagicDeclareAttackersResult()); diff --git a/src/magic/model/choice/MagicDeclareBlockersChoice.java b/src/magic/model/choice/MagicDeclareBlockersChoice.java index 5e5ede3333..3952b572a7 100644 --- a/src/magic/model/choice/MagicDeclareBlockersChoice.java +++ b/src/magic/model/choice/MagicDeclareBlockersChoice.java @@ -5,6 +5,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; + import magic.exception.UndoClickedException; import magic.model.IUIGameController; import magic.model.MagicGame; diff --git a/src/magic/model/choice/MagicDeclareBlockersResultBuilder.java b/src/magic/model/choice/MagicDeclareBlockersResultBuilder.java index 91bbc96eab..fb0bcf0679 100644 --- a/src/magic/model/choice/MagicDeclareBlockersResultBuilder.java +++ b/src/magic/model/choice/MagicDeclareBlockersResultBuilder.java @@ -1,5 +1,14 @@ package magic.model.choice; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPlayer; @@ -11,15 +20,6 @@ import magic.model.score.MagicMultipleScoreRanking; import magic.model.score.MagicScoreRanking; import magic.model.score.MagicSingleScoreRanking; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - public class MagicDeclareBlockersResultBuilder { private static final Collection EMPTY_RESULT = diff --git a/src/magic/model/choice/MagicDelayedPayManaCostResult.java b/src/magic/model/choice/MagicDelayedPayManaCostResult.java index ac39d1e551..01ce618fb3 100644 --- a/src/magic/model/choice/MagicDelayedPayManaCostResult.java +++ b/src/magic/model/choice/MagicDelayedPayManaCostResult.java @@ -1,9 +1,9 @@ package magic.model.choice; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicManaCost; import magic.model.MagicPlayer; -import magic.model.MagicCopyMap; import magic.model.action.PayDelayedCostAction; /** diff --git a/src/magic/model/choice/MagicExcludeChoice.java b/src/magic/model/choice/MagicExcludeChoice.java index a2b770c63b..22eade8d70 100644 --- a/src/magic/model/choice/MagicExcludeChoice.java +++ b/src/magic/model/choice/MagicExcludeChoice.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; + import magic.model.IUIGameController; import magic.model.MagicGame; import magic.model.MagicPermanent; diff --git a/src/magic/model/choice/MagicFromCardFilterChoice.java b/src/magic/model/choice/MagicFromCardFilterChoice.java index 40660a33e3..e3071e722d 100644 --- a/src/magic/model/choice/MagicFromCardFilterChoice.java +++ b/src/magic/model/choice/MagicFromCardFilterChoice.java @@ -6,6 +6,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; + import magic.exception.UndoClickedException; import magic.model.IUIGameController; import magic.model.MagicCard; diff --git a/src/magic/model/choice/MagicFromCardListChoice.java b/src/magic/model/choice/MagicFromCardListChoice.java index fcd23db7dc..3f5b5116db 100644 --- a/src/magic/model/choice/MagicFromCardListChoice.java +++ b/src/magic/model/choice/MagicFromCardListChoice.java @@ -6,6 +6,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; + import magic.exception.UndoClickedException; import magic.model.IUIGameController; import magic.model.MagicCard; diff --git a/src/magic/model/choice/MagicKickerChoice.java b/src/magic/model/choice/MagicKickerChoice.java index 79d4774d8c..6e7bd914dd 100644 --- a/src/magic/model/choice/MagicKickerChoice.java +++ b/src/magic/model/choice/MagicKickerChoice.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; + import magic.exception.UndoClickedException; import magic.model.IUIGameController; import magic.model.MagicGame; diff --git a/src/magic/model/choice/MagicMayChoice.java b/src/magic/model/choice/MagicMayChoice.java index a948b128a4..0cb469157b 100644 --- a/src/magic/model/choice/MagicMayChoice.java +++ b/src/magic/model/choice/MagicMayChoice.java @@ -7,6 +7,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; + import magic.data.GeneralConfig; import magic.exception.UndoClickedException; import magic.model.IUIGameController; diff --git a/src/magic/model/choice/MagicMulliganChoice.java b/src/magic/model/choice/MagicMulliganChoice.java index b82adb21da..b95ea41a7e 100644 --- a/src/magic/model/choice/MagicMulliganChoice.java +++ b/src/magic/model/choice/MagicMulliganChoice.java @@ -2,6 +2,7 @@ package magic.model.choice; import java.util.Collection; import java.util.List; + import magic.exception.UndoClickedException; import magic.model.IUIGameController; import magic.model.MagicCard; diff --git a/src/magic/model/choice/MagicOrChoice.java b/src/magic/model/choice/MagicOrChoice.java index 1491506bdc..415025448b 100644 --- a/src/magic/model/choice/MagicOrChoice.java +++ b/src/magic/model/choice/MagicOrChoice.java @@ -3,6 +3,7 @@ package magic.model.choice; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import magic.data.GeneralConfig; import magic.exception.UndoClickedException; import magic.model.IUIGameController; diff --git a/src/magic/model/choice/MagicPayManaCostChoice.java b/src/magic/model/choice/MagicPayManaCostChoice.java index bdcb1de76b..c92520c295 100644 --- a/src/magic/model/choice/MagicPayManaCostChoice.java +++ b/src/magic/model/choice/MagicPayManaCostChoice.java @@ -5,6 +5,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; + import magic.exception.GameException; import magic.exception.UndoClickedException; import magic.model.IUIGameController; diff --git a/src/magic/model/choice/MagicPayManaCostResult.java b/src/magic/model/choice/MagicPayManaCostResult.java index fb77163822..7b0304b4cf 100644 --- a/src/magic/model/choice/MagicPayManaCostResult.java +++ b/src/magic/model/choice/MagicPayManaCostResult.java @@ -1,9 +1,9 @@ package magic.model.choice; -import magic.model.MagicGame; -import magic.model.MagicPlayer; -import magic.model.MagicMappable; import magic.model.MagicCopyable; +import magic.model.MagicGame; +import magic.model.MagicMappable; +import magic.model.MagicPlayer; // need MagicCopyable as it can be stored on the stack public interface MagicPayManaCostResult extends MagicCopyable, MagicMappable { diff --git a/src/magic/model/choice/MagicPayManaCostResultBuilder.java b/src/magic/model/choice/MagicPayManaCostResultBuilder.java index 94224f329a..110709c38f 100644 --- a/src/magic/model/choice/MagicPayManaCostResultBuilder.java +++ b/src/magic/model/choice/MagicPayManaCostResultBuilder.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; + import magic.model.MagicCostManaType; import magic.model.MagicGame; import magic.model.MagicManaType; diff --git a/src/magic/model/choice/MagicPlayChoice.java b/src/magic/model/choice/MagicPlayChoice.java index c7d12f637a..73b88bdfd4 100644 --- a/src/magic/model/choice/MagicPlayChoice.java +++ b/src/magic/model/choice/MagicPlayChoice.java @@ -6,6 +6,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; + import magic.exception.UndoClickedException; import magic.model.IUIGameController; import magic.model.MagicGame; diff --git a/src/magic/model/choice/MagicPlayerPayManaCostResult.java b/src/magic/model/choice/MagicPlayerPayManaCostResult.java index c8436846bc..6bed602848 100644 --- a/src/magic/model/choice/MagicPlayerPayManaCostResult.java +++ b/src/magic/model/choice/MagicPlayerPayManaCostResult.java @@ -1,8 +1,8 @@ package magic.model.choice; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.MagicCopyMap; public class MagicPlayerPayManaCostResult implements MagicPayManaCostResult { diff --git a/src/magic/model/choice/MagicRandomCardChoice.java b/src/magic/model/choice/MagicRandomCardChoice.java index fb9d7d2a89..c02f2304f0 100644 --- a/src/magic/model/choice/MagicRandomCardChoice.java +++ b/src/magic/model/choice/MagicRandomCardChoice.java @@ -1,15 +1,15 @@ package magic.model.choice; +import java.util.Collection; +import java.util.Collections; + +import magic.model.IUIGameController; import magic.model.MagicCardList; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.MagicSource; import magic.model.event.MagicEvent; -import java.util.Collection; -import java.util.Collections; -import magic.model.IUIGameController; - public class MagicRandomCardChoice extends MagicChoice { private final int amount; diff --git a/src/magic/model/choice/MagicSimpleMayChoice.java b/src/magic/model/choice/MagicSimpleMayChoice.java index d020cb0f3a..48b05bd1d3 100644 --- a/src/magic/model/choice/MagicSimpleMayChoice.java +++ b/src/magic/model/choice/MagicSimpleMayChoice.java @@ -2,6 +2,7 @@ package magic.model.choice; import java.util.Collection; import java.util.List; + import magic.data.GeneralConfig; import magic.exception.UndoClickedException; import magic.model.IUIGameController; diff --git a/src/magic/model/condition/MagicConditionFactory.java b/src/magic/model/condition/MagicConditionFactory.java index e8a802e26f..b726eb96a7 100644 --- a/src/magic/model/condition/MagicConditionFactory.java +++ b/src/magic/model/condition/MagicConditionFactory.java @@ -14,10 +14,10 @@ import magic.model.event.MagicEvent; import magic.model.event.MagicPermanentActivation; import magic.model.target.MagicOtherCardTargetFilter; import magic.model.target.MagicOtherPermanentTargetFilter; +import magic.model.target.MagicTarget; import magic.model.target.MagicTargetFilter; import magic.model.target.MagicTargetFilterFactory; import magic.model.target.MagicTargetType; -import magic.model.target.MagicTarget; public class MagicConditionFactory { diff --git a/src/magic/model/condition/MagicConditionParser.java b/src/magic/model/condition/MagicConditionParser.java index db115dbe0d..288581d2f3 100644 --- a/src/magic/model/condition/MagicConditionParser.java +++ b/src/magic/model/condition/MagicConditionParser.java @@ -7,11 +7,11 @@ import java.util.regex.Pattern; import magic.model.ARG; import magic.model.MagicAbility; +import magic.model.MagicCard; import magic.model.MagicColor; import magic.model.MagicCounterType; import magic.model.MagicPermanent; import magic.model.MagicSubType; -import magic.model.MagicCard; import magic.model.event.MagicMatchedCostEvent; import magic.model.target.MagicTargetFilter; import magic.model.target.MagicTargetFilterFactory; diff --git a/src/magic/model/event/MagicActivation.java b/src/magic/model/event/MagicActivation.java index c603a45df7..5d0596705d 100644 --- a/src/magic/model/event/MagicActivation.java +++ b/src/magic/model/event/MagicActivation.java @@ -7,9 +7,9 @@ import magic.model.MagicPermanent; import magic.model.MagicPlayer; import magic.model.MagicPlayerState; import magic.model.MagicSource; -import magic.model.stack.MagicItemOnStack; import magic.model.choice.MagicChoice; import magic.model.condition.MagicCondition; +import magic.model.stack.MagicItemOnStack; public abstract class MagicActivation implements MagicEventAction, Comparable> { diff --git a/src/magic/model/event/MagicAwakenEvent.java b/src/magic/model/event/MagicAwakenEvent.java index c567dc113b..48cdc090b5 100644 --- a/src/magic/model/event/MagicAwakenEvent.java +++ b/src/magic/model/event/MagicAwakenEvent.java @@ -1,6 +1,7 @@ package magic.model.event; import java.util.Set; + import magic.model.MagicAbility; import magic.model.MagicCounterType; import magic.model.MagicGame; diff --git a/src/magic/model/event/MagicBecomesChosenBasicLand.java b/src/magic/model/event/MagicBecomesChosenBasicLand.java index 9b568224f3..b74df7eaa6 100644 --- a/src/magic/model/event/MagicBecomesChosenBasicLand.java +++ b/src/magic/model/event/MagicBecomesChosenBasicLand.java @@ -1,20 +1,20 @@ package magic.model.event; -import java.util.Set; import java.util.Collections; +import java.util.Set; +import magic.model.MagicAbility; +import magic.model.MagicColor; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPermanentList; -import magic.model.MagicColor; -import magic.model.MagicSource; import magic.model.MagicPlayer; +import magic.model.MagicSource; import magic.model.MagicSubType; -import magic.model.MagicAbility; +import magic.model.action.AddStaticAction; import magic.model.choice.MagicColorChoice; import magic.model.mstatic.MagicLayer; import magic.model.mstatic.MagicStatic; -import magic.model.action.AddStaticAction; public class MagicBecomesChosenBasicLand extends MagicEvent { diff --git a/src/magic/model/event/MagicCardAbilityActivation.java b/src/magic/model/event/MagicCardAbilityActivation.java index d0ab18661c..92be80a712 100644 --- a/src/magic/model/event/MagicCardAbilityActivation.java +++ b/src/magic/model/event/MagicCardAbilityActivation.java @@ -1,19 +1,19 @@ package magic.model.event; +import java.util.List; + +import magic.model.ARG; import magic.model.MagicCard; +import magic.model.MagicCardDefinition; import magic.model.MagicGame; +import magic.model.MagicLocationType; import magic.model.MagicPayedCost; import magic.model.MagicSource; -import magic.model.MagicCardDefinition; -import magic.model.MagicLocationType; -import magic.model.ARG; import magic.model.action.PutItemOnStackAction; import magic.model.choice.MagicChoice; import magic.model.condition.MagicCondition; import magic.model.stack.MagicAbilityOnStack; -import java.util.List; - public abstract class MagicCardAbilityActivation extends MagicHandCastActivation { final String name; diff --git a/src/magic/model/event/MagicChainEventFactory.java b/src/magic/model/event/MagicChainEventFactory.java index 38099d3e2c..a6130a0312 100644 --- a/src/magic/model/event/MagicChainEventFactory.java +++ b/src/magic/model/event/MagicChainEventFactory.java @@ -1,7 +1,7 @@ package magic.model.event; -import magic.model.MagicSource; import magic.model.MagicCopyable; +import magic.model.MagicSource; import magic.model.choice.MagicTargetChoice; public abstract class MagicChainEventFactory implements MagicCopyable { diff --git a/src/magic/model/event/MagicConditionEvent.java b/src/magic/model/event/MagicConditionEvent.java index 2c554bf5b2..c43f005d74 100644 --- a/src/magic/model/event/MagicConditionEvent.java +++ b/src/magic/model/event/MagicConditionEvent.java @@ -1,7 +1,7 @@ package magic.model.event; -import magic.model.MagicSource; import magic.model.MagicCopyMap; +import magic.model.MagicSource; import magic.model.condition.MagicCondition; public class MagicConditionEvent extends MagicEvent { diff --git a/src/magic/model/event/MagicCostEvent.java b/src/magic/model/event/MagicCostEvent.java index 47e9dcf0df..7171d97241 100644 --- a/src/magic/model/event/MagicCostEvent.java +++ b/src/magic/model/event/MagicCostEvent.java @@ -1,21 +1,21 @@ package magic.model.event; -import magic.model.MagicCounterType; -import magic.model.MagicManaCost; -import magic.model.MagicPermanent; -import magic.model.MagicCard; -import magic.model.MagicSource; -import magic.model.MagicLocationType; -import magic.model.ARG; -import magic.model.choice.MagicTargetChoice; -import magic.model.target.MagicOtherPermanentTargetFilter; -import magic.model.target.MagicOtherCardTargetFilter; -import magic.model.target.MagicTargetFilter; -import magic.model.target.MagicTargetFilterFactory; - import java.util.regex.Matcher; import java.util.regex.Pattern; +import magic.model.ARG; +import magic.model.MagicCard; +import magic.model.MagicCounterType; +import magic.model.MagicLocationType; +import magic.model.MagicManaCost; +import magic.model.MagicPermanent; +import magic.model.MagicSource; +import magic.model.choice.MagicTargetChoice; +import magic.model.target.MagicOtherCardTargetFilter; +import magic.model.target.MagicOtherPermanentTargetFilter; +import magic.model.target.MagicTargetFilter; +import magic.model.target.MagicTargetFilterFactory; + public enum MagicCostEvent { SacrificeSelf("Sacrifice (SN|this permanent|this land)") { diff --git a/src/magic/model/event/MagicCrewActivation.java b/src/magic/model/event/MagicCrewActivation.java index 6a57315c1a..f91340bef6 100644 --- a/src/magic/model/event/MagicCrewActivation.java +++ b/src/magic/model/event/MagicCrewActivation.java @@ -1,14 +1,14 @@ package magic.model.event; +import java.util.Collections; + import magic.model.MagicGame; import magic.model.MagicPayedCost; import magic.model.MagicPermanent; import magic.model.MagicType; -import magic.model.mstatic.MagicStatic; -import magic.model.mstatic.MagicLayer; import magic.model.action.AddStaticAction; - -import java.util.Collections; +import magic.model.mstatic.MagicLayer; +import magic.model.mstatic.MagicStatic; public class MagicCrewActivation extends MagicPermanentActivation { diff --git a/src/magic/model/event/MagicCrewCostEvent.java b/src/magic/model/event/MagicCrewCostEvent.java index 1750e68cff..6c5cefb004 100644 --- a/src/magic/model/event/MagicCrewCostEvent.java +++ b/src/magic/model/event/MagicCrewCostEvent.java @@ -1,9 +1,9 @@ package magic.model.event; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicSource; -import magic.model.MagicCopyMap; 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 773a83359f..aae29ccf4c 100644 --- a/src/magic/model/event/MagicCyclingActivation.java +++ b/src/magic/model/event/MagicCyclingActivation.java @@ -1,6 +1,7 @@ package magic.model.event; import java.util.Arrays; + import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicPayedCost; diff --git a/src/magic/model/event/MagicDiscardEvent.java b/src/magic/model/event/MagicDiscardEvent.java index 252b9497f5..0b09f14307 100644 --- a/src/magic/model/event/MagicDiscardEvent.java +++ b/src/magic/model/event/MagicDiscardEvent.java @@ -1,10 +1,10 @@ package magic.model.event; import magic.model.MagicCard; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.MagicCopyMap; import magic.model.action.DiscardCardAction; import magic.model.choice.MagicCardChoice; import magic.model.choice.MagicRandomCardChoice; diff --git a/src/magic/model/event/MagicETBEvent.java b/src/magic/model/event/MagicETBEvent.java index f19cdedc75..f03c3fcfcd 100644 --- a/src/magic/model/event/MagicETBEvent.java +++ b/src/magic/model/event/MagicETBEvent.java @@ -1,21 +1,21 @@ package magic.model.event; -import magic.model.MagicGame; -import magic.model.MagicPayedCost; import magic.model.MagicCardDefinition; import magic.model.MagicChangeCardDefinition; +import magic.model.MagicGame; import magic.model.MagicMessage; +import magic.model.MagicPayedCost; +import magic.model.action.EnterAsCopyAction; +import magic.model.action.MagicPlayMod; +import magic.model.action.PlayCardFromStackAction; +import magic.model.choice.MagicMayChoice; +import magic.model.choice.MagicTargetChoice; +import magic.model.condition.MagicCondition; import magic.model.stack.MagicCardOnStack; import magic.model.target.MagicCopyPermanentPicker; import magic.model.target.MagicGraveyardTargetPicker; -import magic.model.target.MagicTargetType; import magic.model.target.MagicTargetPicker; -import magic.model.condition.MagicCondition; -import magic.model.choice.MagicTargetChoice; -import magic.model.choice.MagicMayChoice; -import magic.model.action.EnterAsCopyAction; -import magic.model.action.PlayCardFromStackAction; -import magic.model.action.MagicPlayMod; +import magic.model.target.MagicTargetType; public abstract class MagicETBEvent implements MagicCardEvent,MagicEventAction,MagicChangeCardDefinition { diff --git a/src/magic/model/event/MagicEmbalmActivation.java b/src/magic/model/event/MagicEmbalmActivation.java index af0c30a3ca..d52bf15582 100644 --- a/src/magic/model/event/MagicEmbalmActivation.java +++ b/src/magic/model/event/MagicEmbalmActivation.java @@ -5,11 +5,11 @@ import java.util.Arrays; import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicCardDefinitionInit; -import magic.model.MagicSubType; import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicManaCost; import magic.model.MagicPayedCost; +import magic.model.MagicSubType; import magic.model.action.PlayTokenAction; import magic.model.condition.MagicCondition; diff --git a/src/magic/model/event/MagicEquipActivation.java b/src/magic/model/event/MagicEquipActivation.java index 93d817eaec..9b9692df80 100644 --- a/src/magic/model/event/MagicEquipActivation.java +++ b/src/magic/model/event/MagicEquipActivation.java @@ -12,9 +12,9 @@ import magic.model.condition.MagicArtificialCondition; import magic.model.condition.MagicCondition; import magic.model.target.MagicEquipTargetPicker; import magic.model.target.MagicOtherPermanentTargetFilter; +import magic.model.target.MagicTargetFilter; import magic.model.target.MagicTargetFilterFactory; import magic.model.target.MagicTargetHint; -import magic.model.target.MagicTargetFilter; public class MagicEquipActivation extends MagicPermanentActivation { diff --git a/src/magic/model/event/MagicEternalizeActivation.java b/src/magic/model/event/MagicEternalizeActivation.java index f8fa8f7aff..c1e19862a4 100644 --- a/src/magic/model/event/MagicEternalizeActivation.java +++ b/src/magic/model/event/MagicEternalizeActivation.java @@ -5,10 +5,10 @@ import java.util.List; import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicCardDefinitionInit; -import magic.model.MagicSubType; import magic.model.MagicGame; import magic.model.MagicManaCost; import magic.model.MagicPayedCost; +import magic.model.MagicSubType; import magic.model.action.PlayTokenAction; import magic.model.condition.MagicCondition; diff --git a/src/magic/model/event/MagicEvent.java b/src/magic/model/event/MagicEvent.java index 89f218489f..c98629375c 100644 --- a/src/magic/model/event/MagicEvent.java +++ b/src/magic/model/event/MagicEvent.java @@ -4,14 +4,33 @@ import java.util.Collections; import java.util.List; import magic.ai.ArtificialScoringSystem; -import magic.model.*; +import magic.model.MagicCard; +import magic.model.MagicCardList; +import magic.model.MagicColor; +import magic.model.MagicCopyMap; +import magic.model.MagicCopyable; +import magic.model.MagicCounterType; +import magic.model.MagicGame; +import magic.model.MagicInteger; +import magic.model.MagicManaCost; +import magic.model.MagicMessage; +import magic.model.MagicObject; +import magic.model.MagicObjectImpl; +import magic.model.MagicPayedCost; +import magic.model.MagicPermanent; +import magic.model.MagicPermanentList; +import magic.model.MagicPlayer; +import magic.model.MagicSource; +import magic.model.MagicSubType; +import magic.model.MagicTuple; +import magic.model.MurmurHash3; +import magic.model.action.LoseGameAction; import magic.model.action.MagicCardAction; import magic.model.action.MagicCardOnStackAction; import magic.model.action.MagicItemOnStackAction; import magic.model.action.MagicPermanentAction; import magic.model.action.MagicPlayerAction; import magic.model.action.MagicTargetAction; -import magic.model.action.LoseGameAction; import magic.model.choice.MagicCardChoiceResult; import magic.model.choice.MagicChoice; import magic.model.choice.MagicDeclareAttackersResult; diff --git a/src/magic/model/event/MagicEventFactory.java b/src/magic/model/event/MagicEventFactory.java index 1411919eaa..5ad889ff07 100644 --- a/src/magic/model/event/MagicEventFactory.java +++ b/src/magic/model/event/MagicEventFactory.java @@ -1,8 +1,8 @@ package magic.model.event; -import magic.model.MagicSource; -import magic.model.MagicPlayer; import magic.model.MagicCopyable; +import magic.model.MagicPlayer; +import magic.model.MagicSource; public interface MagicEventFactory { diff --git a/src/magic/model/event/MagicEvokeActivation.java b/src/magic/model/event/MagicEvokeActivation.java index 274f3e8a74..41fd299162 100644 --- a/src/magic/model/event/MagicEvokeActivation.java +++ b/src/magic/model/event/MagicEvokeActivation.java @@ -1,11 +1,11 @@ package magic.model.event; +import java.util.Arrays; + import magic.model.MagicCard; import magic.model.MagicManaCost; import magic.model.condition.MagicCondition; -import java.util.Arrays; - public class MagicEvokeActivation extends MagicHandCastActivation { final MagicManaCost cost; diff --git a/src/magic/model/event/MagicExileTopLibraryEvent.java b/src/magic/model/event/MagicExileTopLibraryEvent.java index c7a3a8324f..af2a48f6f2 100644 --- a/src/magic/model/event/MagicExileTopLibraryEvent.java +++ b/src/magic/model/event/MagicExileTopLibraryEvent.java @@ -2,11 +2,11 @@ package magic.model.event; import magic.model.MagicCard; import magic.model.MagicCardList; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.MagicCopyMap; import magic.model.action.ShiftCardAction; import magic.model.condition.MagicCondition; import magic.model.condition.MagicConditionFactory; diff --git a/src/magic/model/event/MagicExploreEvent.java b/src/magic/model/event/MagicExploreEvent.java index b6f2559eb2..b9f16a357f 100644 --- a/src/magic/model/event/MagicExploreEvent.java +++ b/src/magic/model/event/MagicExploreEvent.java @@ -1,17 +1,17 @@ package magic.model.event; -import magic.model.MagicGame; -import magic.model.MagicPlayer; -import magic.model.MagicPermanent; import magic.model.MagicCard; import magic.model.MagicCounterType; +import magic.model.MagicGame; import magic.model.MagicLocationType; +import magic.model.MagicPermanent; import magic.model.MagicPermanentState; -import magic.model.choice.MagicMayChoice; -import magic.model.action.RevealAction; -import magic.model.action.ShiftCardAction; +import magic.model.MagicPlayer; import magic.model.action.ChangeCountersAction; import magic.model.action.ChangeStateAction; +import magic.model.action.RevealAction; +import magic.model.action.ShiftCardAction; +import magic.model.choice.MagicMayChoice; public class MagicExploreEvent extends MagicEvent { diff --git a/src/magic/model/event/MagicFlashbackActivation.java b/src/magic/model/event/MagicFlashbackActivation.java index 2aeaa636d0..87f088d84c 100644 --- a/src/magic/model/event/MagicFlashbackActivation.java +++ b/src/magic/model/event/MagicFlashbackActivation.java @@ -1,6 +1,7 @@ package magic.model.event; import java.util.List; + import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicGame; diff --git a/src/magic/model/event/MagicHandCastActivation.java b/src/magic/model/event/MagicHandCastActivation.java index ca9b39b883..6b5a7d6b7f 100644 --- a/src/magic/model/event/MagicHandCastActivation.java +++ b/src/magic/model/event/MagicHandCastActivation.java @@ -2,6 +2,7 @@ package magic.model.event; import java.util.Collections; import java.util.List; + import magic.model.MagicAmount; import magic.model.MagicCard; import magic.model.MagicCardDefinition; diff --git a/src/magic/model/event/MagicJumpStartActivation.java b/src/magic/model/event/MagicJumpStartActivation.java index 7ac7f44966..423329d826 100644 --- a/src/magic/model/event/MagicJumpStartActivation.java +++ b/src/magic/model/event/MagicJumpStartActivation.java @@ -1,6 +1,7 @@ package magic.model.event; import java.util.Arrays; + import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicGame; diff --git a/src/magic/model/event/MagicLevelUpActivation.java b/src/magic/model/event/MagicLevelUpActivation.java index 91de0b08dd..2d215126f9 100644 --- a/src/magic/model/event/MagicLevelUpActivation.java +++ b/src/magic/model/event/MagicLevelUpActivation.java @@ -1,5 +1,7 @@ package magic.model.event; +import java.util.Collections; + import magic.model.MagicCounterType; import magic.model.MagicGame; import magic.model.MagicManaCost; @@ -10,8 +12,6 @@ import magic.model.action.ChangeCountersAction; import magic.model.condition.MagicArtificialCondition; import magic.model.condition.MagicCondition; -import java.util.Collections; - public class MagicLevelUpActivation extends MagicPermanentActivation { private static final MagicActivationHints ACTIVATION_HINTS = diff --git a/src/magic/model/event/MagicManaActivation.java b/src/magic/model/event/MagicManaActivation.java index e18da55ecb..72475735f1 100644 --- a/src/magic/model/event/MagicManaActivation.java +++ b/src/magic/model/event/MagicManaActivation.java @@ -1,5 +1,7 @@ package magic.model.event; +import java.util.List; + import magic.model.MagicAbility; import magic.model.MagicCardDefinition; import magic.model.MagicChangeCardDefinition; @@ -9,8 +11,6 @@ import magic.model.MagicPermanent; import magic.model.MagicPlayerState; import magic.model.condition.MagicCondition; -import java.util.List; - public abstract class MagicManaActivation implements MagicChangeCardDefinition { protected static final String ActivationRestriction = ", Activate this ability "; diff --git a/src/magic/model/event/MagicMegamorphActivation.java b/src/magic/model/event/MagicMegamorphActivation.java index 7884e4b287..959dca1ad3 100644 --- a/src/magic/model/event/MagicMegamorphActivation.java +++ b/src/magic/model/event/MagicMegamorphActivation.java @@ -1,11 +1,12 @@ package magic.model.event; -import magic.model.MagicGame; -import magic.model.MagicCounterType; -import magic.model.action.TurnFaceUpAction; -import magic.model.action.ChangeCountersAction; import java.util.List; + +import magic.model.MagicCounterType; +import magic.model.MagicGame; import magic.model.MagicMessage; +import magic.model.action.ChangeCountersAction; +import magic.model.action.TurnFaceUpAction; public class MagicMegamorphActivation extends MagicMorphActivation { diff --git a/src/magic/model/event/MagicMillEvent.java b/src/magic/model/event/MagicMillEvent.java index d375d310a9..c0c199c901 100644 --- a/src/magic/model/event/MagicMillEvent.java +++ b/src/magic/model/event/MagicMillEvent.java @@ -2,11 +2,11 @@ package magic.model.event; import magic.model.MagicCard; import magic.model.MagicCardList; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.MagicCopyMap; import magic.model.action.ShiftCardAction; import magic.model.condition.MagicCondition; import magic.model.condition.MagicConditionFactory; diff --git a/src/magic/model/event/MagicMorphActivation.java b/src/magic/model/event/MagicMorphActivation.java index 8be09107cb..20e55d4744 100644 --- a/src/magic/model/event/MagicMorphActivation.java +++ b/src/magic/model/event/MagicMorphActivation.java @@ -1,17 +1,17 @@ package magic.model.event; import java.util.Collections; -import java.util.List; import java.util.LinkedList; +import java.util.List; -import magic.model.MagicGame; import magic.model.MagicCardDefinition; -import magic.model.MagicSource; +import magic.model.MagicGame; +import magic.model.MagicMessage; import magic.model.MagicPayedCost; import magic.model.MagicPermanent; +import magic.model.MagicSource; import magic.model.action.TurnFaceUpAction; import magic.model.condition.MagicCondition; -import magic.model.MagicMessage; public class MagicMorphActivation extends MagicPermanentActivation { diff --git a/src/magic/model/event/MagicMorphCastActivation.java b/src/magic/model/event/MagicMorphCastActivation.java index 0ee2b934ea..4ae1eda70d 100644 --- a/src/magic/model/event/MagicMorphCastActivation.java +++ b/src/magic/model/event/MagicMorphCastActivation.java @@ -1,26 +1,26 @@ package magic.model.event; +import java.util.Collections; + import magic.data.CardDefinitions; +import magic.model.MagicAbility; import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicColor; import magic.model.MagicGame; -import magic.model.MagicAbility; import magic.model.MagicLocationType; import magic.model.MagicManaCost; +import magic.model.MagicMessage; +import magic.model.MagicPayedCost; import magic.model.MagicSource; import magic.model.MagicSubType; import magic.model.MagicType; -import magic.model.MagicPayedCost; -import magic.model.MagicMessage; -import magic.model.condition.MagicCondition; -import magic.model.stack.MagicCardOnStack; import magic.model.action.MagicPlayMod; +import magic.model.action.PlayCardFromStackAction; import magic.model.action.PutItemOnStackAction; import magic.model.action.RemoveCardAction; -import magic.model.action.PlayCardFromStackAction; - -import java.util.Collections; +import magic.model.condition.MagicCondition; +import magic.model.stack.MagicCardOnStack; public class MagicMorphCastActivation extends MagicHandCastActivation { diff --git a/src/magic/model/event/MagicNinjutsuActivation.java b/src/magic/model/event/MagicNinjutsuActivation.java index 745ed9e467..da3e66b330 100644 --- a/src/magic/model/event/MagicNinjutsuActivation.java +++ b/src/magic/model/event/MagicNinjutsuActivation.java @@ -1,5 +1,7 @@ package magic.model.event; +import java.util.Arrays; + import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicLocationType; @@ -10,8 +12,6 @@ import magic.model.action.PutOntoBattlefieldAction; import magic.model.choice.MagicTargetChoice; import magic.model.condition.MagicCondition; -import java.util.Arrays; - public class MagicNinjutsuActivation extends MagicCardAbilityActivation { final MagicManaCost cost; diff --git a/src/magic/model/event/MagicPayEnergyEvent.java b/src/magic/model/event/MagicPayEnergyEvent.java index a95253c24e..adf6fd5520 100644 --- a/src/magic/model/event/MagicPayEnergyEvent.java +++ b/src/magic/model/event/MagicPayEnergyEvent.java @@ -1,10 +1,10 @@ package magic.model.event; +import magic.model.MagicCopyMap; +import magic.model.MagicCounterType; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.MagicCounterType; -import magic.model.MagicCopyMap; import magic.model.action.ChangeCountersAction; import magic.model.condition.MagicCondition; import magic.model.condition.MagicConditionFactory; diff --git a/src/magic/model/event/MagicPayLifeEvent.java b/src/magic/model/event/MagicPayLifeEvent.java index 39d3586c63..921f96c376 100644 --- a/src/magic/model/event/MagicPayLifeEvent.java +++ b/src/magic/model/event/MagicPayLifeEvent.java @@ -1,9 +1,9 @@ package magic.model.event; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.MagicCopyMap; import magic.model.action.ChangeLifeAction; import magic.model.condition.MagicCondition; import magic.model.condition.MagicConditionFactory; diff --git a/src/magic/model/event/MagicPayManaCostEvent.java b/src/magic/model/event/MagicPayManaCostEvent.java index 87ba9c0e7e..9b1408ea46 100644 --- a/src/magic/model/event/MagicPayManaCostEvent.java +++ b/src/magic/model/event/MagicPayManaCostEvent.java @@ -1,9 +1,9 @@ package magic.model.event; +import magic.model.MagicCard; import magic.model.MagicManaCost; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.MagicCard; import magic.model.choice.MagicPayManaCostChoice; public class MagicPayManaCostEvent extends MagicEvent { diff --git a/src/magic/model/event/MagicPermanentActivation.java b/src/magic/model/event/MagicPermanentActivation.java index b767d816a9..d72a843e37 100644 --- a/src/magic/model/event/MagicPermanentActivation.java +++ b/src/magic/model/event/MagicPermanentActivation.java @@ -1,5 +1,9 @@ package magic.model.event; +import java.util.Collections; +import java.util.List; + +import magic.model.ARG; import magic.model.MagicCardDefinition; import magic.model.MagicChangeCardDefinition; import magic.model.MagicGame; @@ -8,7 +12,6 @@ import magic.model.MagicPayedCost; import magic.model.MagicPermanent; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.ARG; import magic.model.action.AddStaticAction; import magic.model.action.PutItemOnStackAction; import magic.model.choice.MagicChoice; @@ -16,9 +19,6 @@ import magic.model.condition.MagicCondition; import magic.model.mstatic.MagicStatic; import magic.model.stack.MagicAbilityOnStack; -import java.util.Collections; -import java.util.List; - public abstract class MagicPermanentActivation extends MagicActivation implements MagicChangeCardDefinition { public MagicPermanentActivation(final MagicActivationHints hints, final String txt) { diff --git a/src/magic/model/event/MagicPlaneswalkerActivation.java b/src/magic/model/event/MagicPlaneswalkerActivation.java index fd8c04115b..9e436da193 100644 --- a/src/magic/model/event/MagicPlaneswalkerActivation.java +++ b/src/magic/model/event/MagicPlaneswalkerActivation.java @@ -1,13 +1,13 @@ package magic.model.event; -import magic.model.MagicCounterType; -import magic.model.MagicPermanent; -import magic.model.MagicPayedCost; -import magic.model.condition.MagicCondition; -import magic.model.ARG; - import java.util.Arrays; +import magic.model.ARG; +import magic.model.MagicCounterType; +import magic.model.MagicPayedCost; +import magic.model.MagicPermanent; +import magic.model.condition.MagicCondition; + public abstract class MagicPlaneswalkerActivation extends MagicPermanentActivation { final int cost; diff --git a/src/magic/model/event/MagicPlayAbilityEvent.java b/src/magic/model/event/MagicPlayAbilityEvent.java index 52ce38d97c..50004ed112 100644 --- a/src/magic/model/event/MagicPlayAbilityEvent.java +++ b/src/magic/model/event/MagicPlayAbilityEvent.java @@ -1,8 +1,8 @@ package magic.model.event; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicCopyMap; import magic.model.action.PlayAbilityAction; import magic.model.condition.MagicCondition; diff --git a/src/magic/model/event/MagicPlayCardEvent.java b/src/magic/model/event/MagicPlayCardEvent.java index b255a9bcee..cf9569c8c0 100644 --- a/src/magic/model/event/MagicPlayCardEvent.java +++ b/src/magic/model/event/MagicPlayCardEvent.java @@ -2,8 +2,8 @@ package magic.model.event; import magic.model.MagicGame; import magic.model.MagicPayedCost; -import magic.model.stack.MagicCardOnStack; import magic.model.action.PlayCardFromStackAction; +import magic.model.stack.MagicCardOnStack; public class MagicPlayCardEvent { private MagicPlayCardEvent() {} diff --git a/src/magic/model/event/MagicPlayerTriggerEvent.java b/src/magic/model/event/MagicPlayerTriggerEvent.java index d8078b4e9b..4b1f641cf7 100644 --- a/src/magic/model/event/MagicPlayerTriggerEvent.java +++ b/src/magic/model/event/MagicPlayerTriggerEvent.java @@ -1,8 +1,8 @@ package magic.model.event; -import magic.model.MagicSource; -import magic.model.MagicPlayer; import magic.model.MagicCopyable; +import magic.model.MagicPlayer; +import magic.model.MagicSource; public class MagicPlayerTriggerEvent implements MagicEventFactory { private final MagicSourceEvent you; diff --git a/src/magic/model/event/MagicProcessorEvent.java b/src/magic/model/event/MagicProcessorEvent.java index 4b882934f1..4e60bef059 100644 --- a/src/magic/model/event/MagicProcessorEvent.java +++ b/src/magic/model/event/MagicProcessorEvent.java @@ -2,10 +2,10 @@ package magic.model.event; import magic.model.MagicCard; import magic.model.MagicGame; -import magic.model.MagicSource; import magic.model.MagicLocationType; -import magic.model.choice.MagicTargetChoice; +import magic.model.MagicSource; import magic.model.action.ShiftCardAction; +import magic.model.choice.MagicTargetChoice; public class MagicProcessorEvent extends MagicEvent { diff --git a/src/magic/model/event/MagicPutCardOnStackEvent.java b/src/magic/model/event/MagicPutCardOnStackEvent.java index 063f5d6fde..8ed3f4c29b 100644 --- a/src/magic/model/event/MagicPutCardOnStackEvent.java +++ b/src/magic/model/event/MagicPutCardOnStackEvent.java @@ -2,15 +2,15 @@ package magic.model.event; import java.util.Collections; -import magic.model.MagicGame; import magic.model.MagicCard; -import magic.model.MagicPlayer; +import magic.model.MagicGame; import magic.model.MagicLocationType; +import magic.model.MagicPlayer; import magic.model.MagicTuple; -import magic.model.stack.MagicCardOnStack; +import magic.model.action.MagicPermanentAction; import magic.model.action.PutItemOnStackAction; import magic.model.action.RemoveCardAction; -import magic.model.action.MagicPermanentAction; +import magic.model.stack.MagicCardOnStack; public class MagicPutCardOnStackEvent extends MagicEvent { public MagicPutCardOnStackEvent(final MagicCard source, final MagicPlayer player, final MagicLocationType fromLocation, final MagicLocationType toLocation, final MagicPermanentAction mod) { diff --git a/src/magic/model/event/MagicPutOntoBattlefieldEvent.java b/src/magic/model/event/MagicPutOntoBattlefieldEvent.java index 01ca23553a..ceae8a86c5 100644 --- a/src/magic/model/event/MagicPutOntoBattlefieldEvent.java +++ b/src/magic/model/event/MagicPutOntoBattlefieldEvent.java @@ -2,6 +2,7 @@ package magic.model.event; import java.util.Arrays; import java.util.List; + import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicLocationType; diff --git a/src/magic/model/event/MagicRegularCostEvent.java b/src/magic/model/event/MagicRegularCostEvent.java index cadb61f01d..439f9b2033 100644 --- a/src/magic/model/event/MagicRegularCostEvent.java +++ b/src/magic/model/event/MagicRegularCostEvent.java @@ -1,11 +1,11 @@ package magic.model.event; -import magic.model.MagicSource; -import magic.model.ARG; - -import java.util.regex.Matcher; import java.util.LinkedList; import java.util.List; +import java.util.regex.Matcher; + +import magic.model.ARG; +import magic.model.MagicSource; public class MagicRegularCostEvent implements MagicMatchedCostEvent { diff --git a/src/magic/model/event/MagicReinforceActivation.java b/src/magic/model/event/MagicReinforceActivation.java index 497a0474fb..394d788b66 100644 --- a/src/magic/model/event/MagicReinforceActivation.java +++ b/src/magic/model/event/MagicReinforceActivation.java @@ -1,11 +1,11 @@ package magic.model.event; +import java.util.Arrays; + import magic.model.MagicCard; import magic.model.MagicManaCost; import magic.model.MagicPayedCost; -import java.util.Arrays; - public class MagicReinforceActivation extends MagicCardAbilityActivation { final MagicManaCost cost; diff --git a/src/magic/model/event/MagicRemoveCounterEvent.java b/src/magic/model/event/MagicRemoveCounterEvent.java index e4fa503546..324e3580f7 100644 --- a/src/magic/model/event/MagicRemoveCounterEvent.java +++ b/src/magic/model/event/MagicRemoveCounterEvent.java @@ -1,9 +1,9 @@ package magic.model.event; +import magic.model.MagicCopyMap; import magic.model.MagicCounterType; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicCopyMap; import magic.model.MagicTuple; import magic.model.action.ChangeCountersAction; import magic.model.condition.MagicCondition; diff --git a/src/magic/model/event/MagicRepeatedCostEvent.java b/src/magic/model/event/MagicRepeatedCostEvent.java index 8c72b77add..e42a4c2e60 100644 --- a/src/magic/model/event/MagicRepeatedCostEvent.java +++ b/src/magic/model/event/MagicRepeatedCostEvent.java @@ -1,9 +1,9 @@ package magic.model.event; -import magic.model.MagicGame; -import magic.model.MagicSource; -import magic.model.MagicPlayer; import magic.model.MagicCopyMap; +import magic.model.MagicGame; +import magic.model.MagicPlayer; +import magic.model.MagicSource; import magic.model.MagicTuple; import magic.model.choice.MagicTargetChoice; import magic.model.condition.MagicCondition; diff --git a/src/magic/model/event/MagicRetraceActivation.java b/src/magic/model/event/MagicRetraceActivation.java index 9194acaa54..2a6d2cdf1a 100644 --- a/src/magic/model/event/MagicRetraceActivation.java +++ b/src/magic/model/event/MagicRetraceActivation.java @@ -1,11 +1,11 @@ package magic.model.event; +import java.util.Arrays; + import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.choice.MagicTargetChoice; -import java.util.Arrays; - public class MagicRetraceActivation extends MagicGraveyardCastActivation { public MagicRetraceActivation(final MagicCardDefinition cdef) { diff --git a/src/magic/model/event/MagicRuleEventAction.java b/src/magic/model/event/MagicRuleEventAction.java index d197045cc8..936d6b662f 100644 --- a/src/magic/model/event/MagicRuleEventAction.java +++ b/src/magic/model/event/MagicRuleEventAction.java @@ -4,16 +4,86 @@ import java.util.Collection; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; + import magic.data.CardDefinitions; -import magic.model.*; -import magic.model.action.*; +import magic.model.ARG; +import magic.model.MagicAbility; +import magic.model.MagicAbilityList; +import magic.model.MagicAmount; +import magic.model.MagicAmountFactory; +import magic.model.MagicAmountParser; +import magic.model.MagicCard; +import magic.model.MagicCardDefinition; +import magic.model.MagicCardList; +import magic.model.MagicCounterType; +import magic.model.MagicDamage; +import magic.model.MagicGame; +import magic.model.MagicLocationType; +import magic.model.MagicManaCost; +import magic.model.MagicMessage; +import magic.model.MagicPermanent; +import magic.model.MagicPermanentList; +import magic.model.MagicPermanentState; +import magic.model.MagicPlayer; +import magic.model.MagicPlayerState; +import magic.model.MagicSource; +import magic.model.MagicType; +import magic.model.action.AddStaticAction; +import magic.model.action.AddTriggerAction; +import magic.model.action.AddTurnTriggerAction; +import magic.model.action.AttachAction; +import magic.model.action.BecomeMonarchAction; +import magic.model.action.BecomesAction; +import magic.model.action.CastCardAction; +import magic.model.action.ChangeCardDestinationAction; +import magic.model.action.ChangeCountersAction; +import magic.model.action.ChangeExtraTurnsAction; +import magic.model.action.ChangeLifeAction; +import magic.model.action.ChangePlayerStateAction; +import magic.model.action.ChangeStateAction; +import magic.model.action.ChangeTurnPTAction; +import magic.model.action.CipherAction; +import magic.model.action.CopyCardOnStackAction; +import magic.model.action.CounterItemOnStackAction; +import magic.model.action.DealDamageAction; +import magic.model.action.DestroyAction; +import magic.model.action.DetainAction; +import magic.model.action.DrawAction; +import magic.model.action.ExileLinkAction; +import magic.model.action.ExileUntilEndOfTurnAction; +import magic.model.action.FlipAction; +import magic.model.action.GainAbilityAction; +import magic.model.action.GainControlAction; +import magic.model.action.GoadAction; +import magic.model.action.LoseAbilityAction; +import magic.model.action.LoseGameAction; +import magic.model.action.MagicPlayMod; +import magic.model.action.ManifestAction; +import magic.model.action.MillLibraryAction; +import magic.model.action.MillLibraryUntilAction; +import magic.model.action.PlayTokenAction; +import magic.model.action.PreventDamageAction; +import magic.model.action.PutOntoBattlefieldAction; +import magic.model.action.ReanimateAction; +import magic.model.action.RegenerateAction; +import magic.model.action.RemoveFromCombatAction; +import magic.model.action.RemoveFromPlayAction; +import magic.model.action.RevealAction; +import magic.model.action.SacrificeAction; +import magic.model.action.ShiftCardAction; +import magic.model.action.ShuffleLibraryAction; +import magic.model.action.TapAction; +import magic.model.action.TransformAction; +import magic.model.action.TurnFaceDownAction; +import magic.model.action.TurnFaceUpAction; +import magic.model.action.UntapAction; import magic.model.choice.MagicChoice; import magic.model.choice.MagicChoiceFactory; +import magic.model.choice.MagicColorChoice; import magic.model.choice.MagicFromCardFilterChoice; import magic.model.choice.MagicMayChoice; import magic.model.choice.MagicOrChoice; import magic.model.choice.MagicTargetChoice; -import magic.model.choice.MagicColorChoice; import magic.model.condition.MagicArtificialCondition; import magic.model.condition.MagicCondition; import magic.model.condition.MagicConditionFactory; @@ -22,8 +92,43 @@ import magic.model.mstatic.MagicLayer; import magic.model.mstatic.MagicStatic; import magic.model.stack.MagicCardOnStack; import magic.model.stack.MagicItemOnStack; -import magic.model.target.*; -import magic.model.trigger.*; +import magic.model.target.MagicBounceTargetPicker; +import magic.model.target.MagicDamageTargetPicker; +import magic.model.target.MagicDeathtouchTargetPicker; +import magic.model.target.MagicDefaultPermanentTargetPicker; +import magic.model.target.MagicDefaultTargetPicker; +import magic.model.target.MagicDestroyTargetPicker; +import magic.model.target.MagicExileTargetPicker; +import magic.model.target.MagicFirstStrikeTargetPicker; +import magic.model.target.MagicFlyingTargetPicker; +import magic.model.target.MagicGraveyardTargetPicker; +import magic.model.target.MagicHasteTargetPicker; +import magic.model.target.MagicIndestructibleTargetPicker; +import magic.model.target.MagicLifelinkTargetPicker; +import magic.model.target.MagicLoseAbilityTargetPicker; +import magic.model.target.MagicMustAttackTargetPicker; +import magic.model.target.MagicNoCombatTargetPicker; +import magic.model.target.MagicOtherPermanentTargetFilter; +import magic.model.target.MagicPreventTargetPicker; +import magic.model.target.MagicPumpTargetPicker; +import magic.model.target.MagicRegenerateTargetPicker; +import magic.model.target.MagicTapTargetPicker; +import magic.model.target.MagicTarget; +import magic.model.target.MagicTargetFilter; +import magic.model.target.MagicTargetFilterFactory; +import magic.model.target.MagicTargetHint; +import magic.model.target.MagicTargetPicker; +import magic.model.target.MagicTrampleTargetPicker; +import magic.model.target.MagicUnblockableTargetPicker; +import magic.model.target.MagicWeakenTargetPicker; +import magic.model.trigger.AtEndOfCombatTrigger; +import magic.model.trigger.AtEndOfTurnTrigger; +import magic.model.trigger.AtUpkeepTrigger; +import magic.model.trigger.AtYourUpkeepTrigger; +import magic.model.trigger.CantBlockTrigger; +import magic.model.trigger.PreventDamageTrigger; +import magic.model.trigger.ReboundTrigger; +import magic.model.trigger.ThisLeavesBattlefieldTrigger; public enum MagicRuleEventAction { UnlessYou( diff --git a/src/magic/model/event/MagicSacrificeEvent.java b/src/magic/model/event/MagicSacrificeEvent.java index 31555d704d..5f09588ee7 100644 --- a/src/magic/model/event/MagicSacrificeEvent.java +++ b/src/magic/model/event/MagicSacrificeEvent.java @@ -1,8 +1,8 @@ package magic.model.event; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicCopyMap; import magic.model.action.SacrificeAction; public class MagicSacrificeEvent extends MagicEvent { diff --git a/src/magic/model/event/MagicSacrificeManaActivation.java b/src/magic/model/event/MagicSacrificeManaActivation.java index 83c7d87cde..46a5eb659d 100644 --- a/src/magic/model/event/MagicSacrificeManaActivation.java +++ b/src/magic/model/event/MagicSacrificeManaActivation.java @@ -1,9 +1,10 @@ package magic.model.event; +import java.util.Collections; +import java.util.List; + import magic.model.MagicManaType; import magic.model.MagicPermanent; -import java.util.Collections; -import java.util.List; public class MagicSacrificeManaActivation extends MagicManaActivation { diff --git a/src/magic/model/event/MagicSacrificeTapManaActivation.java b/src/magic/model/event/MagicSacrificeTapManaActivation.java index fc6d9aaf9c..b7843a44ae 100644 --- a/src/magic/model/event/MagicSacrificeTapManaActivation.java +++ b/src/magic/model/event/MagicSacrificeTapManaActivation.java @@ -1,11 +1,11 @@ package magic.model.event; -import magic.model.MagicManaType; -import magic.model.MagicPermanent; - import java.util.Arrays; import java.util.List; +import magic.model.MagicManaType; +import magic.model.MagicPermanent; + public class MagicSacrificeTapManaActivation extends MagicManaActivation { public MagicSacrificeTapManaActivation(final List manaTypes) { diff --git a/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java b/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java index a09c85d595..cfe5c6824f 100644 --- a/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java +++ b/src/magic/model/event/MagicSearchOntoBattlefieldEvent.java @@ -2,6 +2,7 @@ package magic.model.event; import java.util.Arrays; import java.util.List; + import magic.model.MagicCard; import magic.model.MagicGame; import magic.model.MagicMessage; diff --git a/src/magic/model/event/MagicSourceEvent.java b/src/magic/model/event/MagicSourceEvent.java index 78a52f3c79..23779336be 100644 --- a/src/magic/model/event/MagicSourceEvent.java +++ b/src/magic/model/event/MagicSourceEvent.java @@ -1,15 +1,15 @@ package magic.model.event; -import magic.model.MagicSource; -import magic.model.MagicPlayer; -import magic.model.MagicCopyable; -import magic.model.condition.MagicCondition; -import magic.model.choice.MagicChoiceFactory; -import magic.model.choice.MagicChoice; -import magic.model.target.MagicTargetPicker; - import java.util.regex.Matcher; +import magic.model.MagicCopyable; +import magic.model.MagicPlayer; +import magic.model.MagicSource; +import magic.model.choice.MagicChoice; +import magic.model.choice.MagicChoiceFactory; +import magic.model.condition.MagicCondition; +import magic.model.target.MagicTargetPicker; + public class MagicSourceEvent implements MagicCopyable, MagicEventFactory { private final MagicRuleEventAction rule; private final Matcher matcher; diff --git a/src/magic/model/event/MagicSourceManaActivation.java b/src/magic/model/event/MagicSourceManaActivation.java index bfa95bea29..a13c82b6ff 100644 --- a/src/magic/model/event/MagicSourceManaActivation.java +++ b/src/magic/model/event/MagicSourceManaActivation.java @@ -1,10 +1,10 @@ package magic.model.event; import magic.model.MagicCostManaType; -import magic.model.MagicType; import magic.model.MagicGame; import magic.model.MagicManaType; import magic.model.MagicPermanent; +import magic.model.MagicType; /** Each source can only be activated once for mana. Each mana type must come from at most one activation. */ public class MagicSourceManaActivation { diff --git a/src/magic/model/event/MagicSourceManaActivationResult.java b/src/magic/model/event/MagicSourceManaActivationResult.java index 440f754f69..64afac0051 100644 --- a/src/magic/model/event/MagicSourceManaActivationResult.java +++ b/src/magic/model/event/MagicSourceManaActivationResult.java @@ -1,10 +1,10 @@ package magic.model.event; +import magic.model.MagicCopyMap; +import magic.model.MagicCopyable; import magic.model.MagicGame; import magic.model.MagicMappable; import magic.model.MagicPermanent; -import magic.model.MagicCopyable; -import magic.model.MagicCopyMap; // need MagicCopyable as it can be stored on the stack inside MagicBuilderPayManaCostResult public class MagicSourceManaActivationResult implements MagicCopyable, MagicMappable { diff --git a/src/magic/model/event/MagicSpectacleActivation.java b/src/magic/model/event/MagicSpectacleActivation.java index 1c956361ed..aff87f37da 100644 --- a/src/magic/model/event/MagicSpectacleActivation.java +++ b/src/magic/model/event/MagicSpectacleActivation.java @@ -1,6 +1,7 @@ package magic.model.event; import java.util.Arrays; + import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicManaCost; diff --git a/src/magic/model/event/MagicStackGetChoicesEvent.java b/src/magic/model/event/MagicStackGetChoicesEvent.java index 01d6e8c7f8..3a0fd88c31 100644 --- a/src/magic/model/event/MagicStackGetChoicesEvent.java +++ b/src/magic/model/event/MagicStackGetChoicesEvent.java @@ -1,9 +1,9 @@ package magic.model.event; -import magic.model.MagicGame; import magic.model.MagicCopyMap; -import magic.model.stack.MagicItemOnStack; +import magic.model.MagicGame; import magic.model.choice.MagicTargetChoice; +import magic.model.stack.MagicItemOnStack; import magic.model.trigger.MagicTriggerType; public class MagicStackGetChoicesEvent extends MagicEvent { diff --git a/src/magic/model/event/MagicSurgeActivation.java b/src/magic/model/event/MagicSurgeActivation.java index 260af25839..6b4ba52c12 100644 --- a/src/magic/model/event/MagicSurgeActivation.java +++ b/src/magic/model/event/MagicSurgeActivation.java @@ -1,6 +1,7 @@ package magic.model.event; import java.util.Arrays; + import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicManaCost; diff --git a/src/magic/model/event/MagicTapEnchantedEvent.java b/src/magic/model/event/MagicTapEnchantedEvent.java index 7527cfeb14..8340daa123 100644 --- a/src/magic/model/event/MagicTapEnchantedEvent.java +++ b/src/magic/model/event/MagicTapEnchantedEvent.java @@ -1,8 +1,8 @@ package magic.model.event; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicCopyMap; import magic.model.action.TapAction; import magic.model.condition.MagicCondition; diff --git a/src/magic/model/event/MagicTapEvent.java b/src/magic/model/event/MagicTapEvent.java index 0fdeab8b02..04331310d8 100644 --- a/src/magic/model/event/MagicTapEvent.java +++ b/src/magic/model/event/MagicTapEvent.java @@ -1,8 +1,8 @@ package magic.model.event; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicCopyMap; import magic.model.action.TapAction; import magic.model.condition.MagicCondition; diff --git a/src/magic/model/event/MagicTapOrUntapEvent.java b/src/magic/model/event/MagicTapOrUntapEvent.java index 9323abfb07..653fe8f61e 100644 --- a/src/magic/model/event/MagicTapOrUntapEvent.java +++ b/src/magic/model/event/MagicTapOrUntapEvent.java @@ -1,11 +1,11 @@ package magic.model.event; import magic.model.MagicGame; -import magic.model.MagicSource; import magic.model.MagicPermanent; -import magic.model.choice.MagicMayChoice; +import magic.model.MagicSource; import magic.model.action.TapAction; import magic.model.action.UntapAction; +import magic.model.choice.MagicMayChoice; public class MagicTapOrUntapEvent extends MagicEvent { diff --git a/src/magic/model/event/MagicTransmuteActivation.java b/src/magic/model/event/MagicTransmuteActivation.java index f909eb62dd..880bea2548 100644 --- a/src/magic/model/event/MagicTransmuteActivation.java +++ b/src/magic/model/event/MagicTransmuteActivation.java @@ -1,19 +1,19 @@ package magic.model.event; +import java.util.Arrays; + import magic.model.MagicCard; import magic.model.MagicGame; -import magic.model.MagicSource; -import magic.model.MagicManaCost; -import magic.model.MagicPlayer; import magic.model.MagicLocationType; +import magic.model.MagicManaCost; import magic.model.MagicPayedCost; +import magic.model.MagicPlayer; +import magic.model.MagicSource; import magic.model.choice.MagicTargetChoice; import magic.model.condition.MagicCondition; import magic.model.target.MagicCardFilterImpl; import magic.model.target.MagicTargetType; -import java.util.Arrays; - public class MagicTransmuteActivation extends MagicCardAbilityActivation { final MagicManaCost cost; diff --git a/src/magic/model/event/MagicTutorTopEvent.java b/src/magic/model/event/MagicTutorTopEvent.java index 63363a2980..5154550154 100644 --- a/src/magic/model/event/MagicTutorTopEvent.java +++ b/src/magic/model/event/MagicTutorTopEvent.java @@ -1,17 +1,17 @@ package magic.model.event; -import magic.model.MagicGame; -import magic.model.MagicPlayer; +import java.util.List; + import magic.model.MagicCard; import magic.model.MagicCardList; +import magic.model.MagicGame; import magic.model.MagicLocationType; -import magic.model.target.MagicTargetFilter; -import magic.model.target.MagicGraveyardTargetPicker; -import magic.model.action.ShiftCardAction; +import magic.model.MagicPlayer; import magic.model.action.RevealAction; +import magic.model.action.ShiftCardAction; import magic.model.choice.MagicFromCardListChoice; - -import java.util.List; +import magic.model.target.MagicGraveyardTargetPicker; +import magic.model.target.MagicTargetFilter; public class MagicTutorTopEvent { diff --git a/src/magic/model/event/MagicUntapEvent.java b/src/magic/model/event/MagicUntapEvent.java index e86b0f2f5e..9b2ad1f98a 100644 --- a/src/magic/model/event/MagicUntapEvent.java +++ b/src/magic/model/event/MagicUntapEvent.java @@ -1,8 +1,8 @@ package magic.model.event; +import magic.model.MagicCopyMap; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicCopyMap; import magic.model.action.UntapAction; import magic.model.condition.MagicCondition; diff --git a/src/magic/model/event/PermanentSpecParser.java b/src/magic/model/event/PermanentSpecParser.java index 60b49d3e6d..c19f6faaf7 100644 --- a/src/magic/model/event/PermanentSpecParser.java +++ b/src/magic/model/event/PermanentSpecParser.java @@ -1,16 +1,16 @@ package magic.model.event; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.regex.Matcher; + +import magic.model.MagicAbility; +import magic.model.MagicAbilityList; import magic.model.MagicColor; import magic.model.MagicSubType; import magic.model.MagicType; -import magic.model.MagicAbility; -import magic.model.MagicAbilityList; - -import java.util.Arrays; -import java.util.regex.Matcher; -import java.util.Set; -import java.util.List; -import java.util.LinkedList; public class PermanentSpecParser { public final int[] pt; diff --git a/src/magic/model/mstatic/MagicCDA.java b/src/magic/model/mstatic/MagicCDA.java index 2d6f9f1d91..c5b98e9d02 100644 --- a/src/magic/model/mstatic/MagicCDA.java +++ b/src/magic/model/mstatic/MagicCDA.java @@ -1,6 +1,7 @@ package magic.model.mstatic; import java.util.Set; + import magic.model.MagicAmount; import magic.model.MagicCardDefinition; import magic.model.MagicChangeCardDefinition; diff --git a/src/magic/model/mstatic/MagicDummyModifier.java b/src/magic/model/mstatic/MagicDummyModifier.java index 1e4b915d28..d799a4a3dc 100644 --- a/src/magic/model/mstatic/MagicDummyModifier.java +++ b/src/magic/model/mstatic/MagicDummyModifier.java @@ -1,16 +1,16 @@ package magic.model.mstatic; +import java.util.Set; + import magic.model.MagicAbility; +import magic.model.MagicCard; import magic.model.MagicGame; +import magic.model.MagicManaCost; import magic.model.MagicPermanent; import magic.model.MagicPlayer; -import magic.model.MagicCard; -import magic.model.MagicManaCost; import magic.model.MagicPowerToughness; import magic.model.MagicSubType; -import java.util.Set; - public class MagicDummyModifier implements MagicModifier { @Override diff --git a/src/magic/model/mstatic/MagicModifier.java b/src/magic/model/mstatic/MagicModifier.java index 286f7f5111..a04fa3f155 100644 --- a/src/magic/model/mstatic/MagicModifier.java +++ b/src/magic/model/mstatic/MagicModifier.java @@ -1,15 +1,15 @@ package magic.model.mstatic; +import java.util.Set; + import magic.model.MagicAbility; +import magic.model.MagicCard; import magic.model.MagicGame; +import magic.model.MagicManaCost; import magic.model.MagicPermanent; import magic.model.MagicPlayer; -import magic.model.MagicCard; import magic.model.MagicPowerToughness; import magic.model.MagicSubType; -import magic.model.MagicManaCost; - -import java.util.Set; // Determines variable power, toughness, abilities, sub types and colors for a single creature permanent. public interface MagicModifier { diff --git a/src/magic/model/mstatic/MagicStatic.java b/src/magic/model/mstatic/MagicStatic.java index 7d46667132..47e2dfa002 100644 --- a/src/magic/model/mstatic/MagicStatic.java +++ b/src/magic/model/mstatic/MagicStatic.java @@ -5,15 +5,14 @@ import java.util.Set; import magic.model.MagicAbility; import magic.model.MagicAbilityList; import magic.model.MagicAmount; +import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicChangeCardDefinition; import magic.model.MagicColor; import magic.model.MagicCounterType; import magic.model.MagicGame; -import magic.model.MagicPermanent; -import magic.model.MagicCard; import magic.model.MagicManaCost; -import magic.model.MagicCostManaType; +import magic.model.MagicPermanent; import magic.model.MagicPlayer; import magic.model.MagicPlayerState; import magic.model.MagicPowerToughness; diff --git a/src/magic/model/player/AiProfile.java b/src/magic/model/player/AiProfile.java index b6405ef60a..eace1124e7 100644 --- a/src/magic/model/player/AiProfile.java +++ b/src/magic/model/player/AiProfile.java @@ -1,9 +1,10 @@ package magic.model.player; import java.util.Properties; + import magic.ai.MagicAIImpl; -import magic.translate.StringContext; import magic.translate.MText; +import magic.translate.StringContext; import magic.utility.SortedProperties; public class AiProfile extends PlayerProfile { diff --git a/src/magic/model/player/PlayerProfile.java b/src/magic/model/player/PlayerProfile.java index ccacb8405d..ad47693af1 100644 --- a/src/magic/model/player/PlayerProfile.java +++ b/src/magic/model/player/PlayerProfile.java @@ -6,6 +6,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.Properties; import java.util.UUID; + import magic.utility.FileIO; import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem.DataPath; diff --git a/src/magic/model/player/PlayerProfiles.java b/src/magic/model/player/PlayerProfiles.java index 0e92576f85..5a21bf5e6a 100644 --- a/src/magic/model/player/PlayerProfiles.java +++ b/src/magic/model/player/PlayerProfiles.java @@ -10,6 +10,7 @@ import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.HashMap; import java.util.List; + import magic.ai.MagicAIImpl; import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem.DataPath; diff --git a/src/magic/model/player/PlayerStatistics.java b/src/magic/model/player/PlayerStatistics.java index 6a68b65182..da016c3d2f 100644 --- a/src/magic/model/player/PlayerStatistics.java +++ b/src/magic/model/player/PlayerStatistics.java @@ -6,6 +6,7 @@ import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Properties; + import magic.model.MagicCardDefinition; import magic.model.MagicColor; import magic.model.MagicDeck; diff --git a/src/magic/model/stack/MagicAbilityOnStack.java b/src/magic/model/stack/MagicAbilityOnStack.java index 433acdb3a5..66cf7b75f8 100644 --- a/src/magic/model/stack/MagicAbilityOnStack.java +++ b/src/magic/model/stack/MagicAbilityOnStack.java @@ -3,8 +3,8 @@ package magic.model.stack; import magic.model.MagicCopyMap; import magic.model.MagicPayedCost; import magic.model.MagicPermanent; -import magic.model.event.MagicHandCastActivation; import magic.model.event.MagicEvent; +import magic.model.event.MagicHandCastActivation; import magic.model.event.MagicPermanentActivation; diff --git a/src/magic/model/target/DetectedPrefixes.java b/src/magic/model/target/DetectedPrefixes.java index ceda662c1b..b5d17965fe 100644 --- a/src/magic/model/target/DetectedPrefixes.java +++ b/src/magic/model/target/DetectedPrefixes.java @@ -1,13 +1,13 @@ package magic.model.target; -import magic.model.MagicColor; -import magic.model.MagicSubType; -import magic.model.MagicType; - import java.util.StringJoiner; import java.util.regex.Matcher; import java.util.regex.Pattern; +import magic.model.MagicColor; +import magic.model.MagicSubType; +import magic.model.MagicType; + /** * Parsed restriction on color, type and subtype. */ diff --git a/src/magic/model/target/MagicCMCPermanentFilter.java b/src/magic/model/target/MagicCMCPermanentFilter.java index bf1d360efd..628576f42c 100644 --- a/src/magic/model/target/MagicCMCPermanentFilter.java +++ b/src/magic/model/target/MagicCMCPermanentFilter.java @@ -1,8 +1,8 @@ package magic.model.target; -import magic.model.MagicSource; import magic.model.MagicPermanent; import magic.model.MagicPlayer; +import magic.model.MagicSource; public class MagicCMCPermanentFilter extends MagicPermanentFilterImpl { diff --git a/src/magic/model/target/MagicCardFilterImpl.java b/src/magic/model/target/MagicCardFilterImpl.java index 34adee49e6..306f9922ca 100644 --- a/src/magic/model/target/MagicCardFilterImpl.java +++ b/src/magic/model/target/MagicCardFilterImpl.java @@ -4,6 +4,7 @@ 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; diff --git a/src/magic/model/target/MagicDamageTargetPicker.java b/src/magic/model/target/MagicDamageTargetPicker.java index d0bc46096e..04269278c3 100644 --- a/src/magic/model/target/MagicDamageTargetPicker.java +++ b/src/magic/model/target/MagicDamageTargetPicker.java @@ -1,14 +1,14 @@ package magic.model.target; import magic.ai.ArtificialScoringSystem; +import magic.exception.GameException; import magic.model.MagicAbility; +import magic.model.MagicAmount; +import magic.model.MagicAmountFactory; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPlayer; -import magic.model.MagicAmount; -import magic.model.MagicAmountFactory; import magic.model.event.MagicEvent; -import magic.exception.GameException; /** Creature permanent or player. Can be your own creatures. */ public class MagicDamageTargetPicker extends MagicTargetPicker { diff --git a/src/magic/model/target/MagicDefaultPermanentPicker.java b/src/magic/model/target/MagicDefaultPermanentPicker.java index 14a2623ea4..cc2dce31ca 100644 --- a/src/magic/model/target/MagicDefaultPermanentPicker.java +++ b/src/magic/model/target/MagicDefaultPermanentPicker.java @@ -1,12 +1,12 @@ package magic.model.target; +import java.util.Collection; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPlayer; import magic.model.event.MagicEvent; -import java.util.Collection; - public class MagicDefaultPermanentPicker extends MagicTargetPicker { private static final MagicDefaultPermanentPicker INSTANCE = new MagicDefaultPermanentPicker(); diff --git a/src/magic/model/target/MagicDefaultPermanentTargetPicker.java b/src/magic/model/target/MagicDefaultPermanentTargetPicker.java index e1acbebb25..bc6b847238 100644 --- a/src/magic/model/target/MagicDefaultPermanentTargetPicker.java +++ b/src/magic/model/target/MagicDefaultPermanentTargetPicker.java @@ -1,12 +1,12 @@ package magic.model.target; +import java.util.Collection; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPlayer; import magic.model.event.MagicEvent; -import java.util.Collection; - public class MagicDefaultPermanentTargetPicker extends MagicTargetPicker { private static final MagicDefaultPermanentTargetPicker INSTANCE = new MagicDefaultPermanentTargetPicker(); diff --git a/src/magic/model/target/MagicDefaultTargetPicker.java b/src/magic/model/target/MagicDefaultTargetPicker.java index 011ae1a40d..81103418e7 100644 --- a/src/magic/model/target/MagicDefaultTargetPicker.java +++ b/src/magic/model/target/MagicDefaultTargetPicker.java @@ -1,11 +1,11 @@ package magic.model.target; +import java.util.Collection; + import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.event.MagicEvent; -import java.util.Collection; - public class MagicDefaultTargetPicker extends MagicTargetPicker { private static final MagicDefaultTargetPicker INSTANCE = new MagicDefaultTargetPicker(); diff --git a/src/magic/model/target/MagicEquipTargetPicker.java b/src/magic/model/target/MagicEquipTargetPicker.java index 0c85ccabc9..493c5d71c6 100644 --- a/src/magic/model/target/MagicEquipTargetPicker.java +++ b/src/magic/model/target/MagicEquipTargetPicker.java @@ -1,5 +1,7 @@ package magic.model.target; +import java.util.Set; + import magic.model.MagicAbility; import magic.model.MagicGame; import magic.model.MagicPermanent; @@ -7,8 +9,6 @@ import magic.model.MagicPlayer; import magic.model.MagicPowerToughness; import magic.model.mstatic.MagicStatic; -import java.util.Set; - public class MagicEquipTargetPicker extends MagicTargetPicker { private final Set givenAbilityFlags = MagicAbility.noneOf(); diff --git a/src/magic/model/target/MagicLegendaryCopiesFilter.java b/src/magic/model/target/MagicLegendaryCopiesFilter.java index d07b04790d..8d16fdf072 100644 --- a/src/magic/model/target/MagicLegendaryCopiesFilter.java +++ b/src/magic/model/target/MagicLegendaryCopiesFilter.java @@ -1,8 +1,8 @@ package magic.model.target; -import magic.model.MagicSource; import magic.model.MagicPermanent; import magic.model.MagicPlayer; +import magic.model.MagicSource; import magic.model.MagicType; public class MagicLegendaryCopiesFilter extends MagicPermanentFilterImpl { diff --git a/src/magic/model/target/MagicNameTargetFilter.java b/src/magic/model/target/MagicNameTargetFilter.java index dba0dd48c5..698048bae3 100644 --- a/src/magic/model/target/MagicNameTargetFilter.java +++ b/src/magic/model/target/MagicNameTargetFilter.java @@ -1,8 +1,8 @@ package magic.model.target; -import magic.model.MagicSource; import magic.model.MagicPermanent; import magic.model.MagicPlayer; +import magic.model.MagicSource; public class MagicNameTargetFilter extends MagicPermanentFilterImpl { diff --git a/src/magic/model/target/MagicOtherCardTargetFilter.java b/src/magic/model/target/MagicOtherCardTargetFilter.java index 42a470a5e7..72529fd702 100644 --- a/src/magic/model/target/MagicOtherCardTargetFilter.java +++ b/src/magic/model/target/MagicOtherCardTargetFilter.java @@ -1,8 +1,8 @@ package magic.model.target; import magic.model.MagicCard; -import magic.model.MagicSource; import magic.model.MagicPlayer; +import magic.model.MagicSource; // Permanent reference can not be used because game is copied. public class MagicOtherCardTargetFilter extends MagicCardFilterImpl { diff --git a/src/magic/model/target/MagicOtherPermanentTargetFilter.java b/src/magic/model/target/MagicOtherPermanentTargetFilter.java index 2efb067f91..643c5a4f12 100644 --- a/src/magic/model/target/MagicOtherPermanentTargetFilter.java +++ b/src/magic/model/target/MagicOtherPermanentTargetFilter.java @@ -1,8 +1,8 @@ package magic.model.target; -import magic.model.MagicSource; import magic.model.MagicPermanent; import magic.model.MagicPlayer; +import magic.model.MagicSource; // Permanent reference can not be used because game is copied. public class MagicOtherPermanentTargetFilter extends MagicPermanentFilterImpl { diff --git a/src/magic/model/target/MagicOtherTargetFilter.java b/src/magic/model/target/MagicOtherTargetFilter.java index f46de95c2a..4883a0b88a 100644 --- a/src/magic/model/target/MagicOtherTargetFilter.java +++ b/src/magic/model/target/MagicOtherTargetFilter.java @@ -1,7 +1,7 @@ package magic.model.target; -import magic.model.MagicPlayer; import magic.model.MagicPermanent; +import magic.model.MagicPlayer; import magic.model.MagicSource; // reference can not be used because game is copied. diff --git a/src/magic/model/target/MagicPTTargetFilter.java b/src/magic/model/target/MagicPTTargetFilter.java index 8ec8e07bee..ef8bc4f494 100644 --- a/src/magic/model/target/MagicPTTargetFilter.java +++ b/src/magic/model/target/MagicPTTargetFilter.java @@ -1,8 +1,8 @@ package magic.model.target; -import magic.model.MagicSource; import magic.model.MagicPermanent; import magic.model.MagicPlayer; +import magic.model.MagicSource; public class MagicPTTargetFilter extends MagicPermanentFilterImpl { diff --git a/src/magic/model/target/MagicPermanentFilterImpl.java b/src/magic/model/target/MagicPermanentFilterImpl.java index b1b8150050..ccab63e305 100644 --- a/src/magic/model/target/MagicPermanentFilterImpl.java +++ b/src/magic/model/target/MagicPermanentFilterImpl.java @@ -1,5 +1,8 @@ package magic.model.target; +import java.util.ArrayList; +import java.util.List; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPlayer; @@ -7,9 +10,6 @@ import magic.model.MagicSource; import magic.model.MagicType; import magic.model.event.MagicEvent; -import java.util.ArrayList; -import java.util.List; - public abstract class MagicPermanentFilterImpl implements MagicTargetFilter { @Override public List filter(final MagicSource source) { diff --git a/src/magic/model/target/MagicPermanentTargetFilter.java b/src/magic/model/target/MagicPermanentTargetFilter.java index b816482033..59d1502393 100644 --- a/src/magic/model/target/MagicPermanentTargetFilter.java +++ b/src/magic/model/target/MagicPermanentTargetFilter.java @@ -1,8 +1,8 @@ package magic.model.target; -import magic.model.MagicSource; import magic.model.MagicPermanent; import magic.model.MagicPlayer; +import magic.model.MagicSource; // Permanent reference can not be used because game is copied. public class MagicPermanentTargetFilter extends MagicPermanentFilterImpl { diff --git a/src/magic/model/target/MagicPlayerFilterImpl.java b/src/magic/model/target/MagicPlayerFilterImpl.java index 37ea3e9979..a45a2a8af6 100644 --- a/src/magic/model/target/MagicPlayerFilterImpl.java +++ b/src/magic/model/target/MagicPlayerFilterImpl.java @@ -1,13 +1,13 @@ package magic.model.target; +import java.util.ArrayList; +import java.util.List; + import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.MagicSource; import magic.model.event.MagicEvent; -import java.util.ArrayList; -import java.util.List; - public abstract class MagicPlayerFilterImpl implements MagicTargetFilter { @Override public List filter(final MagicSource source) { diff --git a/src/magic/model/target/MagicStackFilterImpl.java b/src/magic/model/target/MagicStackFilterImpl.java index 5833d8d68d..d2e5db7f82 100644 --- a/src/magic/model/target/MagicStackFilterImpl.java +++ b/src/magic/model/target/MagicStackFilterImpl.java @@ -1,13 +1,13 @@ package magic.model.target; +import java.util.ArrayList; +import java.util.List; + import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.stack.MagicItemOnStack; import magic.model.event.MagicEvent; - -import java.util.ArrayList; -import java.util.List; +import magic.model.stack.MagicItemOnStack; public abstract class MagicStackFilterImpl implements MagicTargetFilter { @Override diff --git a/src/magic/model/target/MagicTargetFilter.java b/src/magic/model/target/MagicTargetFilter.java index 3d68a0d152..87a1ce4347 100644 --- a/src/magic/model/target/MagicTargetFilter.java +++ b/src/magic/model/target/MagicTargetFilter.java @@ -1,6 +1,7 @@ package magic.model.target; import java.util.List; + import magic.model.MagicPlayer; import magic.model.MagicSource; import magic.model.event.MagicEvent; diff --git a/src/magic/model/target/MagicTargetFilterFactory.java b/src/magic/model/target/MagicTargetFilterFactory.java index 2234f1f916..343742cb4c 100644 --- a/src/magic/model/target/MagicTargetFilterFactory.java +++ b/src/magic/model/target/MagicTargetFilterFactory.java @@ -8,6 +8,7 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; +import magic.exception.ScriptParseException; import magic.model.MagicAbility; import magic.model.MagicCard; import magic.model.MagicColor; @@ -22,7 +23,6 @@ import magic.model.MagicSubType; import magic.model.MagicType; import magic.model.stack.MagicAbilityOnStack; import magic.model.stack.MagicItemOnStack; -import magic.exception.ScriptParseException; public class MagicTargetFilterFactory { diff --git a/src/magic/model/target/MagicTargetFilterParser.java b/src/magic/model/target/MagicTargetFilterParser.java index 8e1ee22558..a2f1d4c758 100644 --- a/src/magic/model/target/MagicTargetFilterParser.java +++ b/src/magic/model/target/MagicTargetFilterParser.java @@ -1,15 +1,28 @@ package magic.model.target; +import static magic.model.target.MagicTargetFilterFactory.ARTIFACT_OR_ENCHANTMENT; +import static magic.model.target.MagicTargetFilterFactory.COLORLESS_SPELL; +import static magic.model.target.MagicTargetFilterFactory.CREATURE; +import static magic.model.target.MagicTargetFilterFactory.PERMANENT; +import static magic.model.target.MagicTargetFilterFactory.SPELL; +import static magic.model.target.MagicTargetFilterFactory.card; +import static magic.model.target.MagicTargetFilterFactory.creature; +import static magic.model.target.MagicTargetFilterFactory.creatureNon; +import static magic.model.target.MagicTargetFilterFactory.permanent; +import static magic.model.target.MagicTargetFilterFactory.permanentCardEqualCMC; +import static magic.model.target.MagicTargetFilterFactory.permanentCardMaxCMC; +import static magic.model.target.MagicTargetFilterFactory.permanentCardMinCMC; +import static magic.model.target.MagicTargetFilterFactory.spell; + import java.util.regex.Matcher; import java.util.regex.Pattern; +import magic.exception.ScriptParseException; import magic.model.ARG; import magic.model.MagicPermanentState; -import magic.model.MagicType; import magic.model.MagicSubType; -import magic.exception.ScriptParseException; - -import static magic.model.target.MagicTargetFilterFactory.*; +import magic.model.MagicType; +import magic.model.target.MagicTargetFilterFactory.Control; public enum MagicTargetFilterParser { CARD1("artifact card with converted mana cost " + ARG.NUMBER + " or less from your graveyard") { diff --git a/src/magic/model/trigger/AtEndOfTurnTrigger.java b/src/magic/model/trigger/AtEndOfTurnTrigger.java index 5da9a8a0e0..2dafa44ff8 100644 --- a/src/magic/model/trigger/AtEndOfTurnTrigger.java +++ b/src/magic/model/trigger/AtEndOfTurnTrigger.java @@ -1,16 +1,16 @@ package magic.model.trigger; +import magic.data.CardDefinitions; import magic.model.MagicGame; import magic.model.MagicLocationType; import magic.model.MagicPermanent; import magic.model.MagicPlayer; -import magic.model.action.RemoveFromPlayAction; -import magic.model.action.SacrificeAction; import magic.model.action.DestroyAction; import magic.model.action.DrawAction; +import magic.model.action.RemoveFromPlayAction; +import magic.model.action.SacrificeAction; import magic.model.event.MagicEvent; import magic.model.event.MagicSourceEvent; -import magic.data.CardDefinitions; public abstract class AtEndOfTurnTrigger extends MagicTrigger { public AtEndOfTurnTrigger(final int priority) { diff --git a/src/magic/model/trigger/AtUpkeepTrigger.java b/src/magic/model/trigger/AtUpkeepTrigger.java index c97b0124d7..2f0b3ecf92 100644 --- a/src/magic/model/trigger/AtUpkeepTrigger.java +++ b/src/magic/model/trigger/AtUpkeepTrigger.java @@ -1,19 +1,19 @@ package magic.model.trigger; +import magic.model.MagicAbility; +import magic.model.MagicCard; +import magic.model.MagicCounterType; import magic.model.MagicGame; +import magic.model.MagicLocationType; import magic.model.MagicPermanent; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.MagicCard; -import magic.model.MagicCounterType; -import magic.model.MagicLocationType; -import magic.model.MagicAbility; -import magic.model.action.MagicPlayMod; -import magic.model.action.DrawAction; -import magic.model.action.RemoveTriggerAction; -import magic.model.action.ChangeCountersAction; import magic.model.action.CastCardAction; +import magic.model.action.ChangeCountersAction; +import magic.model.action.DrawAction; import magic.model.action.EnqueueTriggerAction; +import magic.model.action.MagicPlayMod; +import magic.model.action.RemoveTriggerAction; import magic.model.event.MagicEvent; import magic.model.event.MagicSourceEvent; diff --git a/src/magic/model/trigger/BattleCryTrigger.java b/src/magic/model/trigger/BattleCryTrigger.java index bff0f11e0f..0ea108320d 100644 --- a/src/magic/model/trigger/BattleCryTrigger.java +++ b/src/magic/model/trigger/BattleCryTrigger.java @@ -1,13 +1,13 @@ package magic.model.trigger; +import java.util.Collection; + import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.action.ChangeTurnPTAction; import magic.model.event.MagicEvent; import magic.model.target.MagicTargetFilterFactory; -import java.util.Collection; - public class BattleCryTrigger extends ThisAttacksTrigger { private static final BattleCryTrigger INSTANCE = new BattleCryTrigger(); diff --git a/src/magic/model/trigger/BecomesBlockedTrigger.java b/src/magic/model/trigger/BecomesBlockedTrigger.java index 4fb78848f3..03ff5a8678 100644 --- a/src/magic/model/trigger/BecomesBlockedTrigger.java +++ b/src/magic/model/trigger/BecomesBlockedTrigger.java @@ -3,10 +3,10 @@ package magic.model.trigger; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPermanentState; -import magic.model.event.MagicSourceEvent; -import magic.model.event.MagicEvent; -import magic.model.target.MagicTargetFilter; import magic.model.action.ChangeStateAction; +import magic.model.event.MagicEvent; +import magic.model.event.MagicSourceEvent; +import magic.model.target.MagicTargetFilter; public abstract class BecomesBlockedTrigger extends BecomesStateTrigger { public BecomesBlockedTrigger(final int priority) { diff --git a/src/magic/model/trigger/BecomesTargetTrigger.java b/src/magic/model/trigger/BecomesTargetTrigger.java index 92181e038d..5f721c13d3 100644 --- a/src/magic/model/trigger/BecomesTargetTrigger.java +++ b/src/magic/model/trigger/BecomesTargetTrigger.java @@ -5,8 +5,8 @@ import magic.model.MagicPermanent; import magic.model.event.MagicEvent; import magic.model.event.MagicSourceEvent; import magic.model.stack.MagicItemOnStack; -import magic.model.target.MagicTargetFilter; import magic.model.target.MagicTarget; +import magic.model.target.MagicTargetFilter; public abstract class BecomesTargetTrigger extends MagicTrigger { public BecomesTargetTrigger(final int priority) { diff --git a/src/magic/model/trigger/CantBeBlockedTrigger.java b/src/magic/model/trigger/CantBeBlockedTrigger.java index c41c8201af..f8ad9e100e 100644 --- a/src/magic/model/trigger/CantBeBlockedTrigger.java +++ b/src/magic/model/trigger/CantBeBlockedTrigger.java @@ -1,10 +1,10 @@ package magic.model.trigger; +import magic.exception.GameException; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.event.MagicEvent; import magic.model.target.MagicTargetFilter; -import magic.exception.GameException; public abstract class CantBeBlockedTrigger extends MagicTrigger { public CantBeBlockedTrigger(final int priority) { diff --git a/src/magic/model/trigger/CantBlockTrigger.java b/src/magic/model/trigger/CantBlockTrigger.java index c74d916c4a..e6767eaff4 100644 --- a/src/magic/model/trigger/CantBlockTrigger.java +++ b/src/magic/model/trigger/CantBlockTrigger.java @@ -1,10 +1,10 @@ package magic.model.trigger; +import magic.exception.GameException; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.event.MagicEvent; import magic.model.target.MagicTargetFilter; -import magic.exception.GameException; public abstract class CantBlockTrigger extends MagicTrigger { public CantBlockTrigger(final int priority) { diff --git a/src/magic/model/trigger/CascadeTrigger.java b/src/magic/model/trigger/CascadeTrigger.java index e3f1cb2fae..463a4c5032 100644 --- a/src/magic/model/trigger/CascadeTrigger.java +++ b/src/magic/model/trigger/CascadeTrigger.java @@ -4,11 +4,11 @@ import magic.model.MagicCard; import magic.model.MagicCardList; import magic.model.MagicGame; import magic.model.MagicLocationType; +import magic.model.MagicMessage; import magic.model.MagicPermanent; import magic.model.MagicType; -import magic.model.MagicMessage; -import magic.model.action.ShiftCardAction; import magic.model.action.CastCardAction; +import magic.model.action.ShiftCardAction; import magic.model.choice.MagicMayChoice; import magic.model.event.MagicEvent; import magic.model.event.MagicEventAction; diff --git a/src/magic/model/trigger/DamageIsDealtTrigger.java b/src/magic/model/trigger/DamageIsDealtTrigger.java index c89ee8d241..0411f78155 100644 --- a/src/magic/model/trigger/DamageIsDealtTrigger.java +++ b/src/magic/model/trigger/DamageIsDealtTrigger.java @@ -15,8 +15,8 @@ import magic.model.action.ChangeCountersAction; import magic.model.action.ChangeStateAction; import magic.model.choice.MagicMayChoice; import magic.model.event.MagicEvent; -import magic.model.event.MagicSourceEvent; import magic.model.event.MagicEventFactory; +import magic.model.event.MagicSourceEvent; import magic.model.target.MagicTarget; import magic.model.target.MagicTargetFilter; import magic.model.target.MagicTargetType; diff --git a/src/magic/model/trigger/EntersBattlefieldTrigger.java b/src/magic/model/trigger/EntersBattlefieldTrigger.java index 229c531dad..070657bbe6 100644 --- a/src/magic/model/trigger/EntersBattlefieldTrigger.java +++ b/src/magic/model/trigger/EntersBattlefieldTrigger.java @@ -18,11 +18,11 @@ import magic.model.choice.MagicChoice; import magic.model.choice.MagicMayChoice; import magic.model.choice.MagicOrChoice; import magic.model.choice.MagicTargetChoice; -import magic.model.mstatic.MagicStatic; import magic.model.event.MagicEvent; import magic.model.event.MagicEventAction; import magic.model.event.MagicSacrificePermanentEvent; import magic.model.event.MagicSourceEvent; +import magic.model.mstatic.MagicStatic; public abstract class EntersBattlefieldTrigger extends MagicTrigger { diff --git a/src/magic/model/trigger/EntersWithCounterTrigger.java b/src/magic/model/trigger/EntersWithCounterTrigger.java index 46d575c823..33f72e0232 100644 --- a/src/magic/model/trigger/EntersWithCounterTrigger.java +++ b/src/magic/model/trigger/EntersWithCounterTrigger.java @@ -1,13 +1,13 @@ package magic.model.trigger; +import magic.model.MagicAmount; +import magic.model.MagicAmountFactory; import magic.model.MagicCounterType; import magic.model.MagicGame; import magic.model.MagicPayedCost; import magic.model.MagicPermanent; -import magic.model.MagicAmount; -import magic.model.MagicAmountFactory; -import magic.model.condition.MagicCondition; import magic.model.action.ChangeCountersAction; +import magic.model.condition.MagicCondition; import magic.model.event.MagicEvent; public class EntersWithCounterTrigger extends EntersBattlefieldTrigger { diff --git a/src/magic/model/trigger/IfDamageWouldBeDealtTrigger.java b/src/magic/model/trigger/IfDamageWouldBeDealtTrigger.java index 3dddc75c60..a39605e419 100644 --- a/src/magic/model/trigger/IfDamageWouldBeDealtTrigger.java +++ b/src/magic/model/trigger/IfDamageWouldBeDealtTrigger.java @@ -1,8 +1,8 @@ package magic.model.trigger; +import magic.model.MagicDamage; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicDamage; import magic.model.event.MagicEvent; public abstract class IfDamageWouldBeDealtTrigger extends MagicTrigger { diff --git a/src/magic/model/trigger/LeavesBattlefieldTrigger.java b/src/magic/model/trigger/LeavesBattlefieldTrigger.java index aa0b64ad0a..77682ab4c2 100644 --- a/src/magic/model/trigger/LeavesBattlefieldTrigger.java +++ b/src/magic/model/trigger/LeavesBattlefieldTrigger.java @@ -1,12 +1,12 @@ package magic.model.trigger; import magic.model.MagicGame; -import magic.model.MagicPermanent; import magic.model.MagicLocationType; +import magic.model.MagicPermanent; +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 LeavesBattlefieldTrigger extends MagicTrigger { public LeavesBattlefieldTrigger(final int priority) { diff --git a/src/magic/model/trigger/LeavesReturnExiledTrigger.java b/src/magic/model/trigger/LeavesReturnExiledTrigger.java index 8fa79177f1..c7ef5eccca 100644 --- a/src/magic/model/trigger/LeavesReturnExiledTrigger.java +++ b/src/magic/model/trigger/LeavesReturnExiledTrigger.java @@ -3,8 +3,8 @@ package magic.model.trigger; import magic.model.MagicCardList; import magic.model.MagicGame; import magic.model.MagicLocationType; -import magic.model.MagicPermanent; import magic.model.MagicMessage; +import magic.model.MagicPermanent; import magic.model.action.RemoveFromPlayAction; import magic.model.action.ReturnLinkedExileAction; import magic.model.event.MagicEvent; diff --git a/src/magic/model/trigger/MagicPermanentTriggerMap.java b/src/magic/model/trigger/MagicPermanentTriggerMap.java index c0a817aadf..b46cbaaa40 100644 --- a/src/magic/model/trigger/MagicPermanentTriggerMap.java +++ b/src/magic/model/trigger/MagicPermanentTriggerMap.java @@ -1,12 +1,13 @@ package magic.model.trigger; -import java.util.Collection; -import java.util.List; import java.util.ArrayList; +import java.util.Collection; import java.util.EnumMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.PriorityQueue; + import magic.exception.GameException; import magic.model.MagicCopyMap; import magic.model.MagicPermanent; diff --git a/src/magic/model/trigger/MagicTrigger.java b/src/magic/model/trigger/MagicTrigger.java index 08d60b4a35..bf6dc36112 100644 --- a/src/magic/model/trigger/MagicTrigger.java +++ b/src/magic/model/trigger/MagicTrigger.java @@ -1,12 +1,12 @@ package magic.model.trigger; +import magic.exception.GameException; import magic.model.MagicCardDefinition; import magic.model.MagicChangeCardDefinition; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.event.MagicEvent; import magic.model.event.MagicEventAction; -import magic.exception.GameException; /** Lower priority values trigger before higher priority values. */ public abstract class MagicTrigger implements MagicEventAction,MagicChangeCardDefinition { diff --git a/src/magic/model/trigger/MiracleTrigger.java b/src/magic/model/trigger/MiracleTrigger.java index 306c88be24..42359cd974 100644 --- a/src/magic/model/trigger/MiracleTrigger.java +++ b/src/magic/model/trigger/MiracleTrigger.java @@ -2,17 +2,17 @@ package magic.model.trigger; import magic.model.MagicCard; import magic.model.MagicGame; +import magic.model.MagicLocationType; import magic.model.MagicManaCost; import magic.model.MagicPermanent; import magic.model.MagicPlayer; import magic.model.MagicSource; -import magic.model.MagicLocationType; -import magic.model.choice.MagicMayChoice; -import magic.model.event.MagicPayManaCostEvent; -import magic.model.event.MagicEvent; import magic.model.action.AIRevealAction; import magic.model.action.CastCardAction; import magic.model.action.EnqueueTriggerAction; +import magic.model.choice.MagicMayChoice; +import magic.model.event.MagicEvent; +import magic.model.event.MagicPayManaCostEvent; public class MiracleTrigger extends ThisDrawnTrigger { diff --git a/src/magic/model/trigger/OtherCycleTrigger.java b/src/magic/model/trigger/OtherCycleTrigger.java index a1f9ffeb13..9d81fa846f 100644 --- a/src/magic/model/trigger/OtherCycleTrigger.java +++ b/src/magic/model/trigger/OtherCycleTrigger.java @@ -1,8 +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.event.MagicEvent; import magic.model.event.MagicSourceEvent; diff --git a/src/magic/model/trigger/OtherDrawnTrigger.java b/src/magic/model/trigger/OtherDrawnTrigger.java index 36e004f6c5..ea61409913 100644 --- a/src/magic/model/trigger/OtherDrawnTrigger.java +++ b/src/magic/model/trigger/OtherDrawnTrigger.java @@ -1,8 +1,8 @@ package magic.model.trigger; import magic.model.MagicCard; -import magic.model.MagicPermanent; import magic.model.MagicGame; +import magic.model.MagicPermanent; import magic.model.event.MagicEvent; import magic.model.event.MagicSourceEvent; diff --git a/src/magic/model/trigger/PreventDamageTrigger.java b/src/magic/model/trigger/PreventDamageTrigger.java index 50b7225afe..5648f17a8f 100644 --- a/src/magic/model/trigger/PreventDamageTrigger.java +++ b/src/magic/model/trigger/PreventDamageTrigger.java @@ -4,11 +4,11 @@ import magic.model.MagicDamage; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPlayer; +import magic.model.action.PreventDamageAction; import magic.model.event.MagicEvent; import magic.model.target.MagicTarget; import magic.model.target.MagicTargetFilter; import magic.model.target.MagicTargetType; -import magic.model.action.PreventDamageAction; public abstract class PreventDamageTrigger extends IfDamageWouldBeDealtTrigger { public PreventDamageTrigger() { diff --git a/src/magic/model/trigger/ProtectionTrigger.java b/src/magic/model/trigger/ProtectionTrigger.java index f052923033..a7843e9abc 100644 --- a/src/magic/model/trigger/ProtectionTrigger.java +++ b/src/magic/model/trigger/ProtectionTrigger.java @@ -1,10 +1,10 @@ package magic.model.trigger; +import magic.exception.GameException; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.event.MagicEvent; import magic.model.target.MagicTargetFilter; -import magic.exception.GameException; public abstract class ProtectionTrigger extends MagicTrigger { public ProtectionTrigger(final int priority) { diff --git a/src/magic/model/trigger/ReboundTrigger.java b/src/magic/model/trigger/ReboundTrigger.java index 5103d8974f..343c385c74 100644 --- a/src/magic/model/trigger/ReboundTrigger.java +++ b/src/magic/model/trigger/ReboundTrigger.java @@ -2,13 +2,13 @@ package magic.model.trigger; import magic.model.MagicCard; import magic.model.MagicGame; -import magic.model.MagicPlayer; -import magic.model.MagicPermanent; import magic.model.MagicLocationType; +import magic.model.MagicPermanent; +import magic.model.MagicPlayer; +import magic.model.action.CastCardAction; +import magic.model.action.RemoveTriggerAction; import magic.model.choice.MagicMayChoice; import magic.model.event.MagicEvent; -import magic.model.action.RemoveTriggerAction; -import magic.model.action.CastCardAction; public class ReboundTrigger extends AtUpkeepTrigger { diff --git a/src/magic/model/trigger/SagaChapterTrigger.java b/src/magic/model/trigger/SagaChapterTrigger.java index f2f83927fb..2adc21f5b5 100644 --- a/src/magic/model/trigger/SagaChapterTrigger.java +++ b/src/magic/model/trigger/SagaChapterTrigger.java @@ -5,7 +5,6 @@ import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.event.MagicEvent; import magic.model.event.MagicSourceEvent; -import magic.model.target.MagicTargetFilter; public abstract class SagaChapterTrigger extends OneOrMoreCountersArePutTrigger { diff --git a/src/magic/model/trigger/ThisAttacksTrigger.java b/src/magic/model/trigger/ThisAttacksTrigger.java index 93c191314b..57e6ec7af0 100644 --- a/src/magic/model/trigger/ThisAttacksTrigger.java +++ b/src/magic/model/trigger/ThisAttacksTrigger.java @@ -3,13 +3,13 @@ package magic.model.trigger; import magic.model.MagicCounterType; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.event.MagicEvent; -import magic.model.event.MagicSourceEvent; -import magic.model.event.MagicExertEvent; +import magic.model.action.ChangeCountersAction; +import magic.model.action.EnqueueTriggerAction; import magic.model.choice.MagicMayChoice; import magic.model.choice.MagicTargetChoice; -import magic.model.action.EnqueueTriggerAction; -import magic.model.action.ChangeCountersAction; +import magic.model.event.MagicEvent; +import magic.model.event.MagicExertEvent; +import magic.model.event.MagicSourceEvent; import magic.model.target.MagicTargetFilterFactory; public abstract class ThisAttacksTrigger extends AttacksTrigger { diff --git a/src/magic/model/trigger/ThisBecomesBlockedTrigger.java b/src/magic/model/trigger/ThisBecomesBlockedTrigger.java index 3d1b0496d9..75a977b9c6 100644 --- a/src/magic/model/trigger/ThisBecomesBlockedTrigger.java +++ b/src/magic/model/trigger/ThisBecomesBlockedTrigger.java @@ -3,9 +3,9 @@ package magic.model.trigger; import magic.model.MagicGame; import magic.model.MagicPermanent; import magic.model.MagicPermanentList; -import magic.model.target.MagicTargetFilter; import magic.model.event.MagicEvent; import magic.model.event.MagicSourceEvent; +import magic.model.target.MagicTargetFilter; public abstract class ThisBecomesBlockedTrigger extends BecomesBlockedTrigger { @Override diff --git a/src/magic/model/trigger/ThisCombatDamagePlayerTrigger.java b/src/magic/model/trigger/ThisCombatDamagePlayerTrigger.java index d10177bf8d..00adbb359e 100644 --- a/src/magic/model/trigger/ThisCombatDamagePlayerTrigger.java +++ b/src/magic/model/trigger/ThisCombatDamagePlayerTrigger.java @@ -1,13 +1,13 @@ package magic.model.trigger; -import magic.model.MagicDamage; -import magic.model.MagicMessage; -import magic.model.MagicPermanent; import magic.model.MagicCard; +import magic.model.MagicDamage; import magic.model.MagicGame; import magic.model.MagicLocationType; -import magic.model.event.MagicEvent; +import magic.model.MagicMessage; +import magic.model.MagicPermanent; import magic.model.action.ShiftCardAction; +import magic.model.event.MagicEvent; public abstract class ThisCombatDamagePlayerTrigger extends DamageIsDealtTrigger { public ThisCombatDamagePlayerTrigger() {} diff --git a/src/magic/model/trigger/ThisCycleTrigger.java b/src/magic/model/trigger/ThisCycleTrigger.java index d2a6670c70..658dcbdbd7 100644 --- a/src/magic/model/trigger/ThisCycleTrigger.java +++ b/src/magic/model/trigger/ThisCycleTrigger.java @@ -1,9 +1,9 @@ package magic.model.trigger; -import magic.model.MagicGame; -import magic.model.MagicPermanent; import magic.model.MagicCard; import magic.model.MagicCardDefinition; +import magic.model.MagicGame; +import magic.model.MagicPermanent; import magic.model.event.MagicEvent; import magic.model.event.MagicSourceEvent; diff --git a/src/magic/model/trigger/ThisPutIntoGraveyardTrigger.java b/src/magic/model/trigger/ThisPutIntoGraveyardTrigger.java index 26f0cf7600..263549f9d8 100644 --- a/src/magic/model/trigger/ThisPutIntoGraveyardTrigger.java +++ b/src/magic/model/trigger/ThisPutIntoGraveyardTrigger.java @@ -8,9 +8,9 @@ import magic.model.MagicLocationType; import magic.model.MagicPermanent; import magic.model.MagicPlayer; import magic.model.action.MoveCardAction; -import magic.model.action.ShuffleCardsIntoLibraryAction; import magic.model.action.PlayCardAction; import magic.model.action.RevealAction; +import magic.model.action.ShuffleCardsIntoLibraryAction; import magic.model.event.MagicEvent; public abstract class ThisPutIntoGraveyardTrigger extends MagicTrigger { diff --git a/src/magic/model/trigger/ThisSpellIsCastTrigger.java b/src/magic/model/trigger/ThisSpellIsCastTrigger.java index bbad50dca0..74a63bcb6d 100644 --- a/src/magic/model/trigger/ThisSpellIsCastTrigger.java +++ b/src/magic/model/trigger/ThisSpellIsCastTrigger.java @@ -1,12 +1,12 @@ package magic.model.trigger; +import magic.model.MagicCardDefinition; import magic.model.MagicGame; import magic.model.MagicPermanent; -import magic.model.MagicCardDefinition; -import magic.model.event.MagicSourceEvent; -import magic.model.event.MagicEvent; -import magic.model.stack.MagicCardOnStack; import magic.model.action.CopyCardOnStackAction; +import magic.model.event.MagicEvent; +import magic.model.event.MagicSourceEvent; +import magic.model.stack.MagicCardOnStack; public abstract class ThisSpellIsCastTrigger extends MagicTrigger { public ThisSpellIsCastTrigger(final int priority) { diff --git a/src/magic/test/TestAnafenza.java b/src/magic/test/TestAnafenza.java index 5e69470d14..c5f195983d 100644 --- a/src/magic/test/TestAnafenza.java +++ b/src/magic/test/TestAnafenza.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; class TestAnafenza extends TestGameBuilder { @Override diff --git a/src/magic/test/TestAttackZeroPower.java b/src/magic/test/TestAttackZeroPower.java index 64140f9b20..9696e79637 100644 --- a/src/magic/test/TestAttackZeroPower.java +++ b/src/magic/test/TestAttackZeroPower.java @@ -1,10 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.phase.MagicMainPhase; -import magic.ai.MagicAIImpl; class TestAttackZeroPower extends TestGameBuilder { @Override diff --git a/src/magic/test/TestAwaken.java b/src/magic/test/TestAwaken.java index 4bd7c6127a..22d27c99c8 100644 --- a/src/magic/test/TestAwaken.java +++ b/src/magic/test/TestAwaken.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; class TestAwaken extends TestGameBuilder { @Override diff --git a/src/magic/test/TestCanopyVistaVigor.java b/src/magic/test/TestCanopyVistaVigor.java index d64a1ef83b..06510cc1e3 100644 --- a/src/magic/test/TestCanopyVistaVigor.java +++ b/src/magic/test/TestCanopyVistaVigor.java @@ -1,10 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.phase.MagicMainPhase; -import magic.ai.MagicAIImpl; class TestCanopyVistaVigor extends TestGameBuilder { @Override diff --git a/src/magic/test/TestCardBuilder.java b/src/magic/test/TestCardBuilder.java index 0994f9facb..3b21431fb6 100644 --- a/src/magic/test/TestCardBuilder.java +++ b/src/magic/test/TestCardBuilder.java @@ -5,7 +5,9 @@ import java.awt.image.DataBufferInt; 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; diff --git a/src/magic/test/TestColfenorsUrn.java b/src/magic/test/TestColfenorsUrn.java index 6304566ad6..dc8bf35725 100644 --- a/src/magic/test/TestColfenorsUrn.java +++ b/src/magic/test/TestColfenorsUrn.java @@ -5,7 +5,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; class TestColfenorsUrn extends TestGameBuilder { @Override diff --git a/src/magic/test/TestCostIncrease.java b/src/magic/test/TestCostIncrease.java index 331132ace4..4f9a6aced9 100644 --- a/src/magic/test/TestCostIncrease.java +++ b/src/magic/test/TestCostIncrease.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; class TestCostIncrease extends TestGameBuilder { @Override diff --git a/src/magic/test/TestCostReduction.java b/src/magic/test/TestCostReduction.java index 90f4a25194..019fce71ce 100644 --- a/src/magic/test/TestCostReduction.java +++ b/src/magic/test/TestCostReduction.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; class TestCostReduction extends TestGameBuilder { /* diff --git a/src/magic/test/TestEmerge.java b/src/magic/test/TestEmerge.java index 776e46f294..81b3e64963 100644 --- a/src/magic/test/TestEmerge.java +++ b/src/magic/test/TestEmerge.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; class TestEmerge extends TestGameBuilder { @Override diff --git a/src/magic/test/TestGameBuilder.java b/src/magic/test/TestGameBuilder.java index bc17bd4df8..914058ae1e 100644 --- a/src/magic/test/TestGameBuilder.java +++ b/src/magic/test/TestGameBuilder.java @@ -4,7 +4,16 @@ import java.util.concurrent.atomic.AtomicInteger; import magic.ai.MagicAIImpl; import magic.data.CardDefinitions; -import magic.model.*; +import magic.model.DuelPlayerConfig; +import magic.model.MagicCard; +import magic.model.MagicCardDefinition; +import magic.model.MagicDeckProfile; +import magic.model.MagicDuel; +import magic.model.MagicGame; +import magic.model.MagicPayedCost; +import magic.model.MagicPermanent; +import magic.model.MagicPermanentState; +import magic.model.MagicPlayer; import magic.model.action.PlayCardFromStackAction; import magic.model.player.AiProfile; import magic.model.player.HumanProfile; diff --git a/src/magic/test/TestIssue760.java b/src/magic/test/TestIssue760.java index c96f86e096..00433308cf 100644 --- a/src/magic/test/TestIssue760.java +++ b/src/magic/test/TestIssue760.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; class TestIssue760 extends TestGameBuilder { @Override diff --git a/src/magic/test/TestIssue763.java b/src/magic/test/TestIssue763.java index 9af2a456bc..081b301e6b 100644 --- a/src/magic/test/TestIssue763.java +++ b/src/magic/test/TestIssue763.java @@ -1,10 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.phase.MagicMainPhase; -import magic.ai.MagicAIImpl; class TestIssue763 extends TestGameBuilder { @Override diff --git a/src/magic/test/TestManaCrash.java b/src/magic/test/TestManaCrash.java index 36130ca95d..62e4d18759 100644 --- a/src/magic/test/TestManaCrash.java +++ b/src/magic/test/TestManaCrash.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicMulliganPhase; class TestManaCrash extends TestGameBuilder { @Override diff --git a/src/magic/test/TestRedundantWasteland.java b/src/magic/test/TestRedundantWasteland.java index 8743ec005b..52c6964710 100644 --- a/src/magic/test/TestRedundantWasteland.java +++ b/src/magic/test/TestRedundantWasteland.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; /* * 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 3d04aaf14a..d706bed796 100644 --- a/src/magic/test/TestSlowLog.java +++ b/src/magic/test/TestSlowLog.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; // 1. Click on Lighting Bolt // 2. Click on Undo diff --git a/src/magic/test/TestSpineToHand.java b/src/magic/test/TestSpineToHand.java index d829c00a8c..fc9816351e 100644 --- a/src/magic/test/TestSpineToHand.java +++ b/src/magic/test/TestSpineToHand.java @@ -1,10 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.phase.MagicMainPhase; -import magic.ai.MagicAIImpl; class TestSpineToHand extends TestGameBuilder { @Override diff --git a/src/magic/test/TestSurge.java b/src/magic/test/TestSurge.java index 0f0579f024..f73a213a06 100644 --- a/src/magic/test/TestSurge.java +++ b/src/magic/test/TestSurge.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; class TestSurge extends TestGameBuilder { @Override diff --git a/src/magic/test/TestUlrich.java b/src/magic/test/TestUlrich.java index c85f610028..32c3247905 100644 --- a/src/magic/test/TestUlrich.java +++ b/src/magic/test/TestUlrich.java @@ -4,7 +4,7 @@ import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; -import magic.model.phase.*; +import magic.model.phase.MagicUpkeepPhase; class TestUlrich extends TestGameBuilder { @Override diff --git a/src/magic/test/TestXXCMC.java b/src/magic/test/TestXXCMC.java index 6a9d67c277..6b2c2f6d2e 100644 --- a/src/magic/test/TestXXCMC.java +++ b/src/magic/test/TestXXCMC.java @@ -1,10 +1,10 @@ package magic.test; +import magic.ai.MagicAIImpl; import magic.model.MagicDuel; import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.model.phase.MagicMainPhase; -import magic.ai.MagicAIImpl; class TestXXCMC extends TestGameBuilder { @Override diff --git a/src/magic/translate/MText.java b/src/magic/translate/MText.java index 0bc226317a..1c72b4bece 100644 --- a/src/magic/translate/MText.java +++ b/src/magic/translate/MText.java @@ -1,6 +1,5 @@ package magic.translate; -import groovy.json.StringEscapeUtils; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -24,6 +23,8 @@ import java.util.jar.JarInputStream; import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.CRC32; + +import groovy.json.StringEscapeUtils; import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.utility.MagicFileSystem; diff --git a/src/magic/ui/FileDropTargetListener.java b/src/magic/ui/FileDropTargetListener.java index 052214904a..0432bac454 100644 --- a/src/magic/ui/FileDropTargetListener.java +++ b/src/magic/ui/FileDropTargetListener.java @@ -19,6 +19,7 @@ import java.util.List; import java.util.Locale; import java.util.Optional; import java.util.stream.Stream; + import javax.activation.MimetypesFileTypeMap; public class FileDropTargetListener implements DropTargetListener { diff --git a/src/magic/ui/FontsAndBorders.java b/src/magic/ui/FontsAndBorders.java index ea64a35bea..1333fd71bf 100644 --- a/src/magic/ui/FontsAndBorders.java +++ b/src/magic/ui/FontsAndBorders.java @@ -1,11 +1,11 @@ package magic.ui; -import javax.swing.BorderFactory; -import javax.swing.border.Border; - import java.awt.Color; import java.awt.Font; +import javax.swing.BorderFactory; +import javax.swing.border.Border; + public class FontsAndBorders { // Calling JTextArea.setOpaque(false) does not work with Nimbus LAF. This is a workaround. diff --git a/src/magic/ui/ImageFileIO.java b/src/magic/ui/ImageFileIO.java index 9a4501824b..c4c1bee6a3 100644 --- a/src/magic/ui/ImageFileIO.java +++ b/src/magic/ui/ImageFileIO.java @@ -1,6 +1,5 @@ package magic.ui; -import magic.ui.helpers.ImageHelper; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; @@ -8,6 +7,8 @@ import java.io.InputStream; import java.net.URL; import java.util.function.Supplier; +import magic.ui.helpers.ImageHelper; + public final class ImageFileIO { private ImageFileIO() { } diff --git a/src/magic/ui/ImportWorker.java b/src/magic/ui/ImportWorker.java index c7b0897bad..a852ef2db1 100644 --- a/src/magic/ui/ImportWorker.java +++ b/src/magic/ui/ImportWorker.java @@ -11,7 +11,16 @@ import java.util.List; import java.util.Properties; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; + import javax.swing.SwingWorker; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOCase; +import org.apache.commons.io.filefilter.FileFilterUtils; +import org.apache.commons.io.filefilter.IOFileFilter; +import org.apache.commons.io.filefilter.NameFileFilter; +import org.apache.commons.io.filefilter.WildcardFileFilter; + import magic.data.CardDefinitions; import magic.data.DuelConfig; import magic.data.GeneralConfig; @@ -20,12 +29,6 @@ import magic.model.player.PlayerProfiles; import magic.translate.MText; import magic.utility.FileIO; import magic.utility.MagicFileSystem; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOCase; -import org.apache.commons.io.filefilter.FileFilterUtils; -import org.apache.commons.io.filefilter.IOFileFilter; -import org.apache.commons.io.filefilter.NameFileFilter; -import org.apache.commons.io.filefilter.WildcardFileFilter; public class ImportWorker extends SwingWorker { diff --git a/src/magic/ui/MagarenaDirectoryChooser.java b/src/magic/ui/MagarenaDirectoryChooser.java index bbbaed4552..7c3fbe0a5d 100644 --- a/src/magic/ui/MagarenaDirectoryChooser.java +++ b/src/magic/ui/MagarenaDirectoryChooser.java @@ -1,8 +1,10 @@ package magic.ui; -import magic.translate.MText; import java.nio.file.Path; + import javax.swing.JFileChooser; + +import magic.translate.MText; import magic.utility.MagicFileSystem; @SuppressWarnings("serial") diff --git a/src/magic/ui/MagicCardImages.java b/src/magic/ui/MagicCardImages.java index ade58e3814..555005aed2 100644 --- a/src/magic/ui/MagicCardImages.java +++ b/src/magic/ui/MagicCardImages.java @@ -4,6 +4,7 @@ import java.awt.image.BufferedImage; import java.io.File; import java.nio.file.Path; import java.util.Arrays; + import magic.cardBuilder.renderers.CardBuilder; import magic.data.GeneralConfig; import magic.exception.DownloadException; diff --git a/src/magic/ui/MagicFileChoosers.java b/src/magic/ui/MagicFileChoosers.java index 8236acfc8c..1a1de7fbf7 100644 --- a/src/magic/ui/MagicFileChoosers.java +++ b/src/magic/ui/MagicFileChoosers.java @@ -1,13 +1,16 @@ package magic.ui; +import static magic.utility.DeckUtils.DECK_EXTENSION; + import java.awt.Component; import java.io.File; import java.nio.file.Files; import java.nio.file.Path; + import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.filechooser.FileFilter; -import static magic.utility.DeckUtils.DECK_EXTENSION; + import magic.utility.MagicFileSystem; public class MagicFileChoosers { diff --git a/src/magic/ui/MagicFrame.java b/src/magic/ui/MagicFrame.java index 97a96a2bc6..627ce93ff4 100644 --- a/src/magic/ui/MagicFrame.java +++ b/src/magic/ui/MagicFrame.java @@ -8,9 +8,13 @@ import java.io.File; import java.io.IOException; import java.nio.file.Path; import java.util.Locale; + import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.ToolTipManager; + +import org.apache.commons.io.FileUtils; + import magic.data.CardDefinitions; import magic.data.GeneralConfig; import magic.data.OSXAdapter; @@ -29,7 +33,6 @@ import magic.ui.theme.ThemeFactory; import magic.utility.MagicFileSystem; import magic.utility.MagicFileSystem.DataPath; import magic.utility.MagicSystem; -import org.apache.commons.io.FileUtils; @SuppressWarnings("serial") public class MagicFrame extends MagicStickyFrame implements IDragDropListener { diff --git a/src/magic/ui/MagicFramePanel.java b/src/magic/ui/MagicFramePanel.java index cf8a51c35c..6bde27b704 100644 --- a/src/magic/ui/MagicFramePanel.java +++ b/src/magic/ui/MagicFramePanel.java @@ -5,8 +5,10 @@ import java.awt.Dimension; import java.awt.Graphics; import java.awt.Rectangle; import java.awt.image.BufferedImage; + import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.ui.helpers.ImageHelper; diff --git a/src/magic/ui/MagicImages.java b/src/magic/ui/MagicImages.java index a94bb8e46c..e53200fab7 100644 --- a/src/magic/ui/MagicImages.java +++ b/src/magic/ui/MagicImages.java @@ -8,7 +8,11 @@ import java.io.File; import java.util.Collection; import java.util.HashMap; import java.util.Map; + import javax.swing.ImageIcon; + +import org.apache.commons.io.FileUtils; + import magic.data.GeneralConfig; import magic.data.LRUCache; import magic.data.MagicIcon; @@ -25,7 +29,6 @@ import magic.ui.helpers.ImageHelper; import magic.ui.theme.PlayerAvatar; import magic.utility.MagicFileSystem; import magic.utility.MagicResources; -import org.apache.commons.io.FileUtils; public final class MagicImages { diff --git a/src/magic/ui/MagicLogFile.java b/src/magic/ui/MagicLogFile.java index 502dd44ede..b59917f7dd 100644 --- a/src/magic/ui/MagicLogFile.java +++ b/src/magic/ui/MagicLogFile.java @@ -1,5 +1,9 @@ package magic.ui; +import static java.nio.charset.StandardCharsets.UTF_8; +import static java.nio.file.StandardOpenOption.APPEND; +import static java.nio.file.StandardOpenOption.CREATE; + import java.io.BufferedWriter; import java.io.File; import java.io.IOException; @@ -8,10 +12,8 @@ import java.io.Writer; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; + import magic.utility.MagicFileSystem; -import static java.nio.charset.StandardCharsets.UTF_8; -import static java.nio.file.StandardOpenOption.APPEND; -import static java.nio.file.StandardOpenOption.CREATE; public class MagicLogFile { diff --git a/src/magic/ui/MagicLogs.java b/src/magic/ui/MagicLogs.java index 0033d187e7..c23a52af9a 100644 --- a/src/magic/ui/MagicLogs.java +++ b/src/magic/ui/MagicLogs.java @@ -6,6 +6,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; + import magic.model.MagicCardDefinition; import magic.utility.MagicFileSystem; diff --git a/src/magic/ui/MagicSound.java b/src/magic/ui/MagicSound.java index 7722d6881c..bd5700f71f 100644 --- a/src/magic/ui/MagicSound.java +++ b/src/magic/ui/MagicSound.java @@ -1,11 +1,11 @@ package magic.ui; import java.io.IOException; -import java.net.URL; import java.util.EnumSet; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + import javax.sound.sampled.AudioInputStream; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.Clip; @@ -13,6 +13,7 @@ import javax.sound.sampled.FloatControl; import javax.sound.sampled.LineEvent; import javax.sound.sampled.LineListener; import javax.sound.sampled.LineUnavailableException; + import magic.data.GeneralConfig; import magic.data.settings.IntegerSetting; import magic.utility.MagicResources; diff --git a/src/magic/ui/MagicStickyFrame.java b/src/magic/ui/MagicStickyFrame.java index 33efe31116..c5c78f93e8 100644 --- a/src/magic/ui/MagicStickyFrame.java +++ b/src/magic/ui/MagicStickyFrame.java @@ -7,7 +7,9 @@ import java.awt.Rectangle; import java.awt.Toolkit; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; + import javax.swing.JFrame; + import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.data.settings.IntegerSetting; diff --git a/src/magic/ui/PrintedCardImage.java b/src/magic/ui/PrintedCardImage.java index 73427db48f..3018dc4bb4 100644 --- a/src/magic/ui/PrintedCardImage.java +++ b/src/magic/ui/PrintedCardImage.java @@ -4,6 +4,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; + import magic.cardBuilder.renderers.CardBuilder; import magic.data.CardImageFile; import magic.data.DownloadableFile; diff --git a/src/magic/ui/ProxyCardImage.java b/src/magic/ui/ProxyCardImage.java index 27187472b4..5b2f2872a7 100644 --- a/src/magic/ui/ProxyCardImage.java +++ b/src/magic/ui/ProxyCardImage.java @@ -5,6 +5,7 @@ import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; + import magic.cardBuilder.renderers.CardBuilder; import magic.data.CardImageFile; import magic.data.DownloadableFile; diff --git a/src/magic/ui/ScreenController.java b/src/magic/ui/ScreenController.java index a0590e8dde..73168e07d3 100644 --- a/src/magic/ui/ScreenController.java +++ b/src/magic/ui/ScreenController.java @@ -3,8 +3,10 @@ package magic.ui; import java.awt.GraphicsEnvironment; import java.util.Stack; import java.util.concurrent.Callable; + import javax.swing.JOptionPane; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.model.IUIGameController; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/ScreenOptionsOverlay.java b/src/magic/ui/ScreenOptionsOverlay.java index b9dd5a6207..7c03a59efa 100644 --- a/src/magic/ui/ScreenOptionsOverlay.java +++ b/src/magic/ui/ScreenOptionsOverlay.java @@ -1,21 +1,23 @@ package magic.ui; -import magic.ui.helpers.UrlHelper; -import magic.translate.MText; -import magic.ui.utility.MagicStyle; import java.awt.Color; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.KeyAdapter; import java.awt.event.MouseAdapter; import java.awt.event.MouseMotionAdapter; + import javax.swing.AbstractAction; import javax.swing.JPanel; import javax.swing.KeyStroke; + +import magic.translate.MText; +import magic.ui.helpers.UrlHelper; import magic.ui.screen.interfaces.IThemeStyle; -import magic.ui.screen.widget.PlainMenuButton; import magic.ui.screen.widget.MenuPanel; +import magic.ui.screen.widget.PlainMenuButton; import magic.ui.theme.Theme; +import magic.ui.utility.MagicStyle; import magic.ui.widget.TexturedPanel; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/SplashProgressReporter.java b/src/magic/ui/SplashProgressReporter.java index e53c4beef8..a1236651ea 100644 --- a/src/magic/ui/SplashProgressReporter.java +++ b/src/magic/ui/SplashProgressReporter.java @@ -1,14 +1,15 @@ package magic.ui; -import magic.ui.utility.MagicStyle; import java.awt.AlphaComposite; import java.awt.Color; import java.awt.Font; import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.SplashScreen; -import magic.utility.ProgressReporter; + +import magic.ui.utility.MagicStyle; import magic.utility.MagicSystem; +import magic.utility.ProgressReporter; public class SplashProgressReporter extends ProgressReporter { diff --git a/src/magic/ui/UiExceptionHandler.java b/src/magic/ui/UiExceptionHandler.java index 5b64a1ce03..c23414a19c 100644 --- a/src/magic/ui/UiExceptionHandler.java +++ b/src/magic/ui/UiExceptionHandler.java @@ -1,16 +1,18 @@ package magic.ui; -import magic.translate.MText; -import magic.ui.helpers.DesktopHelper; -import magic.ui.helpers.ImageHelper; import java.awt.Component; import java.awt.Desktop; import java.nio.file.Path; + import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; -import magic.exception.handler.FileExceptionHandler; + import magic.exception.handler.ExceptionReport; +import magic.exception.handler.FileExceptionHandler; +import magic.translate.MText; +import magic.ui.helpers.DesktopHelper; +import magic.ui.helpers.ImageHelper; import magic.utility.MagicFileSystem; public class UiExceptionHandler extends FileExceptionHandler { diff --git a/src/magic/ui/deck/games/DeckCellRenderer.java b/src/magic/ui/deck/games/DeckCellRenderer.java index 6c1011dfb5..29854c0724 100644 --- a/src/magic/ui/deck/games/DeckCellRenderer.java +++ b/src/magic/ui/deck/games/DeckCellRenderer.java @@ -7,11 +7,13 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.MouseInfo; import java.awt.Point; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.SwingUtilities; import javax.swing.table.DefaultTableCellRenderer; + import magic.data.DeckType; import magic.ui.utility.MagicStyle; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/deck/games/DeckColorLabel.java b/src/magic/ui/deck/games/DeckColorLabel.java index 7bd088fd8d..073934148b 100644 --- a/src/magic/ui/deck/games/DeckColorLabel.java +++ b/src/magic/ui/deck/games/DeckColorLabel.java @@ -1,7 +1,9 @@ package magic.ui.deck.games; import java.awt.Dimension; + import javax.swing.JLabel; + import magic.data.CardStatistics; import magic.model.MagicColor; import magic.model.MagicDeck; diff --git a/src/magic/ui/deck/games/DeckGame.java b/src/magic/ui/deck/games/DeckGame.java index a18591bba3..35de815e52 100644 --- a/src/magic/ui/deck/games/DeckGame.java +++ b/src/magic/ui/deck/games/DeckGame.java @@ -4,6 +4,7 @@ import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.temporal.ChronoUnit; + import magic.data.DeckType; import magic.data.stats.GameStatsInfo; import magic.model.MagicDeck; diff --git a/src/magic/ui/deck/games/DeckGamesJTable.java b/src/magic/ui/deck/games/DeckGamesJTable.java index 4dacb284cb..a4141ee2c6 100644 --- a/src/magic/ui/deck/games/DeckGamesJTable.java +++ b/src/magic/ui/deck/games/DeckGamesJTable.java @@ -6,6 +6,7 @@ import java.awt.Point; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; + import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.ListSelectionModel; @@ -14,6 +15,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; import javax.swing.table.TableModel; + import magic.data.DeckType; import magic.model.MagicDeck; import magic.translate.MText; diff --git a/src/magic/ui/deck/games/DeckGamesPanel.java b/src/magic/ui/deck/games/DeckGamesPanel.java index b5092026c8..b583855c01 100644 --- a/src/magic/ui/deck/games/DeckGamesPanel.java +++ b/src/magic/ui/deck/games/DeckGamesPanel.java @@ -3,18 +3,20 @@ package magic.ui.deck.games; import java.awt.Color; import java.util.ArrayList; import java.util.List; + import javax.swing.BorderFactory; + import magic.data.GeneralConfig; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.ui.FontsAndBorders; import magic.ui.ScreenController; +import magic.ui.mwidgets.MScrollPane; import magic.ui.screen.deck.editor.IDeckEditorView; import magic.ui.screen.decks.IDeckView; import magic.ui.screen.stats.IPagination; import magic.ui.screen.stats.PaginationPanel; import magic.ui.screen.widget.ActionBarButton; -import magic.ui.mwidgets.MScrollPane; import magic.ui.widget.TexturedPanel; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/deck/games/DeckGamesTableModel.java b/src/magic/ui/deck/games/DeckGamesTableModel.java index 0498ab0608..31ff32eaf1 100644 --- a/src/magic/ui/deck/games/DeckGamesTableModel.java +++ b/src/magic/ui/deck/games/DeckGamesTableModel.java @@ -2,7 +2,9 @@ package magic.ui.deck.games; import java.util.List; import java.util.stream.Collectors; + import javax.swing.table.AbstractTableModel; + import magic.data.stats.GameStatsInfo; import magic.data.stats.MagicStats; import magic.model.MagicDeck; diff --git a/src/magic/ui/deck/games/GameCellRenderer.java b/src/magic/ui/deck/games/GameCellRenderer.java index 1a59534bcd..e7ccabacc4 100644 --- a/src/magic/ui/deck/games/GameCellRenderer.java +++ b/src/magic/ui/deck/games/GameCellRenderer.java @@ -1,6 +1,7 @@ package magic.ui.deck.games; import java.awt.Component; + import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.SwingConstants; diff --git a/src/magic/ui/deck/games/PlayerCellRenderer.java b/src/magic/ui/deck/games/PlayerCellRenderer.java index 01f68db623..3cb1b90817 100644 --- a/src/magic/ui/deck/games/PlayerCellRenderer.java +++ b/src/magic/ui/deck/games/PlayerCellRenderer.java @@ -1,10 +1,12 @@ package magic.ui.deck.games; import java.awt.Component; + import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; + import magic.translate.MText; @SuppressWarnings("serial") diff --git a/src/magic/ui/deck/games/ResultCellRenderer.java b/src/magic/ui/deck/games/ResultCellRenderer.java index 7429a834dc..e1b74a9c4c 100644 --- a/src/magic/ui/deck/games/ResultCellRenderer.java +++ b/src/magic/ui/deck/games/ResultCellRenderer.java @@ -1,12 +1,14 @@ package magic.ui.deck.games; import java.awt.Component; + import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.SwingConstants; import javax.swing.table.DefaultTableCellRenderer; + import magic.data.MagicIcon; import magic.ui.FontsAndBorders; import magic.ui.MagicImages; diff --git a/src/magic/ui/dialog/AiPropertiesDialog.java b/src/magic/ui/dialog/AiPropertiesDialog.java index 296112bc8d..16481110ae 100644 --- a/src/magic/ui/dialog/AiPropertiesDialog.java +++ b/src/magic/ui/dialog/AiPropertiesDialog.java @@ -3,6 +3,7 @@ package magic.ui.dialog; import java.awt.Cursor; import java.awt.Dimension; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; @@ -10,6 +11,7 @@ import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; + import magic.ai.MagicAIImpl; import magic.model.player.AiProfile; import magic.model.player.PlayerProfile; diff --git a/src/magic/ui/dialog/DeckChooserDialog.java b/src/magic/ui/dialog/DeckChooserDialog.java index 9dce0fa57b..387297412d 100644 --- a/src/magic/ui/dialog/DeckChooserDialog.java +++ b/src/magic/ui/dialog/DeckChooserDialog.java @@ -4,6 +4,7 @@ import java.awt.Cursor; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; + import javax.swing.AbstractAction; import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; @@ -12,6 +13,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; + import magic.data.DeckType; import magic.firemind.FiremindJsonReader; import magic.translate.MText; diff --git a/src/magic/ui/dialog/DeckImportDialog.java b/src/magic/ui/dialog/DeckImportDialog.java index bb6592ddb0..d97fb8a1cf 100644 --- a/src/magic/ui/dialog/DeckImportDialog.java +++ b/src/magic/ui/dialog/DeckImportDialog.java @@ -13,12 +13,14 @@ import java.io.File; import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; + import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.filechooser.FileFilter; + import magic.data.MagicIcon; import magic.model.MagicDeck; import magic.ui.MagicImages; diff --git a/src/magic/ui/dialog/DecksFilterDialog.java b/src/magic/ui/dialog/DecksFilterDialog.java index 0f34375bb7..27d0e57ebf 100644 --- a/src/magic/ui/dialog/DecksFilterDialog.java +++ b/src/magic/ui/dialog/DecksFilterDialog.java @@ -6,6 +6,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; @@ -19,6 +20,7 @@ import javax.swing.SpinnerNumberModel; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.text.NumberFormatter; + import magic.translate.MText; import magic.ui.FontsAndBorders; import magic.ui.dialog.button.CancelButton; diff --git a/src/magic/ui/dialog/DuelPropertiesDialog.java b/src/magic/ui/dialog/DuelPropertiesDialog.java index 9865427eea..efeec7a8aa 100644 --- a/src/magic/ui/dialog/DuelPropertiesDialog.java +++ b/src/magic/ui/dialog/DuelPropertiesDialog.java @@ -5,6 +5,7 @@ import java.awt.Cursor; import java.awt.Dimension; import java.awt.Font; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.DefaultListCellRenderer; import javax.swing.JButton; @@ -12,6 +13,7 @@ import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; + import magic.data.MagicFormat; import magic.translate.MText; import magic.ui.dialog.button.CancelButton; diff --git a/src/magic/ui/dialog/DuelSidebarLayoutDialog.java b/src/magic/ui/dialog/DuelSidebarLayoutDialog.java index e03762dfbe..78b4f5e68d 100644 --- a/src/magic/ui/dialog/DuelSidebarLayoutDialog.java +++ b/src/magic/ui/dialog/DuelSidebarLayoutDialog.java @@ -4,12 +4,14 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.util.Enumeration; + import javax.swing.AbstractAction; import javax.swing.DefaultListModel; import javax.swing.JButton; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.ListSelectionModel; + import magic.data.GeneralConfig; import magic.model.IUIGameController; import magic.translate.MText; diff --git a/src/magic/ui/dialog/FiremindWorkerDialog.java b/src/magic/ui/dialog/FiremindWorkerDialog.java index 6136d445c6..d2f705d41c 100644 --- a/src/magic/ui/dialog/FiremindWorkerDialog.java +++ b/src/magic/ui/dialog/FiremindWorkerDialog.java @@ -5,6 +5,7 @@ import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; + import javax.swing.AbstractAction; import javax.swing.BorderFactory; import javax.swing.JButton; @@ -15,6 +16,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.KeyStroke; import javax.swing.SwingConstants; + import magic.translate.MText; import magic.ui.FontsAndBorders; import magic.ui.MagicFrame; diff --git a/src/magic/ui/dialog/GameStateRunner.java b/src/magic/ui/dialog/GameStateRunner.java index 63fd7b006a..eec540dcfd 100644 --- a/src/magic/ui/dialog/GameStateRunner.java +++ b/src/magic/ui/dialog/GameStateRunner.java @@ -10,6 +10,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JList; @@ -17,6 +18,7 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; + import magic.test.TestGameBuilder; import magic.translate.MText; import magic.ui.ScreenController; diff --git a/src/magic/ui/dialog/MagicDialog.java b/src/magic/ui/dialog/MagicDialog.java index 1897d3c2f0..aadccfa52d 100644 --- a/src/magic/ui/dialog/MagicDialog.java +++ b/src/magic/ui/dialog/MagicDialog.java @@ -2,6 +2,7 @@ package magic.ui.dialog; import java.awt.Color; import java.awt.Dimension; + import javax.swing.AbstractAction; import javax.swing.BorderFactory; import javax.swing.JComponent; @@ -12,10 +13,11 @@ import javax.swing.JPanel; import javax.swing.JRootPane; import javax.swing.KeyStroke; import javax.swing.SwingConstants; -import magic.ui.utility.MagicStyle; -import magic.ui.theme.Theme; + import magic.ui.FontsAndBorders; import magic.ui.ScreenController; +import magic.ui.theme.Theme; +import magic.ui.utility.MagicStyle; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/dialog/RandomDeckGeneratorDialog.java b/src/magic/ui/dialog/RandomDeckGeneratorDialog.java index 68e14e92c6..5556e9154c 100644 --- a/src/magic/ui/dialog/RandomDeckGeneratorDialog.java +++ b/src/magic/ui/dialog/RandomDeckGeneratorDialog.java @@ -3,6 +3,7 @@ package magic.ui.dialog; import java.awt.Cursor; import java.awt.Dimension; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JLabel; @@ -10,11 +11,12 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; + import magic.data.DeckGenerator; import magic.translate.MText; +import magic.ui.FontsAndBorders; import magic.ui.dialog.button.CancelButton; import magic.ui.dialog.button.SaveButton; -import magic.ui.FontsAndBorders; import magic.ui.widget.SliderPanel; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/dialog/button/CancelButton.java b/src/magic/ui/dialog/button/CancelButton.java index 228200b299..315e4dca1b 100644 --- a/src/magic/ui/dialog/button/CancelButton.java +++ b/src/magic/ui/dialog/button/CancelButton.java @@ -1,8 +1,8 @@ package magic.ui.dialog.button; import magic.data.MagicIcon; -import magic.ui.MagicImages; import magic.translate.MText; +import magic.ui.MagicImages; @SuppressWarnings("serial") public class CancelButton extends MagicDialogButton { diff --git a/src/magic/ui/dialog/button/CloseButton.java b/src/magic/ui/dialog/button/CloseButton.java index 054834072c..6933d87e81 100644 --- a/src/magic/ui/dialog/button/CloseButton.java +++ b/src/magic/ui/dialog/button/CloseButton.java @@ -1,8 +1,8 @@ package magic.ui.dialog.button; import magic.data.MagicIcon; -import magic.ui.MagicImages; import magic.translate.MText; +import magic.ui.MagicImages; @SuppressWarnings("serial") public class CloseButton extends MagicDialogButton { diff --git a/src/magic/ui/dialog/button/MagicDialogButton.java b/src/magic/ui/dialog/button/MagicDialogButton.java index 9c67972c85..dec8cb7b16 100644 --- a/src/magic/ui/dialog/button/MagicDialogButton.java +++ b/src/magic/ui/dialog/button/MagicDialogButton.java @@ -1,6 +1,7 @@ package magic.ui.dialog.button; import java.awt.Dimension; + import javax.swing.JButton; @SuppressWarnings("serial") diff --git a/src/magic/ui/dialog/button/SaveButton.java b/src/magic/ui/dialog/button/SaveButton.java index 872f7b7fcd..cad6c3d3f2 100644 --- a/src/magic/ui/dialog/button/SaveButton.java +++ b/src/magic/ui/dialog/button/SaveButton.java @@ -1,8 +1,8 @@ package magic.ui.dialog.button; import magic.data.MagicIcon; -import magic.ui.MagicImages; import magic.translate.MText; +import magic.ui.MagicImages; @SuppressWarnings("serial") public class SaveButton extends MagicDialogButton { diff --git a/src/magic/ui/dialog/prefs/AnimationFlagsPanel.java b/src/magic/ui/dialog/prefs/AnimationFlagsPanel.java index ad1e97d7aa..9017c3a639 100644 --- a/src/magic/ui/dialog/prefs/AnimationFlagsPanel.java +++ b/src/magic/ui/dialog/prefs/AnimationFlagsPanel.java @@ -4,8 +4,10 @@ import java.awt.Component; import java.awt.event.MouseListener; import java.util.LinkedHashMap; import java.util.Map; + import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.translate.MText; import magic.ui.mwidgets.MCheckBox; import magic.ui.widget.duel.animation.AnimationFx; diff --git a/src/magic/ui/dialog/prefs/AnimationsPanel.java b/src/magic/ui/dialog/prefs/AnimationsPanel.java index 4610af48aa..fbc408dd1f 100644 --- a/src/magic/ui/dialog/prefs/AnimationsPanel.java +++ b/src/magic/ui/dialog/prefs/AnimationsPanel.java @@ -2,8 +2,10 @@ package magic.ui.dialog.prefs; import java.awt.Component; import java.awt.event.MouseListener; + import javax.swing.JPanel; import javax.swing.event.ChangeEvent; + import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.translate.MText; diff --git a/src/magic/ui/dialog/prefs/AudioPanel.java b/src/magic/ui/dialog/prefs/AudioPanel.java index 489e2543d0..47c2aaa757 100644 --- a/src/magic/ui/dialog/prefs/AudioPanel.java +++ b/src/magic/ui/dialog/prefs/AudioPanel.java @@ -1,8 +1,10 @@ package magic.ui.dialog.prefs; import java.awt.event.MouseListener; + import javax.swing.JLabel; import javax.swing.JPanel; + import magic.data.GeneralConfig; import magic.data.settings.IntegerSetting; import magic.translate.MText; diff --git a/src/magic/ui/dialog/prefs/GameplayImagesPanel.java b/src/magic/ui/dialog/prefs/GameplayImagesPanel.java index c4cacb869c..ab15eba7f5 100644 --- a/src/magic/ui/dialog/prefs/GameplayImagesPanel.java +++ b/src/magic/ui/dialog/prefs/GameplayImagesPanel.java @@ -1,9 +1,11 @@ package magic.ui.dialog.prefs; import java.awt.event.MouseListener; + import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; + import magic.data.GeneralConfig; import magic.translate.MText; import magic.ui.mwidgets.MCheckBox; diff --git a/src/magic/ui/dialog/prefs/GeneralPanel.java b/src/magic/ui/dialog/prefs/GeneralPanel.java index 146e756fd7..4c44a9c589 100644 --- a/src/magic/ui/dialog/prefs/GeneralPanel.java +++ b/src/magic/ui/dialog/prefs/GeneralPanel.java @@ -1,8 +1,10 @@ package magic.ui.dialog.prefs; import java.awt.event.MouseListener; + import javax.swing.JLabel; import javax.swing.JPanel; + import magic.data.GeneralConfig; import magic.translate.MText; import magic.ui.FontsAndBorders; diff --git a/src/magic/ui/dialog/prefs/ImageSizePresets.java b/src/magic/ui/dialog/prefs/ImageSizePresets.java index 918b134f4b..9ade49c972 100644 --- a/src/magic/ui/dialog/prefs/ImageSizePresets.java +++ b/src/magic/ui/dialog/prefs/ImageSizePresets.java @@ -1,6 +1,7 @@ package magic.ui.dialog.prefs; import java.awt.Dimension; + import magic.data.GeneralConfig; import magic.translate.MText; diff --git a/src/magic/ui/dialog/prefs/PreferencesDialog.java b/src/magic/ui/dialog/prefs/PreferencesDialog.java index 8cf070b4df..9964126bda 100644 --- a/src/magic/ui/dialog/prefs/PreferencesDialog.java +++ b/src/magic/ui/dialog/prefs/PreferencesDialog.java @@ -12,6 +12,7 @@ import java.awt.event.WindowListener; import java.io.FileNotFoundException; import java.net.InetSocketAddress; import java.net.Proxy; + import javax.swing.AbstractButton; import javax.swing.BorderFactory; import javax.swing.DefaultComboBoxModel; @@ -34,6 +35,7 @@ import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; import javax.swing.text.NumberFormatter; + import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.translate.MText; diff --git a/src/magic/ui/dialog/prefs/PreferredSizePanel.java b/src/magic/ui/dialog/prefs/PreferredSizePanel.java index 60377c3016..263fd2b1ca 100644 --- a/src/magic/ui/dialog/prefs/PreferredSizePanel.java +++ b/src/magic/ui/dialog/prefs/PreferredSizePanel.java @@ -1,10 +1,12 @@ package magic.ui.dialog.prefs; import java.awt.event.MouseListener; + import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; + import magic.data.GeneralConfig; import magic.translate.MText; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/dialog/prefs/ScrollablePanel.java b/src/magic/ui/dialog/prefs/ScrollablePanel.java index 3a6d3c62e6..dd56dc404a 100644 --- a/src/magic/ui/dialog/prefs/ScrollablePanel.java +++ b/src/magic/ui/dialog/prefs/ScrollablePanel.java @@ -1,7 +1,14 @@ package magic.ui.dialog.prefs; -import java.awt.*; -import javax.swing.*; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.LayoutManager; +import java.awt.Rectangle; + +import javax.swing.JPanel; +import javax.swing.JViewport; +import javax.swing.Scrollable; +import javax.swing.SwingConstants; /** * https://tips4java.wordpress.com/2009/12/20/scrollable-panel/ diff --git a/src/magic/ui/dialog/prefs/ThemesActionPanel.java b/src/magic/ui/dialog/prefs/ThemesActionPanel.java index 00e7302048..dc54215feb 100644 --- a/src/magic/ui/dialog/prefs/ThemesActionPanel.java +++ b/src/magic/ui/dialog/prefs/ThemesActionPanel.java @@ -6,18 +6,20 @@ import java.awt.event.MouseListener; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; + import javax.swing.AbstractAction; import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JPanel; + import magic.data.MagicIcon; import magic.translate.MText; import magic.ui.MagicImages; import magic.ui.MagicSound; -import magic.ui.helpers.UrlHelper; -import magic.ui.theme.ThemeFactory; import magic.ui.helpers.DesktopHelper; import magic.ui.helpers.ImageHelper; +import magic.ui.helpers.UrlHelper; +import magic.ui.theme.ThemeFactory; import magic.utility.MagicFileSystem; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/dialog/prefs/ThemesComboBox.java b/src/magic/ui/dialog/prefs/ThemesComboBox.java index 74e5694f54..a4d2e7c9c4 100644 --- a/src/magic/ui/dialog/prefs/ThemesComboBox.java +++ b/src/magic/ui/dialog/prefs/ThemesComboBox.java @@ -4,11 +4,13 @@ import java.awt.Color; import java.awt.Component; import java.awt.Dimension; import java.awt.Font; + import javax.swing.BorderFactory; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; + import magic.ui.theme.ThemeFactory; @SuppressWarnings("serial") diff --git a/src/magic/ui/dialog/prefs/ThemesPanel.java b/src/magic/ui/dialog/prefs/ThemesPanel.java index c4ea426d4b..25cf2ed13b 100644 --- a/src/magic/ui/dialog/prefs/ThemesPanel.java +++ b/src/magic/ui/dialog/prefs/ThemesPanel.java @@ -4,10 +4,12 @@ import java.awt.Cursor; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseListener; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.data.settings.IntegerSetting; diff --git a/src/magic/ui/dialog/prefs/TranslationPanel.java b/src/magic/ui/dialog/prefs/TranslationPanel.java index fdca974f53..808066a3d9 100644 --- a/src/magic/ui/dialog/prefs/TranslationPanel.java +++ b/src/magic/ui/dialog/prefs/TranslationPanel.java @@ -15,6 +15,7 @@ import java.nio.file.Path; import java.util.List; import java.util.Map; import java.util.Set; + import javax.swing.AbstractAction; import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListCellRenderer; @@ -26,6 +27,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.exception.DesktopNotSupportedException; import magic.translate.MText; diff --git a/src/magic/ui/dialog/prefs/VolumeSliderPanel.java b/src/magic/ui/dialog/prefs/VolumeSliderPanel.java index 0df17b22fa..7a0708d024 100644 --- a/src/magic/ui/dialog/prefs/VolumeSliderPanel.java +++ b/src/magic/ui/dialog/prefs/VolumeSliderPanel.java @@ -1,9 +1,11 @@ package magic.ui.dialog.prefs; import java.awt.event.MouseListener; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JSlider; + import magic.ui.MagicSound; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/duel/resolution/DefaultResolutionProfile.java b/src/magic/ui/duel/resolution/DefaultResolutionProfile.java index 1e691d0f7f..10e0a86246 100644 --- a/src/magic/ui/duel/resolution/DefaultResolutionProfile.java +++ b/src/magic/ui/duel/resolution/DefaultResolutionProfile.java @@ -2,6 +2,7 @@ package magic.ui.duel.resolution; import java.awt.Dimension; import java.awt.Rectangle; + import magic.ui.theme.Theme; import magic.ui.utility.MagicStyle; diff --git a/src/magic/ui/duel/viewerinfo/CardViewerInfo.java b/src/magic/ui/duel/viewerinfo/CardViewerInfo.java index 7484071159..a8a6626a03 100644 --- a/src/magic/ui/duel/viewerinfo/CardViewerInfo.java +++ b/src/magic/ui/duel/viewerinfo/CardViewerInfo.java @@ -1,6 +1,7 @@ package magic.ui.duel.viewerinfo; import java.awt.image.BufferedImage; + import magic.model.MagicCard; import magic.model.MagicCardDefinition; import magic.model.MagicLocationType; diff --git a/src/magic/ui/duel/viewerinfo/GameViewerInfo.java b/src/magic/ui/duel/viewerinfo/GameViewerInfo.java index dd2acc589f..6ff5172f57 100644 --- a/src/magic/ui/duel/viewerinfo/GameViewerInfo.java +++ b/src/magic/ui/duel/viewerinfo/GameViewerInfo.java @@ -3,6 +3,7 @@ package magic.ui.duel.viewerinfo; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import magic.model.MagicCard; import magic.model.MagicCardList; import magic.model.MagicGame; diff --git a/src/magic/ui/duel/viewerinfo/PermanentViewerInfo.java b/src/magic/ui/duel/viewerinfo/PermanentViewerInfo.java index ba788af6fa..3bd183342e 100644 --- a/src/magic/ui/duel/viewerinfo/PermanentViewerInfo.java +++ b/src/magic/ui/duel/viewerinfo/PermanentViewerInfo.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; + import magic.model.MagicAbility; import magic.model.MagicCardDefinition; import magic.model.MagicGame; diff --git a/src/magic/ui/duel/viewerinfo/PlayerViewerInfo.java b/src/magic/ui/duel/viewerinfo/PlayerViewerInfo.java index ceac33d617..4c00aa3c43 100644 --- a/src/magic/ui/duel/viewerinfo/PlayerViewerInfo.java +++ b/src/magic/ui/duel/viewerinfo/PlayerViewerInfo.java @@ -2,7 +2,9 @@ package magic.ui.duel.viewerinfo; import java.util.ArrayList; import java.util.List; + import javax.swing.ImageIcon; + import magic.model.DuelPlayerConfig; import magic.model.MagicCardList; import magic.model.MagicCounterType; diff --git a/src/magic/ui/duel/viewerinfo/StackItemViewerInfo.java b/src/magic/ui/duel/viewerinfo/StackItemViewerInfo.java index e7e1d3f8b9..765ded9a96 100644 --- a/src/magic/ui/duel/viewerinfo/StackItemViewerInfo.java +++ b/src/magic/ui/duel/viewerinfo/StackItemViewerInfo.java @@ -1,6 +1,7 @@ package magic.ui.duel.viewerinfo; import javax.swing.ImageIcon; + import magic.data.MagicIcon; import magic.model.MagicCard; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/helpers/DesktopHelper.java b/src/magic/ui/helpers/DesktopHelper.java index e2041daab8..58c9c3cf68 100644 --- a/src/magic/ui/helpers/DesktopHelper.java +++ b/src/magic/ui/helpers/DesktopHelper.java @@ -4,7 +4,9 @@ import java.awt.Desktop; import java.awt.HeadlessException; import java.io.File; import java.io.IOException; + import javax.swing.JOptionPane; + import magic.exception.DesktopNotSupportedException; import magic.translate.MText; import magic.utility.MagicFileSystem; diff --git a/src/magic/ui/helpers/ImageHelper.java b/src/magic/ui/helpers/ImageHelper.java index 6b43d3bdbd..fec0c77eb0 100644 --- a/src/magic/ui/helpers/ImageHelper.java +++ b/src/magic/ui/helpers/ImageHelper.java @@ -22,11 +22,13 @@ import java.awt.image.FilteredImageSource; import java.io.File; import java.io.IOException; import java.nio.file.Path; + import javax.imageio.ImageIO; import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JComponent; + import magic.data.MagicIcon; import magic.ui.MagicImages; import magic.ui.image.filter.ColorSwapImageFilter; diff --git a/src/magic/ui/helpers/KeyEventAction.java b/src/magic/ui/helpers/KeyEventAction.java index 5dd2b83555..12d94bb754 100644 --- a/src/magic/ui/helpers/KeyEventAction.java +++ b/src/magic/ui/helpers/KeyEventAction.java @@ -4,10 +4,12 @@ import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.util.UUID; + import javax.swing.AbstractAction; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.KeyStroke; + import magic.ui.screen.MScreen; /** diff --git a/src/magic/ui/helpers/LaFHelper.java b/src/magic/ui/helpers/LaFHelper.java index 65011668f4..73d14e05c1 100644 --- a/src/magic/ui/helpers/LaFHelper.java +++ b/src/magic/ui/helpers/LaFHelper.java @@ -2,8 +2,10 @@ package magic.ui.helpers; import java.awt.Color; import java.awt.Dimension; + import javax.swing.UIDefaults; import javax.swing.UIManager; + import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.ui.theme.Theme; diff --git a/src/magic/ui/helpers/MouseHelper.java b/src/magic/ui/helpers/MouseHelper.java index 6bc89491ae..1594bcf4a2 100644 --- a/src/magic/ui/helpers/MouseHelper.java +++ b/src/magic/ui/helpers/MouseHelper.java @@ -2,6 +2,7 @@ package magic.ui.helpers; import java.awt.Component; import java.awt.Cursor; + import magic.ui.ScreenController; import magic.ui.mwidgets.MWidget; diff --git a/src/magic/ui/helpers/UrlHelper.java b/src/magic/ui/helpers/UrlHelper.java index a45564f5cd..002317d3c3 100644 --- a/src/magic/ui/helpers/UrlHelper.java +++ b/src/magic/ui/helpers/UrlHelper.java @@ -8,7 +8,9 @@ import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; + import javax.swing.JOptionPane; + import magic.data.DownloadableFile; import magic.ui.CardTextLanguage; diff --git a/src/magic/ui/mwidgets/MCheckBox.java b/src/magic/ui/mwidgets/MCheckBox.java index 7386f3158f..22a2067308 100644 --- a/src/magic/ui/mwidgets/MCheckBox.java +++ b/src/magic/ui/mwidgets/MCheckBox.java @@ -3,11 +3,13 @@ package magic.ui.mwidgets; import java.awt.Color; import java.awt.event.ActionListener; import java.awt.event.ItemListener; + import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.event.ChangeListener; + import magic.data.MagicIcon; import magic.ui.MagicImages; import magic.ui.helpers.ImageHelper; diff --git a/src/magic/ui/mwidgets/MFileLink.java b/src/magic/ui/mwidgets/MFileLink.java index 1f1f7297e1..6111e84641 100644 --- a/src/magic/ui/mwidgets/MFileLink.java +++ b/src/magic/ui/mwidgets/MFileLink.java @@ -7,10 +7,12 @@ import java.awt.event.MouseEvent; import java.io.File; import java.io.IOException; import java.nio.file.Path; + import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.SwingUtilities; import javax.swing.border.Border; + import magic.exception.DesktopNotSupportedException; import magic.translate.MText; import magic.ui.MagicSound; diff --git a/src/magic/ui/mwidgets/MPlainTextViewer.java b/src/magic/ui/mwidgets/MPlainTextViewer.java index 565b8870ea..f8c455609c 100644 --- a/src/magic/ui/mwidgets/MPlainTextViewer.java +++ b/src/magic/ui/mwidgets/MPlainTextViewer.java @@ -2,9 +2,11 @@ package magic.ui.mwidgets; import java.awt.Color; import java.awt.event.MouseListener; + import javax.swing.JComponent; import javax.swing.JTextArea; import javax.swing.SwingUtilities; + import magic.ui.FontsAndBorders; /** diff --git a/src/magic/ui/mwidgets/MScrollPane.java b/src/magic/ui/mwidgets/MScrollPane.java index 1a0d6e189d..399217043e 100644 --- a/src/magic/ui/mwidgets/MScrollPane.java +++ b/src/magic/ui/mwidgets/MScrollPane.java @@ -2,11 +2,13 @@ package magic.ui.mwidgets; import java.awt.Color; import java.awt.Component; + import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.ScrollPaneConstants; import javax.swing.border.Border; + import magic.ui.widget.scrollbar.MScrollBarUI; public class MScrollPane extends MWidget { diff --git a/src/magic/ui/mwidgets/MTextFileViewer.java b/src/magic/ui/mwidgets/MTextFileViewer.java index 50dd49b918..9e5669189c 100644 --- a/src/magic/ui/mwidgets/MTextFileViewer.java +++ b/src/magic/ui/mwidgets/MTextFileViewer.java @@ -7,8 +7,10 @@ import java.awt.event.MouseEvent; import java.io.File; import java.nio.file.Path; import java.util.function.Function; + import javax.swing.BorderFactory; import javax.swing.JComponent; + import magic.ui.FontsAndBorders; import magic.ui.utility.MagicStyle; import magic.ui.widget.TexturedPanel; diff --git a/src/magic/ui/mwidgets/MWidget.java b/src/magic/ui/mwidgets/MWidget.java index c72ae85452..ad6a4360fe 100644 --- a/src/magic/ui/mwidgets/MWidget.java +++ b/src/magic/ui/mwidgets/MWidget.java @@ -1,6 +1,7 @@ package magic.ui.mwidgets; import java.awt.event.MouseListener; + import javax.swing.JComponent; /** diff --git a/src/magic/ui/screen/CardsLoadingPanel.java b/src/magic/ui/screen/CardsLoadingPanel.java index cb8185908e..cadded8ff3 100644 --- a/src/magic/ui/screen/CardsLoadingPanel.java +++ b/src/magic/ui/screen/CardsLoadingPanel.java @@ -2,8 +2,10 @@ package magic.ui.screen; import java.awt.Color; import java.awt.event.HierarchyEvent; + import javax.swing.JLabel; import javax.swing.SwingConstants; + import magic.awt.MagicFont; import magic.ui.MagicImages; import magic.ui.theme.Theme; diff --git a/src/magic/ui/screen/CardsLoadingWorker.java b/src/magic/ui/screen/CardsLoadingWorker.java index 8dd19ae029..0051d1cc22 100644 --- a/src/magic/ui/screen/CardsLoadingWorker.java +++ b/src/magic/ui/screen/CardsLoadingWorker.java @@ -1,7 +1,9 @@ package magic.ui.screen; import java.util.List; + import javax.swing.SwingWorker; + import magic.translate.MText; import magic.utility.MagicSystem; diff --git a/src/magic/ui/screen/HandCanvasLayeredPane.java b/src/magic/ui/screen/HandCanvasLayeredPane.java index 167f8561b6..6ebcaccb4e 100644 --- a/src/magic/ui/screen/HandCanvasLayeredPane.java +++ b/src/magic/ui/screen/HandCanvasLayeredPane.java @@ -3,8 +3,10 @@ package magic.ui.screen; import java.awt.Dimension; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; + import javax.swing.JLayeredPane; import javax.swing.JPanel; + import magic.ui.screen.cardflow.FlashTextOverlay; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/HandCanvasOptionsPanel.java b/src/magic/ui/screen/HandCanvasOptionsPanel.java index 99489ba6f2..ad8156fd71 100644 --- a/src/magic/ui/screen/HandCanvasOptionsPanel.java +++ b/src/magic/ui/screen/HandCanvasOptionsPanel.java @@ -1,8 +1,10 @@ package magic.ui.screen; import java.awt.Color; + import javax.swing.JLabel; import javax.swing.SwingConstants; + import magic.translate.MText; import magic.ui.FontsAndBorders; import magic.ui.screen.widget.BigDialButton; diff --git a/src/magic/ui/screen/HeaderFooterScreen.java b/src/magic/ui/screen/HeaderFooterScreen.java index d3a294a9e0..2223aee9d4 100644 --- a/src/magic/ui/screen/HeaderFooterScreen.java +++ b/src/magic/ui/screen/HeaderFooterScreen.java @@ -2,6 +2,7 @@ package magic.ui.screen; import javax.swing.JComponent; import javax.swing.JPanel; + import magic.ui.screen.widget.PlainMenuButton; import magic.ui.screen.widget.ScreenFooterPanel; import magic.ui.screen.widget.ScreenHeaderPanel; diff --git a/src/magic/ui/screen/MScreen.java b/src/magic/ui/screen/MScreen.java index 9127fe2931..7f7203027d 100644 --- a/src/magic/ui/screen/MScreen.java +++ b/src/magic/ui/screen/MScreen.java @@ -5,8 +5,10 @@ import java.awt.Cursor; import java.awt.Font; import java.awt.event.KeyEvent; import java.io.File; + import javax.swing.JComponent; import javax.swing.JPanel; + import magic.ui.ScreenController; import magic.ui.WikiPage; import magic.ui.helpers.KeyEventAction; diff --git a/src/magic/ui/screen/MScreenHelper.java b/src/magic/ui/screen/MScreenHelper.java index 813fd5256a..3d7f61add2 100644 --- a/src/magic/ui/screen/MScreenHelper.java +++ b/src/magic/ui/screen/MScreenHelper.java @@ -1,7 +1,9 @@ package magic.ui.screen; import java.awt.Component; + import javax.swing.JComponent; + import magic.ui.screen.interfaces.IThemeStyle; final class MScreenHelper { diff --git a/src/magic/ui/screen/ScreenHelper.java b/src/magic/ui/screen/ScreenHelper.java index 44af04b427..b217665779 100644 --- a/src/magic/ui/screen/ScreenHelper.java +++ b/src/magic/ui/screen/ScreenHelper.java @@ -1,6 +1,7 @@ package magic.ui.screen; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JComponent; import javax.swing.JPanel; diff --git a/src/magic/ui/screen/ScreenOptionsPanel.java b/src/magic/ui/screen/ScreenOptionsPanel.java index 5d794273af..a99577aa11 100644 --- a/src/magic/ui/screen/ScreenOptionsPanel.java +++ b/src/magic/ui/screen/ScreenOptionsPanel.java @@ -2,9 +2,11 @@ package magic.ui.screen; import java.awt.Color; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.ImageIcon; import javax.swing.JPanel; + import magic.data.MagicIcon; import magic.ui.helpers.ImageHelper; import magic.ui.screen.widget.ActionBarButton; diff --git a/src/magic/ui/screen/about/AboutContentPanel.java b/src/magic/ui/screen/about/AboutContentPanel.java index f12cac0c8f..4a3cb363d5 100644 --- a/src/magic/ui/screen/about/AboutContentPanel.java +++ b/src/magic/ui/screen/about/AboutContentPanel.java @@ -2,13 +2,16 @@ package magic.ui.screen.about; import java.awt.Graphics; import java.awt.image.BufferedImage; + import javax.swing.JPanel; + +import org.pushingpixels.trident.Timeline; +import org.pushingpixels.trident.callback.TimelineCallback; + import magic.ui.MagicImages; import magic.ui.MagicSound; import magic.ui.helpers.ImageHelper; import net.miginfocom.swing.MigLayout; -import org.pushingpixels.trident.Timeline; -import org.pushingpixels.trident.callback.TimelineCallback; @SuppressWarnings("serial") public class AboutContentPanel extends JPanel diff --git a/src/magic/ui/screen/about/AboutHeaderPanel.java b/src/magic/ui/screen/about/AboutHeaderPanel.java index f258e2ab22..7ecbbae93a 100644 --- a/src/magic/ui/screen/about/AboutHeaderPanel.java +++ b/src/magic/ui/screen/about/AboutHeaderPanel.java @@ -2,10 +2,12 @@ package magic.ui.screen.about; import java.awt.Color; import java.awt.Font; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.Timer; + import magic.translate.MText; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/about/LicenseButton.java b/src/magic/ui/screen/about/LicenseButton.java index 6c91a06034..f59c03fd14 100644 --- a/src/magic/ui/screen/about/LicenseButton.java +++ b/src/magic/ui/screen/about/LicenseButton.java @@ -1,7 +1,9 @@ package magic.ui.screen.about; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; + import magic.data.MagicIcon; import magic.translate.MText; import magic.ui.MagicImages; diff --git a/src/magic/ui/screen/card/CardScriptPanel.java b/src/magic/ui/screen/card/CardScriptPanel.java index c43fdfb78f..606857ec13 100644 --- a/src/magic/ui/screen/card/CardScriptPanel.java +++ b/src/magic/ui/screen/card/CardScriptPanel.java @@ -2,8 +2,10 @@ package magic.ui.screen.card; import java.io.File; import java.nio.file.Path; + import javax.swing.JPanel; import javax.swing.JSplitPane; + import magic.data.CardDefinitions; import magic.model.MagicCardDefinition; import magic.ui.mwidgets.MTextFileViewer; diff --git a/src/magic/ui/screen/card/ContentPanel.java b/src/magic/ui/screen/card/ContentPanel.java index 2a21913f7b..9480318a57 100644 --- a/src/magic/ui/screen/card/ContentPanel.java +++ b/src/magic/ui/screen/card/ContentPanel.java @@ -2,6 +2,7 @@ package magic.ui.screen.card; import javax.swing.JLabel; import javax.swing.JPanel; + import magic.model.MagicCardDefinition; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/card/TabsContainer.java b/src/magic/ui/screen/card/TabsContainer.java index f7cad2440d..3c556e02db 100644 --- a/src/magic/ui/screen/card/TabsContainer.java +++ b/src/magic/ui/screen/card/TabsContainer.java @@ -1,8 +1,10 @@ package magic.ui.screen.card; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JPanel; + import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/card/TabsPanel.java b/src/magic/ui/screen/card/TabsPanel.java index 4b07700f62..1f84d562ed 100644 --- a/src/magic/ui/screen/card/TabsPanel.java +++ b/src/magic/ui/screen/card/TabsPanel.java @@ -4,9 +4,11 @@ import java.awt.Color; import java.awt.Font; import java.util.LinkedHashMap; import java.util.Map; + import javax.swing.AbstractAction; import javax.swing.ButtonGroup; import javax.swing.JToggleButton; + import magic.ui.screen.deck.editor.ViewToggleButton; import magic.ui.utility.MagicStyle; import magic.ui.widget.TexturedPanel; diff --git a/src/magic/ui/screen/card/explorer/ExplorerContentPanel.java b/src/magic/ui/screen/card/explorer/ExplorerContentPanel.java index 3c8a242918..8e7c3f2da6 100644 --- a/src/magic/ui/screen/card/explorer/ExplorerContentPanel.java +++ b/src/magic/ui/screen/card/explorer/ExplorerContentPanel.java @@ -7,9 +7,11 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.model.MagicCardDefinition; import magic.model.MagicRandom; import magic.ui.ICardFilterPanelListener; diff --git a/src/magic/ui/screen/card/explorer/ExplorerHeaderPanel.java b/src/magic/ui/screen/card/explorer/ExplorerHeaderPanel.java index 7218a5e466..f667fcb0a5 100644 --- a/src/magic/ui/screen/card/explorer/ExplorerHeaderPanel.java +++ b/src/magic/ui/screen/card/explorer/ExplorerHeaderPanel.java @@ -4,11 +4,13 @@ import java.awt.Color; import java.awt.Font; import java.text.DecimalFormat; import java.text.NumberFormat; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; -import magic.translate.StringContext; + import magic.translate.MText; +import magic.translate.StringContext; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/card/explorer/ExplorerScreen.java b/src/magic/ui/screen/card/explorer/ExplorerScreen.java index 87ddd862e6..bfee5537c2 100644 --- a/src/magic/ui/screen/card/explorer/ExplorerScreen.java +++ b/src/magic/ui/screen/card/explorer/ExplorerScreen.java @@ -2,8 +2,10 @@ package magic.ui.screen.card.explorer; import java.awt.Color; import java.awt.image.BufferedImage; + import javax.swing.ImageIcon; import javax.swing.SwingUtilities; + import magic.data.MagicIcon; import magic.data.MagicSetDefinitions; import magic.translate.MText; diff --git a/src/magic/ui/screen/card/explorer/ExplorerSideBar.java b/src/magic/ui/screen/card/explorer/ExplorerSideBar.java index d2889f5145..e1f8731c87 100644 --- a/src/magic/ui/screen/card/explorer/ExplorerSideBar.java +++ b/src/magic/ui/screen/card/explorer/ExplorerSideBar.java @@ -3,8 +3,10 @@ package magic.ui.screen.card.explorer; import java.awt.Color; import java.awt.Dimension; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.BorderFactory; + import magic.model.MagicCardDefinition; import magic.translate.MText; import magic.ui.dialog.prefs.ImageSizePresets; diff --git a/src/magic/ui/screen/card/explorer/OptionsPanel.java b/src/magic/ui/screen/card/explorer/OptionsPanel.java index 72e9bbc127..2e5e51d75c 100644 --- a/src/magic/ui/screen/card/explorer/OptionsPanel.java +++ b/src/magic/ui/screen/card/explorer/OptionsPanel.java @@ -1,8 +1,10 @@ package magic.ui.screen.card.explorer; import java.awt.Color; + import javax.swing.JLabel; import javax.swing.SwingConstants; + import magic.translate.MText; import magic.ui.FontsAndBorders; import magic.ui.screen.ScreenOptionsPanel; diff --git a/src/magic/ui/screen/card/explorer/SplitterButton.java b/src/magic/ui/screen/card/explorer/SplitterButton.java index 3d615db636..23037abcbb 100644 --- a/src/magic/ui/screen/card/explorer/SplitterButton.java +++ b/src/magic/ui/screen/card/explorer/SplitterButton.java @@ -8,7 +8,9 @@ import java.awt.Polygon; import java.awt.RenderingHints; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JButton; + import magic.ui.utility.MagicStyle; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/cardflow/CardFlowLayeredPane.java b/src/magic/ui/screen/cardflow/CardFlowLayeredPane.java index 41bef98e9c..898a0b0d31 100644 --- a/src/magic/ui/screen/cardflow/CardFlowLayeredPane.java +++ b/src/magic/ui/screen/cardflow/CardFlowLayeredPane.java @@ -3,6 +3,7 @@ package magic.ui.screen.cardflow; import java.awt.Dimension; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; + import javax.swing.JLayeredPane; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/cardflow/CardFlowPanel.java b/src/magic/ui/screen/cardflow/CardFlowPanel.java index ca44f87954..2e90c4b2e2 100644 --- a/src/magic/ui/screen/cardflow/CardFlowPanel.java +++ b/src/magic/ui/screen/cardflow/CardFlowPanel.java @@ -16,14 +16,17 @@ import java.awt.event.MouseWheelEvent; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.JPanel; import javax.swing.KeyStroke; -import magic.ui.dialog.prefs.ImageSizePresets; -import magic.ui.helpers.ImageHelper; + import org.pushingpixels.trident.Timeline; import org.pushingpixels.trident.callback.TimelineCallback; +import magic.ui.dialog.prefs.ImageSizePresets; +import magic.ui.helpers.ImageHelper; + @SuppressWarnings("serial") class CardFlowPanel extends JPanel implements TimelineCallback { diff --git a/src/magic/ui/screen/cardflow/CardFlowScreen.java b/src/magic/ui/screen/cardflow/CardFlowScreen.java index 1d6b2292f5..d36db1fdda 100644 --- a/src/magic/ui/screen/cardflow/CardFlowScreen.java +++ b/src/magic/ui/screen/cardflow/CardFlowScreen.java @@ -2,6 +2,7 @@ package magic.ui.screen.cardflow; import java.awt.Color; import java.text.MessageFormat; + import magic.data.MagicIcon; import magic.translate.MText; import magic.ui.ScreenController; diff --git a/src/magic/ui/screen/cardflow/FlashTextOverlay.java b/src/magic/ui/screen/cardflow/FlashTextOverlay.java index 7516af936a..b05572beac 100644 --- a/src/magic/ui/screen/cardflow/FlashTextOverlay.java +++ b/src/magic/ui/screen/cardflow/FlashTextOverlay.java @@ -10,8 +10,10 @@ import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.BorderFactory; import javax.swing.Timer; + import magic.awt.MagicFont; import magic.ui.helpers.ImageHelper; import magic.ui.utility.MagicStyle; diff --git a/src/magic/ui/screen/cardflow/OptionsPanel.java b/src/magic/ui/screen/cardflow/OptionsPanel.java index 5da8fe9f6d..f6ecb06436 100644 --- a/src/magic/ui/screen/cardflow/OptionsPanel.java +++ b/src/magic/ui/screen/cardflow/OptionsPanel.java @@ -1,8 +1,10 @@ package magic.ui.screen.cardflow; import java.awt.Color; + import javax.swing.JLabel; import javax.swing.SwingConstants; + import magic.translate.MText; import magic.ui.FontsAndBorders; import magic.ui.dialog.prefs.ImageSizePresets; diff --git a/src/magic/ui/screen/deck/DeckScreenPanel.java b/src/magic/ui/screen/deck/DeckScreenPanel.java index 18478f8773..6f215bc8fb 100644 --- a/src/magic/ui/screen/deck/DeckScreenPanel.java +++ b/src/magic/ui/screen/deck/DeckScreenPanel.java @@ -1,6 +1,7 @@ package magic.ui.screen.deck; import javax.swing.JPanel; + import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.ui.screen.deck.editor.DeckSideBar; diff --git a/src/magic/ui/screen/deck/editor/CardPoolViewPanel.java b/src/magic/ui/screen/deck/editor/CardPoolViewPanel.java index d875d4c331..0c3b13b194 100644 --- a/src/magic/ui/screen/deck/editor/CardPoolViewPanel.java +++ b/src/magic/ui/screen/deck/editor/CardPoolViewPanel.java @@ -6,9 +6,11 @@ import java.awt.event.FocusListener; import java.util.ArrayList; import java.util.Collection; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.JPanel; import javax.swing.JTable; + import magic.data.MagicIcon; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; diff --git a/src/magic/ui/screen/deck/editor/CardQuantityActionPanel.java b/src/magic/ui/screen/deck/editor/CardQuantityActionPanel.java index a7d3ce9cf6..35665e713a 100644 --- a/src/magic/ui/screen/deck/editor/CardQuantityActionPanel.java +++ b/src/magic/ui/screen/deck/editor/CardQuantityActionPanel.java @@ -2,10 +2,12 @@ package magic.ui.screen.deck.editor; import java.awt.Color; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.data.MagicIcon; import magic.translate.MText; import magic.ui.FontsAndBorders; diff --git a/src/magic/ui/screen/deck/editor/CardRecallPanel.java b/src/magic/ui/screen/deck/editor/CardRecallPanel.java index dd12037440..c451561240 100644 --- a/src/magic/ui/screen/deck/editor/CardRecallPanel.java +++ b/src/magic/ui/screen/deck/editor/CardRecallPanel.java @@ -4,8 +4,10 @@ import java.awt.event.FocusEvent; import java.awt.event.FocusListener; import java.util.ArrayList; import java.util.List; + import javax.swing.JPanel; import javax.swing.JTable; + import magic.model.MagicCardDefinition; import magic.ui.MagicSound; import magic.ui.screen.widget.ActionBarButton; diff --git a/src/magic/ui/screen/deck/editor/ContentPanel.java b/src/magic/ui/screen/deck/editor/ContentPanel.java index 5f2a8507fc..2ca4ac15a2 100644 --- a/src/magic/ui/screen/deck/editor/ContentPanel.java +++ b/src/magic/ui/screen/deck/editor/ContentPanel.java @@ -1,6 +1,7 @@ package magic.ui.screen.deck.editor; import javax.swing.JPanel; + import magic.data.GeneralConfig; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; diff --git a/src/magic/ui/screen/deck/editor/DeckActionPanel.java b/src/magic/ui/screen/deck/editor/DeckActionPanel.java index 67e6862722..f1a5668fbe 100644 --- a/src/magic/ui/screen/deck/editor/DeckActionPanel.java +++ b/src/magic/ui/screen/deck/editor/DeckActionPanel.java @@ -2,8 +2,10 @@ package magic.ui.screen.deck.editor; import java.awt.Color; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.JPanel; + import magic.ui.screen.widget.ActionBarButton; import magic.ui.utility.MagicStyle; import magic.ui.widget.TexturedPanel; diff --git a/src/magic/ui/screen/deck/editor/DeckEditorScreen.java b/src/magic/ui/screen/deck/editor/DeckEditorScreen.java index 2a7e1f3e11..8242ee0e19 100644 --- a/src/magic/ui/screen/deck/editor/DeckEditorScreen.java +++ b/src/magic/ui/screen/deck/editor/DeckEditorScreen.java @@ -8,8 +8,10 @@ import java.nio.file.InvalidPathException; import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; + import javax.swing.ImageIcon; import javax.swing.JOptionPane; + import magic.data.DeckType; import magic.data.GeneralConfig; import magic.data.MagicIcon; diff --git a/src/magic/ui/screen/deck/editor/DeckEditorSplitPanel.java b/src/magic/ui/screen/deck/editor/DeckEditorSplitPanel.java index 09e0c98254..a418647ae9 100644 --- a/src/magic/ui/screen/deck/editor/DeckEditorSplitPanel.java +++ b/src/magic/ui/screen/deck/editor/DeckEditorSplitPanel.java @@ -9,6 +9,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.text.NumberFormat; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JOptionPane; @@ -16,18 +17,19 @@ import javax.swing.JPanel; import javax.swing.JSplitPane; import javax.swing.JTable; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.model.MagicDeckConstructionRule; import magic.model.MagicRandom; +import magic.ui.FontsAndBorders; import magic.ui.ICardFilterPanelListener; import magic.ui.ScreenController; +import magic.ui.widget.TexturedPanel; +import magic.ui.widget.card.filter.CardFilterPanel; import magic.ui.widget.cards.table.CardTablePanelB; import magic.ui.widget.cards.table.ICardSelectionListener; -import magic.ui.widget.card.filter.CardFilterPanel; -import magic.ui.FontsAndBorders; -import magic.ui.widget.TexturedPanel; import magic.utility.MagicSystem; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/deck/editor/DeckEditorSplitScreen.java b/src/magic/ui/screen/deck/editor/DeckEditorSplitScreen.java index b233406eb2..2e3ab1d2c6 100644 --- a/src/magic/ui/screen/deck/editor/DeckEditorSplitScreen.java +++ b/src/magic/ui/screen/deck/editor/DeckEditorSplitScreen.java @@ -4,9 +4,11 @@ import java.awt.event.ActionEvent; import java.io.File; import java.nio.file.Files; import java.nio.file.Path; + import javax.swing.AbstractAction; import javax.swing.JFileChooser; import javax.swing.JOptionPane; + import magic.data.DeckType; import magic.data.GeneralConfig; import magic.data.MagicIcon; diff --git a/src/magic/ui/screen/deck/editor/DeckPanel.java b/src/magic/ui/screen/deck/editor/DeckPanel.java index 8a38b41c88..a2a84312f2 100644 --- a/src/magic/ui/screen/deck/editor/DeckPanel.java +++ b/src/magic/ui/screen/deck/editor/DeckPanel.java @@ -3,9 +3,11 @@ package magic.ui.screen.deck.editor; import java.awt.event.ActionEvent; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.JOptionPane; import javax.swing.JPanel; + import magic.data.MagicIcon; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; diff --git a/src/magic/ui/screen/deck/editor/FilteredCardPoolPanel.java b/src/magic/ui/screen/deck/editor/FilteredCardPoolPanel.java index 3e28e85c92..67cff39e1e 100644 --- a/src/magic/ui/screen/deck/editor/FilteredCardPoolPanel.java +++ b/src/magic/ui/screen/deck/editor/FilteredCardPoolPanel.java @@ -2,8 +2,10 @@ package magic.ui.screen.deck.editor; import java.text.NumberFormat; import java.util.List; + import javax.swing.JPanel; import javax.swing.JTable; + import magic.model.MagicCardDefinition; import magic.translate.MText; import magic.translate.StringContext; diff --git a/src/magic/ui/screen/deck/editor/IDeckEditorView.java b/src/magic/ui/screen/deck/editor/IDeckEditorView.java index a29b6f658b..c41b3218fa 100644 --- a/src/magic/ui/screen/deck/editor/IDeckEditorView.java +++ b/src/magic/ui/screen/deck/editor/IDeckEditorView.java @@ -1,6 +1,7 @@ package magic.ui.screen.deck.editor; import java.util.List; + import magic.model.MagicCardDefinition; import magic.ui.screen.widget.ActionBarButton; diff --git a/src/magic/ui/screen/deck/editor/MainViewsPanel.java b/src/magic/ui/screen/deck/editor/MainViewsPanel.java index b1f4d39687..af340dd591 100644 --- a/src/magic/ui/screen/deck/editor/MainViewsPanel.java +++ b/src/magic/ui/screen/deck/editor/MainViewsPanel.java @@ -4,10 +4,12 @@ import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.AbstractAction; import javax.swing.JPanel; import javax.swing.JToggleButton; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; diff --git a/src/magic/ui/screen/deck/editor/ViewToggleButton.java b/src/magic/ui/screen/deck/editor/ViewToggleButton.java index ee8948f3a5..d7b3d7ec76 100644 --- a/src/magic/ui/screen/deck/editor/ViewToggleButton.java +++ b/src/magic/ui/screen/deck/editor/ViewToggleButton.java @@ -6,9 +6,11 @@ import java.awt.Font; import java.awt.Graphics; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JToggleButton; -import magic.ui.utility.MagicStyle; + import magic.ui.FontsAndBorders; +import magic.ui.utility.MagicStyle; @SuppressWarnings("serial") public class ViewToggleButton extends JToggleButton { diff --git a/src/magic/ui/screen/deck/hand/SampleHandScreen.java b/src/magic/ui/screen/deck/hand/SampleHandScreen.java index 620a75c91b..69841329da 100644 --- a/src/magic/ui/screen/deck/hand/SampleHandScreen.java +++ b/src/magic/ui/screen/deck/hand/SampleHandScreen.java @@ -4,6 +4,7 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; + import magic.data.MagicIcon; import magic.model.IRenderableCard; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/screen/deck/tiled/ContentPanel.java b/src/magic/ui/screen/deck/tiled/ContentPanel.java index 34a2f7e17d..20e1bff375 100644 --- a/src/magic/ui/screen/deck/tiled/ContentPanel.java +++ b/src/magic/ui/screen/deck/tiled/ContentPanel.java @@ -2,14 +2,16 @@ package magic.ui.screen.deck.tiled; import java.awt.image.BufferedImage; import java.util.List; + import javax.swing.JPanel; + import magic.model.IRenderableCard; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.ui.MagicImages; import magic.ui.ScreenController; -import magic.ui.screen.deck.editor.DeckSideBar; import magic.ui.screen.cardflow.ICardFlowProvider; +import magic.ui.screen.deck.editor.DeckSideBar; import magic.ui.widget.cards.canvas.CardsCanvas; import magic.ui.widget.cards.canvas.ICardsCanvasListener; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/deck/tiled/DeckTiledCardsScreen.java b/src/magic/ui/screen/deck/tiled/DeckTiledCardsScreen.java index f6ca921f78..e73758f551 100644 --- a/src/magic/ui/screen/deck/tiled/DeckTiledCardsScreen.java +++ b/src/magic/ui/screen/deck/tiled/DeckTiledCardsScreen.java @@ -3,7 +3,9 @@ package magic.ui.screen.deck.tiled; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; + import javax.swing.SwingUtilities; + import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.translate.MText; diff --git a/src/magic/ui/screen/deck/tiled/HeaderPanel.java b/src/magic/ui/screen/deck/tiled/HeaderPanel.java index 0ec7d3048f..d7f1fd2562 100644 --- a/src/magic/ui/screen/deck/tiled/HeaderPanel.java +++ b/src/magic/ui/screen/deck/tiled/HeaderPanel.java @@ -3,9 +3,11 @@ package magic.ui.screen.deck.tiled; import java.awt.Color; import java.awt.Font; import java.util.List; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.translate.MText; diff --git a/src/magic/ui/screen/decks/DeckPanel.java b/src/magic/ui/screen/decks/DeckPanel.java index a97b183fe5..7230e68f88 100644 --- a/src/magic/ui/screen/decks/DeckPanel.java +++ b/src/magic/ui/screen/decks/DeckPanel.java @@ -1,6 +1,7 @@ package magic.ui.screen.decks; import javax.swing.JPanel; + import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.ui.widget.cards.table.DeckViewTablePanel; diff --git a/src/magic/ui/screen/decks/DeckViewsPanel.java b/src/magic/ui/screen/decks/DeckViewsPanel.java index abd6a56916..3dca25b5fc 100644 --- a/src/magic/ui/screen/decks/DeckViewsPanel.java +++ b/src/magic/ui/screen/decks/DeckViewsPanel.java @@ -2,9 +2,11 @@ package magic.ui.screen.decks; import java.awt.Component; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JPanel; import javax.swing.JToggleButton; + import magic.data.GeneralConfig; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; diff --git a/src/magic/ui/screen/decks/DecksScreenPanel.java b/src/magic/ui/screen/decks/DecksScreenPanel.java index aff5b28a45..e552c04f24 100644 --- a/src/magic/ui/screen/decks/DecksScreenPanel.java +++ b/src/magic/ui/screen/decks/DecksScreenPanel.java @@ -2,8 +2,10 @@ package magic.ui.screen.decks; import java.awt.Dimension; import java.nio.file.Path; + import javax.swing.JPanel; import javax.swing.JSplitPane; + import magic.data.DeckType; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; diff --git a/src/magic/ui/screen/decks/SidebarPanel.java b/src/magic/ui/screen/decks/SidebarPanel.java index 200f1f532a..7e4802234f 100644 --- a/src/magic/ui/screen/decks/SidebarPanel.java +++ b/src/magic/ui/screen/decks/SidebarPanel.java @@ -2,7 +2,9 @@ package magic.ui.screen.decks; import java.awt.Color; import java.awt.Dimension; + import javax.swing.BorderFactory; + import magic.model.MagicDeck; import magic.ui.FontsAndBorders; import magic.ui.screen.interfaces.IDeckConsumer; diff --git a/src/magic/ui/screen/duel/decks/DuelDecksPanel.java b/src/magic/ui/screen/duel/decks/DuelDecksPanel.java index 91daa986e2..74950d2917 100644 --- a/src/magic/ui/screen/duel/decks/DuelDecksPanel.java +++ b/src/magic/ui/screen/duel/decks/DuelDecksPanel.java @@ -7,9 +7,11 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.JTabbedPane; import javax.swing.event.ChangeEvent; + import magic.data.DeckType; import magic.data.DuelConfig; import magic.data.MagicIcon; diff --git a/src/magic/ui/screen/duel/decks/DuelDecksScreen.java b/src/magic/ui/screen/duel/decks/DuelDecksScreen.java index 90ad2f5679..67b6037035 100644 --- a/src/magic/ui/screen/duel/decks/DuelDecksScreen.java +++ b/src/magic/ui/screen/duel/decks/DuelDecksScreen.java @@ -1,8 +1,10 @@ package magic.ui.screen.duel.decks; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JOptionPane; + import magic.data.DuelConfig; import magic.data.MagicIcon; import magic.exception.InvalidDeckException; diff --git a/src/magic/ui/screen/duel/decks/NewGameWorker.java b/src/magic/ui/screen/duel/decks/NewGameWorker.java index 5d579bea75..800ec48804 100644 --- a/src/magic/ui/screen/duel/decks/NewGameWorker.java +++ b/src/magic/ui/screen/duel/decks/NewGameWorker.java @@ -2,7 +2,9 @@ package magic.ui.screen.duel.decks; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; + import javax.swing.SwingWorker; + import magic.model.MagicDuel; import magic.model.MagicGame; import magic.utility.MagicSystem; diff --git a/src/magic/ui/screen/duel/decks/OptionsPanel.java b/src/magic/ui/screen/duel/decks/OptionsPanel.java index 19cde1e34d..be3e15e0b2 100644 --- a/src/magic/ui/screen/duel/decks/OptionsPanel.java +++ b/src/magic/ui/screen/duel/decks/OptionsPanel.java @@ -1,8 +1,10 @@ package magic.ui.screen.duel.decks; import java.awt.Color; + import javax.swing.JLabel; import javax.swing.SwingConstants; + import magic.translate.MText; import magic.ui.FontsAndBorders; import magic.ui.screen.ScreenOptionsPanel; diff --git a/src/magic/ui/screen/duel/decks/PlayerPanel.java b/src/magic/ui/screen/duel/decks/PlayerPanel.java index eca98bf89f..b7a17144ce 100644 --- a/src/magic/ui/screen/duel/decks/PlayerPanel.java +++ b/src/magic/ui/screen/duel/decks/PlayerPanel.java @@ -7,9 +7,11 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.Graphics; import java.awt.Graphics2D; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.model.MagicDuel; import magic.model.player.PlayerProfile; import magic.ui.MagicImages; diff --git a/src/magic/ui/screen/duel/decks/StartGameButton.java b/src/magic/ui/screen/duel/decks/StartGameButton.java index 9b8bf7f34f..66ede073ca 100644 --- a/src/magic/ui/screen/duel/decks/StartGameButton.java +++ b/src/magic/ui/screen/duel/decks/StartGameButton.java @@ -1,6 +1,7 @@ package magic.ui.screen.duel.decks; import javax.swing.AbstractAction; + import magic.translate.MText; import magic.ui.screen.widget.PlainMenuButton; diff --git a/src/magic/ui/screen/duel/game/BattlefieldPanel.java b/src/magic/ui/screen/duel/game/BattlefieldPanel.java index bd322cee4a..1db6e6014f 100644 --- a/src/magic/ui/screen/duel/game/BattlefieldPanel.java +++ b/src/magic/ui/screen/duel/game/BattlefieldPanel.java @@ -4,8 +4,10 @@ import java.awt.Graphics; import java.awt.Image; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.model.MagicCardList; import magic.ui.duel.resolution.ResolutionProfileResult; import magic.ui.duel.resolution.ResolutionProfileType; diff --git a/src/magic/ui/screen/duel/game/BattlefieldTextOverlay.java b/src/magic/ui/screen/duel/game/BattlefieldTextOverlay.java index 996282c65d..b3eb2640f0 100644 --- a/src/magic/ui/screen/duel/game/BattlefieldTextOverlay.java +++ b/src/magic/ui/screen/duel/game/BattlefieldTextOverlay.java @@ -6,6 +6,7 @@ import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.Transparency; import java.awt.image.BufferedImage; + import magic.ui.helpers.ImageHelper; diff --git a/src/magic/ui/screen/duel/game/DuelGameScreen.java b/src/magic/ui/screen/duel/game/DuelGameScreen.java index 549be8d0ab..3d918801fe 100644 --- a/src/magic/ui/screen/duel/game/DuelGameScreen.java +++ b/src/magic/ui/screen/duel/game/DuelGameScreen.java @@ -1,6 +1,7 @@ package magic.ui.screen.duel.game; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.model.MagicDuel; import magic.model.MagicGame; diff --git a/src/magic/ui/screen/duel/game/DuelLayeredPane.java b/src/magic/ui/screen/duel/game/DuelLayeredPane.java index bbd6cfa194..9eebdca4bc 100644 --- a/src/magic/ui/screen/duel/game/DuelLayeredPane.java +++ b/src/magic/ui/screen/duel/game/DuelLayeredPane.java @@ -4,7 +4,9 @@ import java.awt.Component; import java.awt.Dimension; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; + import javax.swing.JLayeredPane; + import magic.ui.widget.ZoneBackgroundLabel; import magic.ui.widget.card.AnnotatedCardPanel; import magic.ui.widget.duel.DuelDialogPanel; diff --git a/src/magic/ui/screen/duel/game/DuelPanel.java b/src/magic/ui/screen/duel/game/DuelPanel.java index 1e5d5a3022..0242ac541e 100644 --- a/src/magic/ui/screen/duel/game/DuelPanel.java +++ b/src/magic/ui/screen/duel/game/DuelPanel.java @@ -5,9 +5,11 @@ import java.awt.Point; import java.awt.Rectangle; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.model.MagicCardList; import magic.model.MagicPlayerZone; diff --git a/src/magic/ui/screen/duel/game/GameOptionsOverlay.java b/src/magic/ui/screen/duel/game/GameOptionsOverlay.java index 538ecee97b..8e4fcbb6e4 100644 --- a/src/magic/ui/screen/duel/game/GameOptionsOverlay.java +++ b/src/magic/ui/screen/duel/game/GameOptionsOverlay.java @@ -1,7 +1,9 @@ package magic.ui.screen.duel.game; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; + import magic.translate.MText; import magic.ui.ScreenController; import magic.ui.ScreenOptionsOverlay; diff --git a/src/magic/ui/screen/duel/game/GameplayReport.java b/src/magic/ui/screen/duel/game/GameplayReport.java index 29a7aa0d47..6e9884a15d 100644 --- a/src/magic/ui/screen/duel/game/GameplayReport.java +++ b/src/magic/ui/screen/duel/game/GameplayReport.java @@ -7,6 +7,9 @@ import java.io.IOException; import java.nio.file.Path; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; + +import org.apache.commons.io.FileUtils; + import magic.game.state.GameState; import magic.game.state.GameStateFileWriter; import magic.game.state.GameStateSnapshot; @@ -16,7 +19,6 @@ import magic.ui.ScreenController; import magic.ui.helpers.DesktopHelper; import magic.ui.helpers.ImageHelper; import magic.utility.MagicFileSystem; -import org.apache.commons.io.FileUtils; final class GameplayReport { private GameplayReport() {} diff --git a/src/magic/ui/screen/duel/game/PermanentFilter.java b/src/magic/ui/screen/duel/game/PermanentFilter.java index ba6087dce1..5e5e86a22f 100644 --- a/src/magic/ui/screen/duel/game/PermanentFilter.java +++ b/src/magic/ui/screen/duel/game/PermanentFilter.java @@ -3,6 +3,7 @@ package magic.ui.screen.duel.game; import java.util.Comparator; import java.util.SortedSet; import java.util.TreeSet; + import magic.ui.duel.viewerinfo.GameViewerInfo; import magic.ui.duel.viewerinfo.PermanentViewerInfo; import magic.ui.duel.viewerinfo.PlayerViewerInfo; diff --git a/src/magic/ui/screen/duel/game/SwingGameController.java b/src/magic/ui/screen/duel/game/SwingGameController.java index cb4b776609..6659bca439 100644 --- a/src/magic/ui/screen/duel/game/SwingGameController.java +++ b/src/magic/ui/screen/duel/game/SwingGameController.java @@ -22,8 +22,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.logging.Level; import java.util.logging.Logger; + import javax.swing.JComponent; import javax.swing.SwingUtilities; + import magic.ai.MagicAI; import magic.data.DuelConfig; import magic.data.GeneralConfig; diff --git a/src/magic/ui/screen/duel/game/log/GameLogScreen.java b/src/magic/ui/screen/duel/game/log/GameLogScreen.java index e1636340d8..373b9a0124 100644 --- a/src/magic/ui/screen/duel/game/log/GameLogScreen.java +++ b/src/magic/ui/screen/duel/game/log/GameLogScreen.java @@ -5,15 +5,17 @@ import java.awt.event.KeyEvent; import java.nio.file.Path; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.swing.JLabel; import javax.swing.SwingConstants; + import magic.data.MagicIcon; import magic.translate.MText; import magic.ui.ScreenController; import magic.ui.helpers.KeyEventAction; +import magic.ui.mwidgets.MTextFileViewer; import magic.ui.screen.HeaderFooterScreen; import magic.ui.screen.widget.PlainMenuButton; -import magic.ui.mwidgets.MTextFileViewer; import magic.utility.MagicFileSystem; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/duel/mulligan/HeaderPanel.java b/src/magic/ui/screen/duel/mulligan/HeaderPanel.java index 06368a6685..1aca4b34cf 100644 --- a/src/magic/ui/screen/duel/mulligan/HeaderPanel.java +++ b/src/magic/ui/screen/duel/mulligan/HeaderPanel.java @@ -2,9 +2,11 @@ package magic.ui.screen.duel.mulligan; import java.awt.Color; import java.awt.Font; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.model.MagicGame; import magic.model.MagicPlayer; import magic.translate.MText; diff --git a/src/magic/ui/screen/duel/mulligan/MulliganScreen.java b/src/magic/ui/screen/duel/mulligan/MulliganScreen.java index 072053a769..c3c7a1294f 100644 --- a/src/magic/ui/screen/duel/mulligan/MulliganScreen.java +++ b/src/magic/ui/screen/duel/mulligan/MulliganScreen.java @@ -1,8 +1,10 @@ package magic.ui.screen.duel.mulligan; import java.awt.event.KeyEvent; + import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.data.MagicIcon; import magic.model.MagicCardDefinition; import magic.model.MagicCardList; diff --git a/src/magic/ui/screen/duel/player/AiPlayerJList.java b/src/magic/ui/screen/duel/player/AiPlayerJList.java index 1579694000..4256f0de1a 100644 --- a/src/magic/ui/screen/duel/player/AiPlayerJList.java +++ b/src/magic/ui/screen/duel/player/AiPlayerJList.java @@ -2,8 +2,8 @@ package magic.ui.screen.duel.player; import magic.model.player.AiProfile; import magic.model.player.PlayerProfile; -import magic.translate.StringContext; import magic.translate.MText; +import magic.translate.StringContext; @SuppressWarnings("serial") class AiPlayerJList extends PlayersJList { diff --git a/src/magic/ui/screen/duel/player/PlayerMiniStatsPanel.java b/src/magic/ui/screen/duel/player/PlayerMiniStatsPanel.java index 01f55d734e..168e7f7f3e 100644 --- a/src/magic/ui/screen/duel/player/PlayerMiniStatsPanel.java +++ b/src/magic/ui/screen/duel/player/PlayerMiniStatsPanel.java @@ -1,11 +1,13 @@ package magic.ui.screen.duel.player; import java.awt.Color; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.border.Border; + import magic.model.player.PlayerStatistics; import magic.translate.MText; import magic.translate.StringContext; diff --git a/src/magic/ui/screen/duel/player/PlayersJList.java b/src/magic/ui/screen/duel/player/PlayersJList.java index 182aaac4e7..55a8bda0c8 100644 --- a/src/magic/ui/screen/duel/player/PlayersJList.java +++ b/src/magic/ui/screen/duel/player/PlayersJList.java @@ -3,16 +3,18 @@ package magic.ui.screen.duel.player; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.ListCellRenderer; import javax.swing.SwingConstants; + import magic.model.player.PlayerProfile; +import magic.ui.FontsAndBorders; import magic.ui.MagicImages; import magic.ui.utility.MagicStyle; -import magic.ui.FontsAndBorders; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/duel/player/SelectAiPlayerScreen.java b/src/magic/ui/screen/duel/player/SelectAiPlayerScreen.java index 366b998db3..2c7146713f 100644 --- a/src/magic/ui/screen/duel/player/SelectAiPlayerScreen.java +++ b/src/magic/ui/screen/duel/player/SelectAiPlayerScreen.java @@ -3,6 +3,7 @@ package magic.ui.screen.duel.player; import java.io.IOException; import java.util.HashMap; import java.util.List; + import magic.model.player.AiProfile; import magic.model.player.IPlayerProfileListener; import magic.model.player.PlayerProfile; diff --git a/src/magic/ui/screen/duel/player/SelectHumanPlayerScreen.java b/src/magic/ui/screen/duel/player/SelectHumanPlayerScreen.java index 34a94a086b..1554724e80 100644 --- a/src/magic/ui/screen/duel/player/SelectHumanPlayerScreen.java +++ b/src/magic/ui/screen/duel/player/SelectHumanPlayerScreen.java @@ -3,7 +3,9 @@ package magic.ui.screen.duel.player; import java.io.IOException; import java.util.HashMap; import java.util.List; + import javax.swing.JOptionPane; + import magic.model.player.HumanProfile; import magic.model.player.IPlayerProfileListener; import magic.model.player.PlayerProfile; diff --git a/src/magic/ui/screen/duel/player/SelectPlayerScreen.java b/src/magic/ui/screen/duel/player/SelectPlayerScreen.java index d23c7756cf..b2c7d463d5 100644 --- a/src/magic/ui/screen/duel/player/SelectPlayerScreen.java +++ b/src/magic/ui/screen/duel/player/SelectPlayerScreen.java @@ -12,12 +12,14 @@ import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.HashMap; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JList; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.SwingUtilities; + import magic.model.player.IPlayerProfileListener; import magic.model.player.PlayerProfile; import magic.model.player.PlayerProfiles; diff --git a/src/magic/ui/screen/duel/player/avatar/AvatarImageSet.java b/src/magic/ui/screen/duel/player/avatar/AvatarImageSet.java index 61ad9ee952..6d05d599f1 100644 --- a/src/magic/ui/screen/duel/player/avatar/AvatarImageSet.java +++ b/src/magic/ui/screen/duel/player/avatar/AvatarImageSet.java @@ -1,10 +1,5 @@ package magic.ui.screen.duel.player.avatar; -import magic.ui.MagicImages; -import magic.ui.theme.PlayerAvatar; - -import javax.swing.ImageIcon; - import java.awt.image.BufferedImage; import java.io.File; import java.io.FileInputStream; @@ -16,9 +11,14 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + +import javax.swing.ImageIcon; + import magic.data.MagicIcon; import magic.ui.ImageFileIO; +import magic.ui.MagicImages; import magic.ui.helpers.ImageHelper; +import magic.ui.theme.PlayerAvatar; class AvatarImageSet { diff --git a/src/magic/ui/screen/duel/player/avatar/AvatarImagesScreen.java b/src/magic/ui/screen/duel/player/avatar/AvatarImagesScreen.java index 14b37d7af7..c70314b318 100644 --- a/src/magic/ui/screen/duel/player/avatar/AvatarImagesScreen.java +++ b/src/magic/ui/screen/duel/player/avatar/AvatarImagesScreen.java @@ -2,17 +2,19 @@ package magic.ui.screen.duel.player.avatar; import java.awt.Graphics; import java.awt.image.BufferedImage; + import javax.swing.Icon; import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.SwingUtilities; -import magic.ui.helpers.UrlHelper; + +import magic.translate.MText; import magic.ui.ScreenController; +import magic.ui.helpers.ImageHelper; +import magic.ui.helpers.UrlHelper; +import magic.ui.screen.HeaderFooterScreen; import magic.ui.screen.interfaces.IAvatarImageConsumer; import magic.ui.screen.widget.PlainMenuButton; -import magic.ui.helpers.ImageHelper; -import magic.translate.MText; -import magic.ui.screen.HeaderFooterScreen; @SuppressWarnings("serial") public class AvatarImagesScreen extends HeaderFooterScreen { diff --git a/src/magic/ui/screen/duel/player/avatar/AvatarListCellRenderer.java b/src/magic/ui/screen/duel/player/avatar/AvatarListCellRenderer.java index 7c1ede1806..82a8a83d62 100644 --- a/src/magic/ui/screen/duel/player/avatar/AvatarListCellRenderer.java +++ b/src/magic/ui/screen/duel/player/avatar/AvatarListCellRenderer.java @@ -3,12 +3,14 @@ package magic.ui.screen.duel.player.avatar; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; import javax.swing.ListCellRenderer; import javax.swing.SwingConstants; + import magic.ui.FontsAndBorders; import magic.ui.utility.MagicStyle; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/duel/player/avatar/ContentPanel.java b/src/magic/ui/screen/duel/player/avatar/ContentPanel.java index 8f5a94b96f..7b40e0cbfc 100644 --- a/src/magic/ui/screen/duel/player/avatar/ContentPanel.java +++ b/src/magic/ui/screen/duel/player/avatar/ContentPanel.java @@ -12,6 +12,7 @@ import java.io.InputStream; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; + import javax.swing.BorderFactory; import javax.swing.ImageIcon; import javax.swing.JLabel; @@ -19,6 +20,7 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.ScrollPaneConstants; import javax.swing.border.Border; + import magic.ui.FontsAndBorders; import magic.ui.ImageFileIO; import magic.ui.MagicImages; diff --git a/src/magic/ui/screen/duel/player/avatar/ImageSetsPanel.java b/src/magic/ui/screen/duel/player/avatar/ImageSetsPanel.java index 6ef7ba6327..0042653bba 100644 --- a/src/magic/ui/screen/duel/player/avatar/ImageSetsPanel.java +++ b/src/magic/ui/screen/duel/player/avatar/ImageSetsPanel.java @@ -9,10 +9,12 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Comparator; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JList; import javax.swing.JScrollPane; import javax.swing.SwingUtilities; + import magic.ui.FontsAndBorders; import magic.ui.screen.interfaces.IThemeStyle; import magic.ui.theme.Theme; diff --git a/src/magic/ui/screen/duel/player/zone/CardZoneScreen.java b/src/magic/ui/screen/duel/player/zone/CardZoneScreen.java index d8151f3db5..0e3773375c 100644 --- a/src/magic/ui/screen/duel/player/zone/CardZoneScreen.java +++ b/src/magic/ui/screen/duel/player/zone/CardZoneScreen.java @@ -2,6 +2,7 @@ package magic.ui.screen.duel.player.zone; import java.awt.image.BufferedImage; import java.util.Collections; + import magic.model.MagicCardDefinition; import magic.model.MagicCardList; import magic.ui.MagicImages; diff --git a/src/magic/ui/screen/duel/player/zone/LibraryZoneScreen.java b/src/magic/ui/screen/duel/player/zone/LibraryZoneScreen.java index b1fa27b9d1..9ff9aa85fa 100644 --- a/src/magic/ui/screen/duel/player/zone/LibraryZoneScreen.java +++ b/src/magic/ui/screen/duel/player/zone/LibraryZoneScreen.java @@ -2,6 +2,7 @@ package magic.ui.screen.duel.player.zone; import java.awt.image.BufferedImage; import java.util.Collections; + import magic.model.MagicCardDefinition; import magic.model.MagicCardList; import magic.ui.MagicImages; diff --git a/src/magic/ui/screen/duel/setup/DuelPlayerDeckPanel.java b/src/magic/ui/screen/duel/setup/DuelPlayerDeckPanel.java index 7180aa0941..240a0ff884 100644 --- a/src/magic/ui/screen/duel/setup/DuelPlayerDeckPanel.java +++ b/src/magic/ui/screen/duel/setup/DuelPlayerDeckPanel.java @@ -5,9 +5,11 @@ import java.awt.Cursor; import java.awt.Font; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.SwingConstants; + import magic.data.DeckType; import magic.model.MagicColor; import magic.model.MagicDeckProfile; diff --git a/src/magic/ui/screen/duel/setup/DuelPlayerPanel.java b/src/magic/ui/screen/duel/setup/DuelPlayerPanel.java index a7c69c9af0..b779cb4cda 100644 --- a/src/magic/ui/screen/duel/setup/DuelPlayerPanel.java +++ b/src/magic/ui/screen/duel/setup/DuelPlayerPanel.java @@ -1,7 +1,9 @@ package magic.ui.screen.duel.setup; import java.awt.Color; + import javax.swing.BorderFactory; + import magic.model.player.PlayerProfile; import magic.ui.screen.interfaces.IThemeStyle; import magic.ui.theme.Theme; diff --git a/src/magic/ui/screen/duel/setup/PlayerProfilePanel.java b/src/magic/ui/screen/duel/setup/PlayerProfilePanel.java index 67239ea613..65ddf5651c 100644 --- a/src/magic/ui/screen/duel/setup/PlayerProfilePanel.java +++ b/src/magic/ui/screen/duel/setup/PlayerProfilePanel.java @@ -1,8 +1,10 @@ package magic.ui.screen.duel.setup; import java.awt.Dimension; + import javax.swing.JLabel; import javax.swing.JPanel; + import magic.model.player.PlayerProfile; import magic.ui.MagicImages; import magic.ui.widget.player.PlayerDetailsPanel; diff --git a/src/magic/ui/screen/duel/setup/PlayerStatsPanel.java b/src/magic/ui/screen/duel/setup/PlayerStatsPanel.java index 133ac4e251..c184287bb9 100644 --- a/src/magic/ui/screen/duel/setup/PlayerStatsPanel.java +++ b/src/magic/ui/screen/duel/setup/PlayerStatsPanel.java @@ -1,8 +1,10 @@ package magic.ui.screen.duel.setup; import java.awt.Color; + import javax.swing.JLabel; import javax.swing.JPanel; + import magic.model.player.PlayerStatistics; import magic.translate.MText; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/duel/setup/ScreenContentPanel.java b/src/magic/ui/screen/duel/setup/ScreenContentPanel.java index 1d2c6342ad..8a76da018d 100644 --- a/src/magic/ui/screen/duel/setup/ScreenContentPanel.java +++ b/src/magic/ui/screen/duel/setup/ScreenContentPanel.java @@ -5,7 +5,9 @@ import java.awt.event.MouseEvent; import java.nio.file.Path; import java.util.logging.Level; import java.util.logging.Logger; + import javax.swing.JPanel; + import magic.data.DeckType; import magic.data.DuelConfig; import magic.data.MagicFormat; diff --git a/src/magic/ui/screen/images/download/DialogMainPanel.java b/src/magic/ui/screen/images/download/DialogMainPanel.java index 97d4f78dd9..ba032b945f 100644 --- a/src/magic/ui/screen/images/download/DialogMainPanel.java +++ b/src/magic/ui/screen/images/download/DialogMainPanel.java @@ -6,11 +6,13 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.data.MagicIcon; import magic.translate.MText; import magic.ui.MagicImages; diff --git a/src/magic/ui/screen/images/download/DirectoryChooser.java b/src/magic/ui/screen/images/download/DirectoryChooser.java index ad8a704862..2de0887794 100644 --- a/src/magic/ui/screen/images/download/DirectoryChooser.java +++ b/src/magic/ui/screen/images/download/DirectoryChooser.java @@ -8,12 +8,14 @@ import java.awt.event.ActionEvent; import java.awt.event.MouseListener; import java.io.File; import java.nio.file.Path; + import javax.swing.AbstractAction; import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JPanel; import javax.swing.JTextField; + import magic.translate.MText; import magic.ui.FontsAndBorders; import magic.ui.ScreenController; diff --git a/src/magic/ui/screen/images/download/DownloadDialogPanel.java b/src/magic/ui/screen/images/download/DownloadDialogPanel.java index 539b418418..a46ab83356 100644 --- a/src/magic/ui/screen/images/download/DownloadDialogPanel.java +++ b/src/magic/ui/screen/images/download/DownloadDialogPanel.java @@ -5,10 +5,12 @@ import java.awt.Component; import java.awt.Dimension; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.translate.MText; import magic.ui.FontsAndBorders; import magic.ui.MagicImages; diff --git a/src/magic/ui/screen/images/download/DownloadImagesScreen.java b/src/magic/ui/screen/images/download/DownloadImagesScreen.java index ad0e8e8936..8489c81219 100644 --- a/src/magic/ui/screen/images/download/DownloadImagesScreen.java +++ b/src/magic/ui/screen/images/download/DownloadImagesScreen.java @@ -2,6 +2,7 @@ package magic.ui.screen.images.download; import javax.swing.JPanel; import javax.swing.ToolTipManager; + import magic.ui.screen.MScreen; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/images/download/DownloadPanel.java b/src/magic/ui/screen/images/download/DownloadPanel.java index 16c9c0e493..01f55448ad 100644 --- a/src/magic/ui/screen/images/download/DownloadPanel.java +++ b/src/magic/ui/screen/images/download/DownloadPanel.java @@ -7,6 +7,7 @@ import java.util.Date; import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Stream; + import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JLabel; @@ -15,6 +16,7 @@ import javax.swing.JProgressBar; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; + import magic.data.CardDefinitions; import magic.data.CardImageFile; import magic.data.DownloadableFile; diff --git a/src/magic/ui/screen/images/download/DownloadWorker.java b/src/magic/ui/screen/images/download/DownloadWorker.java index fc70d170c5..150045b01d 100644 --- a/src/magic/ui/screen/images/download/DownloadWorker.java +++ b/src/magic/ui/screen/images/download/DownloadWorker.java @@ -8,8 +8,10 @@ import java.time.LocalDateTime; import java.util.List; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; + import javax.swing.SwingUtilities; import javax.swing.SwingWorker; + import magic.data.CardImageFile; import magic.data.DownloadableFile; import magic.data.ImagesDownloadList; diff --git a/src/magic/ui/screen/images/download/ErrorPanel.java b/src/magic/ui/screen/images/download/ErrorPanel.java index 58e727fb7f..f52a4a9157 100644 --- a/src/magic/ui/screen/images/download/ErrorPanel.java +++ b/src/magic/ui/screen/images/download/ErrorPanel.java @@ -5,6 +5,7 @@ import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.StringSelection; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JPanel; @@ -12,9 +13,10 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; + import magic.translate.MText; -import magic.ui.ScreenController; import magic.ui.FontsAndBorders; +import magic.ui.ScreenController; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/images/download/HintPanel.java b/src/magic/ui/screen/images/download/HintPanel.java index 994cd3e96d..d0572e414a 100644 --- a/src/magic/ui/screen/images/download/HintPanel.java +++ b/src/magic/ui/screen/images/download/HintPanel.java @@ -7,10 +7,12 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.ui.MagicImages; import magic.ui.mwidgets.MWidget; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/images/download/IScanListener.java b/src/magic/ui/screen/images/download/IScanListener.java index 31046d5a1e..e0974bdec6 100644 --- a/src/magic/ui/screen/images/download/IScanListener.java +++ b/src/magic/ui/screen/images/download/IScanListener.java @@ -1,6 +1,7 @@ package magic.ui.screen.images.download; import java.util.stream.Stream; + import magic.data.ImagesDownloadList; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/screen/images/download/OptionsPanel.java b/src/magic/ui/screen/images/download/OptionsPanel.java index 271c1f40f5..b764388fff 100644 --- a/src/magic/ui/screen/images/download/OptionsPanel.java +++ b/src/magic/ui/screen/images/download/OptionsPanel.java @@ -4,12 +4,14 @@ import java.awt.Color; import java.awt.Component; import java.awt.Font; import java.awt.event.ItemEvent; + import javax.swing.DefaultComboBoxModel; import javax.swing.DefaultListCellRenderer; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.JPanel; + import magic.data.GeneralConfig; import magic.translate.MText; import magic.ui.CardTextLanguage; diff --git a/src/magic/ui/screen/images/download/PlayablePanel.java b/src/magic/ui/screen/images/download/PlayablePanel.java index 0e604dcd4d..a416db4eae 100644 --- a/src/magic/ui/screen/images/download/PlayablePanel.java +++ b/src/magic/ui/screen/images/download/PlayablePanel.java @@ -2,6 +2,7 @@ package magic.ui.screen.images.download; import java.util.Date; import java.util.stream.Stream; + import magic.data.CardDefinitions; import magic.data.GeneralConfig; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/screen/images/download/ScanWorker.java b/src/magic/ui/screen/images/download/ScanWorker.java index afbcf25625..1ef6462dc5 100644 --- a/src/magic/ui/screen/images/download/ScanWorker.java +++ b/src/magic/ui/screen/images/download/ScanWorker.java @@ -2,7 +2,9 @@ package magic.ui.screen.images.download; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; + import javax.swing.SwingWorker; + import magic.data.ImagesDownloadList; class ScanWorker extends SwingWorker { diff --git a/src/magic/ui/screen/images/download/UnimplementedPanel.java b/src/magic/ui/screen/images/download/UnimplementedPanel.java index f4e20d483b..d67534e585 100644 --- a/src/magic/ui/screen/images/download/UnimplementedPanel.java +++ b/src/magic/ui/screen/images/download/UnimplementedPanel.java @@ -2,6 +2,7 @@ package magic.ui.screen.images.download; import java.util.Date; import java.util.stream.Stream; + import magic.data.CardDefinitions; import magic.data.GeneralConfig; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/screen/interfaces/IDeckConsumer.java b/src/magic/ui/screen/interfaces/IDeckConsumer.java index 296cf4d1eb..c2e03985cd 100644 --- a/src/magic/ui/screen/interfaces/IDeckConsumer.java +++ b/src/magic/ui/screen/interfaces/IDeckConsumer.java @@ -1,6 +1,7 @@ package magic.ui.screen.interfaces; import java.nio.file.Path; + import magic.data.DeckType; import magic.model.MagicDeck; diff --git a/src/magic/ui/screen/keywords/ContentPanelA.java b/src/magic/ui/screen/keywords/ContentPanelA.java index d267217483..5f50b20958 100644 --- a/src/magic/ui/screen/keywords/ContentPanelA.java +++ b/src/magic/ui/screen/keywords/ContentPanelA.java @@ -1,6 +1,7 @@ package magic.ui.screen.keywords; import java.io.IOException; + import magic.ui.FontsAndBorders; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/keywords/ContentPanelB.java b/src/magic/ui/screen/keywords/ContentPanelB.java index c5a450d210..d74b12ed51 100644 --- a/src/magic/ui/screen/keywords/ContentPanelB.java +++ b/src/magic/ui/screen/keywords/ContentPanelB.java @@ -2,6 +2,7 @@ package magic.ui.screen.keywords; import java.awt.Color; import java.io.IOException; + import magic.ui.theme.Theme; import magic.ui.utility.MagicStyle; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/keywords/Keyword.java b/src/magic/ui/screen/keywords/Keyword.java index 6b31fec311..cbc86b01a3 100644 --- a/src/magic/ui/screen/keywords/Keyword.java +++ b/src/magic/ui/screen/keywords/Keyword.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; + import magic.data.CardDefinitions; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/screen/keywords/KeywordPanelA.java b/src/magic/ui/screen/keywords/KeywordPanelA.java index 6ce952bf37..049f99541e 100644 --- a/src/magic/ui/screen/keywords/KeywordPanelA.java +++ b/src/magic/ui/screen/keywords/KeywordPanelA.java @@ -1,11 +1,13 @@ package magic.ui.screen.keywords; import java.awt.Color; + import javax.swing.JLabel; import javax.swing.JPanel; + +import magic.ui.FontsAndBorders; import magic.ui.theme.Theme; import magic.ui.utility.MagicStyle; -import magic.ui.FontsAndBorders; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/keywords/KeywordPanelB.java b/src/magic/ui/screen/keywords/KeywordPanelB.java index ba890d4038..59e09622e3 100644 --- a/src/magic/ui/screen/keywords/KeywordPanelB.java +++ b/src/magic/ui/screen/keywords/KeywordPanelB.java @@ -3,10 +3,12 @@ package magic.ui.screen.keywords; import java.awt.Color; import java.awt.Font; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.awt.MagicFont; import magic.model.MagicCardDefinition; import magic.model.MagicRandom; diff --git a/src/magic/ui/screen/keywords/KeywordsHelper.java b/src/magic/ui/screen/keywords/KeywordsHelper.java index 3ecd78d34a..fc80620371 100644 --- a/src/magic/ui/screen/keywords/KeywordsHelper.java +++ b/src/magic/ui/screen/keywords/KeywordsHelper.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Scanner; + import magic.data.GeneralConfig; import magic.translate.MText; import magic.utility.MagicFileSystem; diff --git a/src/magic/ui/screen/keywords/KeywordsListCellRenderer.java b/src/magic/ui/screen/keywords/KeywordsListCellRenderer.java index 6a855c4d43..36b38cbd74 100644 --- a/src/magic/ui/screen/keywords/KeywordsListCellRenderer.java +++ b/src/magic/ui/screen/keywords/KeywordsListCellRenderer.java @@ -2,8 +2,10 @@ package magic.ui.screen.keywords; import java.awt.Color; import java.awt.Component; + import javax.swing.DefaultListCellRenderer; import javax.swing.JList; + import magic.ui.utility.MagicStyle; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/keywords/KeywordsListPane.java b/src/magic/ui/screen/keywords/KeywordsListPane.java index 176d26bba3..c7859307ff 100644 --- a/src/magic/ui/screen/keywords/KeywordsListPane.java +++ b/src/magic/ui/screen/keywords/KeywordsListPane.java @@ -2,6 +2,7 @@ package magic.ui.screen.keywords; import java.awt.Color; import java.io.IOException; + import javax.swing.JList; import javax.swing.JScrollPane; diff --git a/src/magic/ui/screen/keywords/KeywordsScreen.java b/src/magic/ui/screen/keywords/KeywordsScreen.java index e2edafb35d..04a0df84d6 100644 --- a/src/magic/ui/screen/keywords/KeywordsScreen.java +++ b/src/magic/ui/screen/keywords/KeywordsScreen.java @@ -1,6 +1,7 @@ package magic.ui.screen.keywords; import java.awt.event.KeyEvent; + import magic.data.GeneralConfig; import magic.data.settings.StringSetting; import magic.translate.MText; diff --git a/src/magic/ui/screen/keywords/KeywordsScrollPane.java b/src/magic/ui/screen/keywords/KeywordsScrollPane.java index 5f57b7b103..43df9db6d3 100644 --- a/src/magic/ui/screen/keywords/KeywordsScrollPane.java +++ b/src/magic/ui/screen/keywords/KeywordsScrollPane.java @@ -1,6 +1,7 @@ package magic.ui.screen.keywords; import java.io.IOException; + import javax.swing.JScrollPane; import javax.swing.ScrollPaneConstants; import javax.swing.SwingUtilities; diff --git a/src/magic/ui/screen/keywords/KeywordsScrollablePanel.java b/src/magic/ui/screen/keywords/KeywordsScrollablePanel.java index f108290180..bd01ec61ee 100644 --- a/src/magic/ui/screen/keywords/KeywordsScrollablePanel.java +++ b/src/magic/ui/screen/keywords/KeywordsScrollablePanel.java @@ -3,8 +3,10 @@ package magic.ui.screen.keywords; import java.awt.Dimension; import java.awt.Rectangle; import java.io.IOException; + import javax.swing.JPanel; import javax.swing.Scrollable; + import net.miginfocom.swing.MigLayout; /** diff --git a/src/magic/ui/screen/keywords/ScreenContentPanel.java b/src/magic/ui/screen/keywords/ScreenContentPanel.java index 2ebd262434..7412c348d5 100644 --- a/src/magic/ui/screen/keywords/ScreenContentPanel.java +++ b/src/magic/ui/screen/keywords/ScreenContentPanel.java @@ -1,6 +1,7 @@ package magic.ui.screen.keywords; import javax.swing.JLabel; + import magic.ui.widget.TexturedPanel; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/menu/CustomMenuButton.java b/src/magic/ui/screen/menu/CustomMenuButton.java index c482ab3557..a7f17a2eb6 100644 --- a/src/magic/ui/screen/menu/CustomMenuButton.java +++ b/src/magic/ui/screen/menu/CustomMenuButton.java @@ -1,7 +1,9 @@ package magic.ui.screen.menu; import java.awt.Font; + import javax.swing.AbstractAction; + import magic.awt.MagicFont; import magic.translate.MText; import magic.ui.FontsAndBorders; diff --git a/src/magic/ui/screen/menu/MenuButton.java b/src/magic/ui/screen/menu/MenuButton.java index ea4a523a38..3ee54defda 100644 --- a/src/magic/ui/screen/menu/MenuButton.java +++ b/src/magic/ui/screen/menu/MenuButton.java @@ -4,10 +4,12 @@ import java.awt.Color; import java.awt.Cursor; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; + import magic.ui.utility.MagicStyle; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/menu/MenuScreenContentPanel.java b/src/magic/ui/screen/menu/MenuScreenContentPanel.java index c35d5d1b2a..b335ddf539 100644 --- a/src/magic/ui/screen/menu/MenuScreenContentPanel.java +++ b/src/magic/ui/screen/menu/MenuScreenContentPanel.java @@ -1,8 +1,10 @@ package magic.ui.screen.menu; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JPanel; + import magic.ui.screen.widget.MenuPanel; import magic.ui.widget.KeysStripPanel; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/menu/NewMenuPanel.java b/src/magic/ui/screen/menu/NewMenuPanel.java index a5da2f3acd..eff873f340 100644 --- a/src/magic/ui/screen/menu/NewMenuPanel.java +++ b/src/magic/ui/screen/menu/NewMenuPanel.java @@ -5,8 +5,10 @@ import java.awt.Font; import java.awt.FontMetrics; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.JPanel; + import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/menu/NewMenuScreenContentPanel.java b/src/magic/ui/screen/menu/NewMenuScreenContentPanel.java index 08c9c92fbc..0604fa9ddd 100644 --- a/src/magic/ui/screen/menu/NewMenuScreenContentPanel.java +++ b/src/magic/ui/screen/menu/NewMenuScreenContentPanel.java @@ -2,7 +2,9 @@ package magic.ui.screen.menu; import java.awt.Color; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; + import magic.ui.FontsAndBorders; import magic.ui.screen.interfaces.IThemeStyle; import magic.ui.theme.Theme; diff --git a/src/magic/ui/screen/menu/dev/DeckDescriptionPreview.java b/src/magic/ui/screen/menu/dev/DeckDescriptionPreview.java index 5d42dc856d..019eaed242 100644 --- a/src/magic/ui/screen/menu/dev/DeckDescriptionPreview.java +++ b/src/magic/ui/screen/menu/dev/DeckDescriptionPreview.java @@ -7,10 +7,12 @@ import java.beans.PropertyChangeListener; import java.io.File; import java.io.IOException; import java.util.Scanner; + import javax.swing.JComponent; import javax.swing.JFileChooser; import javax.swing.JScrollPane; import javax.swing.JTextArea; + import magic.utility.FileIO; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/menu/dev/DevMenuContentPanel.java b/src/magic/ui/screen/menu/dev/DevMenuContentPanel.java index 514204fa52..fda8df07bd 100644 --- a/src/magic/ui/screen/menu/dev/DevMenuContentPanel.java +++ b/src/magic/ui/screen/menu/dev/DevMenuContentPanel.java @@ -2,15 +2,16 @@ package magic.ui.screen.menu.dev; import static java.nio.charset.StandardCharsets.UTF_8; -import java.awt.Desktop; import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.nio.file.Path; import java.util.Collections; import java.util.List; + import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; + import magic.data.CardDefinitions; import magic.data.GeneralConfig; import magic.data.MagicSetDefinitions; diff --git a/src/magic/ui/screen/menu/language/StartScreen.java b/src/magic/ui/screen/menu/language/StartScreen.java index 91b16b26cd..72d09738d1 100644 --- a/src/magic/ui/screen/menu/language/StartScreen.java +++ b/src/magic/ui/screen/menu/language/StartScreen.java @@ -3,9 +3,11 @@ package magic.ui.screen.menu.language; import java.awt.event.ActionEvent; import java.io.FileNotFoundException; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.translate.MText; import magic.ui.ScreenController; diff --git a/src/magic/ui/screen/menu/main/MainMenuScreen.java b/src/magic/ui/screen/menu/main/MainMenuScreen.java index 061cc081a8..5338b55ce3 100644 --- a/src/magic/ui/screen/menu/main/MainMenuScreen.java +++ b/src/magic/ui/screen/menu/main/MainMenuScreen.java @@ -3,6 +3,7 @@ package magic.ui.screen.menu.main; import java.awt.KeyEventDispatcher; import java.awt.KeyboardFocusManager; import java.awt.event.KeyEvent; + import magic.data.GeneralConfig; import magic.translate.MText; import magic.ui.ScreenController; diff --git a/src/magic/ui/screen/menu/migrate/ImportScreen.java b/src/magic/ui/screen/menu/migrate/ImportScreen.java index d1613696d3..824fa53d63 100644 --- a/src/magic/ui/screen/menu/migrate/ImportScreen.java +++ b/src/magic/ui/screen/menu/migrate/ImportScreen.java @@ -2,28 +2,30 @@ package magic.ui.screen.menu.migrate; import java.awt.Color; import java.awt.GradientPaint; -import java.awt.Graphics2D; import java.awt.Graphics; +import java.awt.Graphics2D; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; + import javax.swing.AbstractAction; import javax.swing.JFileChooser; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; + +import magic.translate.MText; +import magic.ui.FontsAndBorders; import magic.ui.ImportWorker; import magic.ui.MagarenaDirectoryChooser; import magic.ui.ScreenController; -import magic.translate.MText; -import magic.ui.screen.widget.PlainMenuButton; -import magic.ui.screen.widget.MenuPanel; -import magic.ui.theme.ThemeFactory; -import magic.ui.FontsAndBorders; import magic.ui.WikiPage; import magic.ui.screen.MScreen; +import magic.ui.screen.widget.MenuPanel; +import magic.ui.screen.widget.PlainMenuButton; +import magic.ui.theme.ThemeFactory; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/menu/settings/SettingsMenuContentPanel.java b/src/magic/ui/screen/menu/settings/SettingsMenuContentPanel.java index 58dffd05d8..d116a1f4c9 100644 --- a/src/magic/ui/screen/menu/settings/SettingsMenuContentPanel.java +++ b/src/magic/ui/screen/menu/settings/SettingsMenuContentPanel.java @@ -2,6 +2,7 @@ package magic.ui.screen.menu.settings; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.data.settings.StringSetting; import magic.translate.MText; diff --git a/src/magic/ui/screen/menu/wip/WipMenuContentPanel.java b/src/magic/ui/screen/menu/wip/WipMenuContentPanel.java index 3998598c0a..6352743ede 100644 --- a/src/magic/ui/screen/menu/wip/WipMenuContentPanel.java +++ b/src/magic/ui/screen/menu/wip/WipMenuContentPanel.java @@ -7,7 +7,9 @@ import java.util.Collections; import java.util.List; import java.util.Random; import java.util.stream.Collectors; + import javax.swing.BorderFactory; + import magic.data.CardDefinitions; import magic.model.IRenderableCard; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/screen/player/ScreenPanel.java b/src/magic/ui/screen/player/ScreenPanel.java index d640d99d89..2b08ce1ac0 100644 --- a/src/magic/ui/screen/player/ScreenPanel.java +++ b/src/magic/ui/screen/player/ScreenPanel.java @@ -4,7 +4,9 @@ import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.RenderingHints; + import javax.swing.JPanel; + import magic.ui.helpers.ImageHelper; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/readme/ReadmeScreen.java b/src/magic/ui/screen/readme/ReadmeScreen.java index 382004c0bd..15e4ab2573 100644 --- a/src/magic/ui/screen/readme/ReadmeScreen.java +++ b/src/magic/ui/screen/readme/ReadmeScreen.java @@ -1,8 +1,9 @@ package magic.ui.screen.readme; import java.nio.file.Paths; -import magic.ui.screen.HeaderFooterScreen; + import magic.ui.mwidgets.MTextFileViewer; +import magic.ui.screen.HeaderFooterScreen; @SuppressWarnings("serial") public class ReadmeScreen extends HeaderFooterScreen { diff --git a/src/magic/ui/screen/stats/DeckCellRenderer.java b/src/magic/ui/screen/stats/DeckCellRenderer.java index babb5c103f..9d9bcaaf3f 100644 --- a/src/magic/ui/screen/stats/DeckCellRenderer.java +++ b/src/magic/ui/screen/stats/DeckCellRenderer.java @@ -8,6 +8,7 @@ import java.awt.Point; import java.awt.font.TextAttribute; import java.util.HashMap; import java.util.Map; + import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.SwingUtilities; diff --git a/src/magic/ui/screen/stats/GameStatsJTable.java b/src/magic/ui/screen/stats/GameStatsJTable.java index 3551b070b4..e2dab9006c 100644 --- a/src/magic/ui/screen/stats/GameStatsJTable.java +++ b/src/magic/ui/screen/stats/GameStatsJTable.java @@ -5,6 +5,7 @@ import java.awt.Component; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; + import javax.swing.JComponent; import javax.swing.JTable; import javax.swing.ListSelectionModel; @@ -13,6 +14,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; import javax.swing.table.TableModel; + import magic.data.DeckType; import magic.model.player.PlayerProfiles; import magic.ui.MagicSound; diff --git a/src/magic/ui/screen/stats/GameStatsTableModel.java b/src/magic/ui/screen/stats/GameStatsTableModel.java index 70ba6983fb..c6d87da998 100644 --- a/src/magic/ui/screen/stats/GameStatsTableModel.java +++ b/src/magic/ui/screen/stats/GameStatsTableModel.java @@ -1,8 +1,10 @@ package magic.ui.screen.stats; -import magic.data.stats.GameStatsInfo; import java.util.List; + import javax.swing.table.AbstractTableModel; + +import magic.data.stats.GameStatsInfo; import magic.data.stats.MagicStats; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/stats/PaginationPanel.java b/src/magic/ui/screen/stats/PaginationPanel.java index 12892f19f5..ef432d5829 100644 --- a/src/magic/ui/screen/stats/PaginationPanel.java +++ b/src/magic/ui/screen/stats/PaginationPanel.java @@ -1,10 +1,12 @@ package magic.ui.screen.stats; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JPanel; + import magic.ui.helpers.MouseHelper; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/stats/PlayerCellRenderer.java b/src/magic/ui/screen/stats/PlayerCellRenderer.java index 89118da58a..8f1994d714 100644 --- a/src/magic/ui/screen/stats/PlayerCellRenderer.java +++ b/src/magic/ui/screen/stats/PlayerCellRenderer.java @@ -8,10 +8,12 @@ import java.awt.Point; import java.awt.font.TextAttribute; import java.util.HashMap; import java.util.Map; + import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.SwingUtilities; import javax.swing.table.DefaultTableCellRenderer; + import magic.model.player.PlayerProfile; import magic.model.player.PlayerProfiles; diff --git a/src/magic/ui/screen/stats/StartTimeCellRenderer.java b/src/magic/ui/screen/stats/StartTimeCellRenderer.java index d79bf7b102..52a169ba40 100644 --- a/src/magic/ui/screen/stats/StartTimeCellRenderer.java +++ b/src/magic/ui/screen/stats/StartTimeCellRenderer.java @@ -6,6 +6,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.format.FormatStyle; + import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.table.DefaultTableCellRenderer; diff --git a/src/magic/ui/screen/stats/StatsContentPanel.java b/src/magic/ui/screen/stats/StatsContentPanel.java index 5b1df134a7..05cdd3ab25 100644 --- a/src/magic/ui/screen/stats/StatsContentPanel.java +++ b/src/magic/ui/screen/stats/StatsContentPanel.java @@ -3,11 +3,13 @@ package magic.ui.screen.stats; import java.awt.Color; import java.awt.event.ActionEvent; import java.io.File; + import javax.swing.AbstractAction; import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.JSpinner; + import magic.data.stats.h2.H2Database; import magic.ui.FontsAndBorders; import magic.ui.mwidgets.MFileLink; diff --git a/src/magic/ui/screen/stats/StatsHeaderPanel.java b/src/magic/ui/screen/stats/StatsHeaderPanel.java index 5b83bdd1ec..01300cf548 100644 --- a/src/magic/ui/screen/stats/StatsHeaderPanel.java +++ b/src/magic/ui/screen/stats/StatsHeaderPanel.java @@ -3,9 +3,11 @@ package magic.ui.screen.stats; import java.awt.Color; import java.awt.Font; import java.text.NumberFormat; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.translate.MText; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/screen/stats/TableColumnAdjuster.java b/src/magic/ui/screen/stats/TableColumnAdjuster.java index 2a882d4008..3cc5832ed6 100644 --- a/src/magic/ui/screen/stats/TableColumnAdjuster.java +++ b/src/magic/ui/screen/stats/TableColumnAdjuster.java @@ -1,12 +1,23 @@ package magic.ui.screen.stats; -import java.awt.*; -import java.awt.event.*; -import java.beans.*; -import java.util.*; -import javax.swing.*; -import javax.swing.event.*; -import javax.swing.table.*; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.HashMap; +import java.util.Map; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.JTable; +import javax.swing.KeyStroke; +import javax.swing.SwingUtilities; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableColumn; +import javax.swing.table.TableColumnModel; +import javax.swing.table.TableModel; /* * Class to manage the widths of columns in a table. diff --git a/src/magic/ui/screen/stats/TestGameRunner.java b/src/magic/ui/screen/stats/TestGameRunner.java index 356889c907..92b10fb152 100644 --- a/src/magic/ui/screen/stats/TestGameRunner.java +++ b/src/magic/ui/screen/stats/TestGameRunner.java @@ -4,7 +4,9 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.logging.Level; import java.util.logging.Logger; + import javax.swing.SwingWorker; + import magic.ai.MagicAIImpl; import magic.data.DeckGenerators; import magic.data.DuelConfig; diff --git a/src/magic/ui/screen/test/TestContentPanel.java b/src/magic/ui/screen/test/TestContentPanel.java index 4c8ae54d1b..4b4ea994d1 100644 --- a/src/magic/ui/screen/test/TestContentPanel.java +++ b/src/magic/ui/screen/test/TestContentPanel.java @@ -4,7 +4,9 @@ import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.RenderingHints; + import javax.swing.JPanel; + import magic.ui.helpers.ImageHelper; @SuppressWarnings("serial") diff --git a/src/magic/ui/screen/widget/ActionBarButton.java b/src/magic/ui/screen/widget/ActionBarButton.java index a0f8cd02e5..16dd5ec8ca 100644 --- a/src/magic/ui/screen/widget/ActionBarButton.java +++ b/src/magic/ui/screen/widget/ActionBarButton.java @@ -2,9 +2,11 @@ package magic.ui.screen.widget; import java.awt.Point; import java.awt.event.MouseEvent; + import javax.swing.AbstractAction; import javax.swing.Icon; import javax.swing.ImageIcon; + import magic.ui.helpers.ImageHelper; import magic.ui.utility.MagicStyle; diff --git a/src/magic/ui/screen/widget/BigDialButton.java b/src/magic/ui/screen/widget/BigDialButton.java index b016d09d3c..7e8b901378 100644 --- a/src/magic/ui/screen/widget/BigDialButton.java +++ b/src/magic/ui/screen/widget/BigDialButton.java @@ -9,8 +9,10 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; + import javax.swing.ImageIcon; import javax.swing.SwingUtilities; + import magic.ui.MagicSound; import magic.ui.helpers.ImageHelper; import magic.ui.helpers.MouseHelper; diff --git a/src/magic/ui/screen/widget/DialButton.java b/src/magic/ui/screen/widget/DialButton.java index 7463ea53be..e9794ff3f1 100644 --- a/src/magic/ui/screen/widget/DialButton.java +++ b/src/magic/ui/screen/widget/DialButton.java @@ -5,9 +5,11 @@ import java.awt.RenderingHints; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; + import javax.swing.AbstractAction; import javax.swing.ImageIcon; import javax.swing.SwingUtilities; + import magic.data.MagicIcon; import magic.ui.MagicImages; import magic.ui.MagicSound; diff --git a/src/magic/ui/screen/widget/DuelSettingsPanel.java b/src/magic/ui/screen/widget/DuelSettingsPanel.java index a24ba0eb01..5e338d4693 100644 --- a/src/magic/ui/screen/widget/DuelSettingsPanel.java +++ b/src/magic/ui/screen/widget/DuelSettingsPanel.java @@ -4,9 +4,11 @@ import java.awt.Color; import java.awt.Font; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.SwingConstants; + import magic.data.DuelConfig; import magic.data.MagicFormat; import magic.data.MagicIcon; diff --git a/src/magic/ui/screen/widget/MenuPanel.java b/src/magic/ui/screen/widget/MenuPanel.java index 0a94589124..9006ee1633 100644 --- a/src/magic/ui/screen/widget/MenuPanel.java +++ b/src/magic/ui/screen/widget/MenuPanel.java @@ -4,8 +4,10 @@ import java.awt.Color; import java.awt.Dimension; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.BorderFactory; + import magic.ui.FontsAndBorders; import magic.ui.screen.interfaces.IThemeStyle; import magic.ui.theme.Theme; diff --git a/src/magic/ui/screen/widget/PlainMenuButton.java b/src/magic/ui/screen/widget/PlainMenuButton.java index 48885b6f09..035e201780 100644 --- a/src/magic/ui/screen/widget/PlainMenuButton.java +++ b/src/magic/ui/screen/widget/PlainMenuButton.java @@ -1,9 +1,11 @@ package magic.ui.screen.widget; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.Icon; import javax.swing.ImageIcon; + import magic.data.MagicIcon; import magic.translate.MText; import magic.ui.FontsAndBorders; diff --git a/src/magic/ui/screen/widget/SampleHandActionButton.java b/src/magic/ui/screen/widget/SampleHandActionButton.java index e0aa5349c9..48772da06a 100644 --- a/src/magic/ui/screen/widget/SampleHandActionButton.java +++ b/src/magic/ui/screen/widget/SampleHandActionButton.java @@ -1,7 +1,9 @@ package magic.ui.screen.widget; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; + import magic.data.MagicIcon; import magic.translate.MText; import magic.ui.IDeckProvider; diff --git a/src/magic/ui/screen/widget/ScreenFooterPanel.java b/src/magic/ui/screen/widget/ScreenFooterPanel.java index 99c9b2b717..dfd09355be 100644 --- a/src/magic/ui/screen/widget/ScreenFooterPanel.java +++ b/src/magic/ui/screen/widget/ScreenFooterPanel.java @@ -2,10 +2,12 @@ package magic.ui.screen.widget; import java.awt.Color; import java.awt.Dimension; + import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.data.MagicIcon; import magic.ui.MagicImages; import magic.ui.screen.interfaces.IThemeStyle; diff --git a/src/magic/ui/screen/widget/ScreenHeaderPanel.java b/src/magic/ui/screen/widget/ScreenHeaderPanel.java index 135721c776..231809a7f0 100644 --- a/src/magic/ui/screen/widget/ScreenHeaderPanel.java +++ b/src/magic/ui/screen/widget/ScreenHeaderPanel.java @@ -2,8 +2,10 @@ package magic.ui.screen.widget; import java.awt.Color; import java.awt.Dimension; + import javax.swing.JComponent; import javax.swing.JPanel; + import magic.ui.screen.interfaces.IThemeStyle; import magic.ui.theme.Theme; import magic.ui.utility.MagicStyle; diff --git a/src/magic/ui/screen/widget/ScreenSideBar.java b/src/magic/ui/screen/widget/ScreenSideBar.java index eb4962546c..3abef9eff9 100644 --- a/src/magic/ui/screen/widget/ScreenSideBar.java +++ b/src/magic/ui/screen/widget/ScreenSideBar.java @@ -2,7 +2,9 @@ package magic.ui.screen.widget; import java.awt.Color; import java.awt.Dimension; + import javax.swing.BorderFactory; + import magic.model.MagicCardDefinition; import magic.ui.mwidgets.MScrollPane; import magic.ui.widget.TexturedPanel; diff --git a/src/magic/ui/screen/widget/ToggleButtonsPanel.java b/src/magic/ui/screen/widget/ToggleButtonsPanel.java index 55a4b9ddfd..56f380cb59 100644 --- a/src/magic/ui/screen/widget/ToggleButtonsPanel.java +++ b/src/magic/ui/screen/widget/ToggleButtonsPanel.java @@ -3,9 +3,11 @@ package magic.ui.screen.widget; import java.awt.Color; import java.util.LinkedHashMap; import java.util.Map; + import javax.swing.AbstractAction; import javax.swing.ButtonGroup; import javax.swing.JToggleButton; + import magic.ui.screen.deck.editor.ViewToggleButton; import magic.ui.utility.MagicStyle; import magic.ui.widget.TexturedPanel; diff --git a/src/magic/ui/theme/AbilityIcon.java b/src/magic/ui/theme/AbilityIcon.java index 2d6a355dd7..6f81a09826 100644 --- a/src/magic/ui/theme/AbilityIcon.java +++ b/src/magic/ui/theme/AbilityIcon.java @@ -5,14 +5,16 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.swing.ImageIcon; + import magic.data.MagicIcon; import magic.model.MagicAbility; import magic.model.MagicCardDefinition; import magic.model.MagicObject; import magic.ui.MagicImages; -import magic.ui.widget.card.CardIcon; import magic.ui.utility.MagicStyle; +import magic.ui.widget.card.CardIcon; /** * Used to assign an ability with an icon which is displayed diff --git a/src/magic/ui/theme/AbstractTheme.java b/src/magic/ui/theme/AbstractTheme.java index 847124f367..b78556ae79 100644 --- a/src/magic/ui/theme/AbstractTheme.java +++ b/src/magic/ui/theme/AbstractTheme.java @@ -5,7 +5,9 @@ import java.awt.image.BufferedImage; import java.util.HashMap; import java.util.Locale; import java.util.Map; + import javax.swing.ImageIcon; + import magic.data.MagicIcon; import magic.ui.FontsAndBorders; import magic.ui.MagicImages; diff --git a/src/magic/ui/theme/CustomTheme.java b/src/magic/ui/theme/CustomTheme.java index 1bc4e2a3ad..e9a730b88e 100644 --- a/src/magic/ui/theme/CustomTheme.java +++ b/src/magic/ui/theme/CustomTheme.java @@ -12,7 +12,9 @@ import java.util.Map; import java.util.Properties; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; + import javax.swing.ImageIcon; + import magic.ui.ImageFileIO; import magic.ui.MagicImages; import magic.utility.FileIO; diff --git a/src/magic/ui/theme/PlayerAvatar.java b/src/magic/ui/theme/PlayerAvatar.java index 865b6532b0..6c5df877e2 100644 --- a/src/magic/ui/theme/PlayerAvatar.java +++ b/src/magic/ui/theme/PlayerAvatar.java @@ -1,7 +1,9 @@ package magic.ui.theme; import java.awt.image.BufferedImage; + import javax.swing.ImageIcon; + import magic.ui.helpers.ImageHelper; public class PlayerAvatar { diff --git a/src/magic/ui/theme/Theme.java b/src/magic/ui/theme/Theme.java index 1e10382c4a..da118c4909 100644 --- a/src/magic/ui/theme/Theme.java +++ b/src/magic/ui/theme/Theme.java @@ -3,6 +3,7 @@ package magic.ui.theme; import java.awt.Color; import java.awt.image.BufferedImage; + import javax.swing.ImageIcon; public interface Theme { diff --git a/src/magic/ui/theme/ThemeFactory.java b/src/magic/ui/theme/ThemeFactory.java index bf872d8ec0..801e1bc4b8 100644 --- a/src/magic/ui/theme/ThemeFactory.java +++ b/src/magic/ui/theme/ThemeFactory.java @@ -5,6 +5,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Locale; + import magic.data.GeneralConfig; import magic.data.settings.StringSetting; import magic.ui.MagicImages; diff --git a/src/magic/ui/utility/ImageDrawingUtils.java b/src/magic/ui/utility/ImageDrawingUtils.java index 988fd34dd2..ae8634d0bd 100644 --- a/src/magic/ui/utility/ImageDrawingUtils.java +++ b/src/magic/ui/utility/ImageDrawingUtils.java @@ -12,7 +12,9 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; + import javax.swing.ImageIcon; + import magic.data.MagicIcon; import magic.data.TextImages; import magic.model.MagicAbility; diff --git a/src/magic/ui/utility/MagicStyle.java b/src/magic/ui/utility/MagicStyle.java index 927a6a4ed0..f2366ba372 100644 --- a/src/magic/ui/utility/MagicStyle.java +++ b/src/magic/ui/utility/MagicStyle.java @@ -4,8 +4,10 @@ package magic.ui.utility; import java.awt.Color; import java.awt.Component; import java.awt.Cursor; + import javax.swing.BorderFactory; import javax.swing.JComponent; + import magic.data.GeneralConfig; import magic.data.settings.IntegerSetting; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/widget/ActionButtonTitleBar.java b/src/magic/ui/widget/ActionButtonTitleBar.java index 7c79943047..ad9185b747 100644 --- a/src/magic/ui/widget/ActionButtonTitleBar.java +++ b/src/magic/ui/widget/ActionButtonTitleBar.java @@ -2,8 +2,10 @@ package magic.ui.widget; import java.awt.Dimension; import java.util.List; + import javax.swing.JButton; import javax.swing.JPanel; + import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/ChoiceBorderPanelButton.java b/src/magic/ui/widget/ChoiceBorderPanelButton.java index 02b2af8539..2e524c2af8 100644 --- a/src/magic/ui/widget/ChoiceBorderPanelButton.java +++ b/src/magic/ui/widget/ChoiceBorderPanelButton.java @@ -5,13 +5,15 @@ import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Stroke; + +import org.pushingpixels.trident.Timeline; +import org.pushingpixels.trident.ease.Spline; + import magic.ui.theme.Theme; import magic.ui.theme.ThemeFactory; import magic.ui.utility.MagicStyle; import magic.ui.widget.duel.animation.AnimationFx; import magic.ui.widget.duel.animation.MagicAnimations; -import org.pushingpixels.trident.Timeline; -import org.pushingpixels.trident.ease.Spline; @SuppressWarnings("serial") public abstract class ChoiceBorderPanelButton extends ChoicePanelButton { diff --git a/src/magic/ui/widget/ChoiceOverlayPanelButton.java b/src/magic/ui/widget/ChoiceOverlayPanelButton.java index 26f219c0e0..ca9fa03b54 100644 --- a/src/magic/ui/widget/ChoiceOverlayPanelButton.java +++ b/src/magic/ui/widget/ChoiceOverlayPanelButton.java @@ -3,6 +3,7 @@ package magic.ui.widget; import java.awt.Color; import java.awt.Graphics; import java.awt.Graphics2D; + import magic.ui.theme.Theme; import magic.ui.theme.ThemeFactory; import magic.ui.utility.MagicStyle; diff --git a/src/magic/ui/widget/ChoicePanelButton.java b/src/magic/ui/widget/ChoicePanelButton.java index 21c5860d2c..903d1930d9 100644 --- a/src/magic/ui/widget/ChoicePanelButton.java +++ b/src/magic/ui/widget/ChoicePanelButton.java @@ -1,6 +1,7 @@ package magic.ui.widget; import javax.swing.JComponent; + import magic.ui.helpers.MouseHelper; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/ColorButton.java b/src/magic/ui/widget/ColorButton.java index 5670f4b016..4802274767 100644 --- a/src/magic/ui/widget/ColorButton.java +++ b/src/magic/ui/widget/ColorButton.java @@ -6,9 +6,11 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JColorChooser; + import magic.translate.MText; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/CostPanel.java b/src/magic/ui/widget/CostPanel.java index c1a736494c..1fa83ca208 100644 --- a/src/magic/ui/widget/CostPanel.java +++ b/src/magic/ui/widget/CostPanel.java @@ -1,15 +1,15 @@ package magic.ui.widget; -import magic.model.MagicManaCost; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.util.List; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SpringLayout; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.util.List; import magic.data.MagicIcon; +import magic.model.MagicManaCost; import magic.ui.MagicImages; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/ImagePanel.java b/src/magic/ui/widget/ImagePanel.java index fbcc66b253..831f8e3cbd 100644 --- a/src/magic/ui/widget/ImagePanel.java +++ b/src/magic/ui/widget/ImagePanel.java @@ -7,6 +7,7 @@ import java.awt.Graphics2D; import java.awt.RenderingHints; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; + import javax.swing.BorderFactory; import javax.swing.JPanel; diff --git a/src/magic/ui/widget/KeysStripPanel.java b/src/magic/ui/widget/KeysStripPanel.java index 3712952cb3..96e2fdaff6 100644 --- a/src/magic/ui/widget/KeysStripPanel.java +++ b/src/magic/ui/widget/KeysStripPanel.java @@ -2,8 +2,10 @@ package magic.ui.widget; import java.awt.Color; import java.awt.Dimension; + import javax.swing.JLabel; import javax.swing.JPanel; + import magic.translate.MText; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/widget/PanelButton.java b/src/magic/ui/widget/PanelButton.java index 2adf7a203f..dbb02d0c3e 100644 --- a/src/magic/ui/widget/PanelButton.java +++ b/src/magic/ui/widget/PanelButton.java @@ -2,9 +2,11 @@ package magic.ui.widget; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.ui.FontsAndBorders; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/widget/SliderPanel.java b/src/magic/ui/widget/SliderPanel.java index 23ecbc1d8d..014a6c8b85 100644 --- a/src/magic/ui/widget/SliderPanel.java +++ b/src/magic/ui/widget/SliderPanel.java @@ -6,11 +6,13 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JSlider; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; + import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/TabSelector.java b/src/magic/ui/widget/TabSelector.java index 5b0c251acf..13f578bc9e 100644 --- a/src/magic/ui/widget/TabSelector.java +++ b/src/magic/ui/widget/TabSelector.java @@ -7,11 +7,13 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.List; + import javax.swing.BoxLayout; import javax.swing.JPanel; import javax.swing.JToggleButton; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; + import magic.model.MagicPlayerZone; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/TextPrompt.java b/src/magic/ui/widget/TextPrompt.java index 28bc5dae7b..ba0b209228 100644 --- a/src/magic/ui/widget/TextPrompt.java +++ b/src/magic/ui/widget/TextPrompt.java @@ -1,11 +1,15 @@ package magic.ui.widget; -import java.awt.*; -import java.awt.event.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; -import javax.swing.*; -import javax.swing.event.*; -import javax.swing.text.*; +import javax.swing.JLabel; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import javax.swing.text.Document; +import javax.swing.text.JTextComponent; /** * The TextPrompt class will display a prompt over top of a text component when diff --git a/src/magic/ui/widget/TexturedPanel.java b/src/magic/ui/widget/TexturedPanel.java index 87738fd85f..67d18ab704 100644 --- a/src/magic/ui/widget/TexturedPanel.java +++ b/src/magic/ui/widget/TexturedPanel.java @@ -1,15 +1,15 @@ package magic.ui.widget; -import magic.ui.theme.Theme; -import magic.ui.theme.ThemeFactory; - -import javax.swing.JPanel; - import java.awt.Color; import java.awt.Graphics; import java.awt.Point; import java.awt.image.BufferedImage; +import javax.swing.JPanel; + +import magic.ui.theme.Theme; +import magic.ui.theme.ThemeFactory; + @SuppressWarnings("serial") public class TexturedPanel extends JPanel { diff --git a/src/magic/ui/widget/TitleBar.java b/src/magic/ui/widget/TitleBar.java index 408a5fffd2..a69f7dd6bb 100644 --- a/src/magic/ui/widget/TitleBar.java +++ b/src/magic/ui/widget/TitleBar.java @@ -1,9 +1,11 @@ package magic.ui.widget; import java.awt.Dimension; + import javax.swing.Icon; import javax.swing.JLabel; import javax.swing.JPanel; + import magic.ui.ScreenController; import magic.ui.theme.Theme; import magic.ui.utility.MagicStyle; diff --git a/src/magic/ui/widget/WrapLayout.java b/src/magic/ui/widget/WrapLayout.java index 89205b3cdf..97af267150 100644 --- a/src/magic/ui/widget/WrapLayout.java +++ b/src/magic/ui/widget/WrapLayout.java @@ -1,14 +1,14 @@ package magic.ui.widget; -import javax.swing.JScrollPane; -import javax.swing.SwingUtilities; - import java.awt.Component; import java.awt.Container; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Insets; +import javax.swing.JScrollPane; +import javax.swing.SwingUtilities; + /** * FlowLayout subclass that fully supports wrapping of components. */ diff --git a/src/magic/ui/widget/ZoneBackgroundLabel.java b/src/magic/ui/widget/ZoneBackgroundLabel.java index f69514193e..2e7101b32a 100644 --- a/src/magic/ui/widget/ZoneBackgroundLabel.java +++ b/src/magic/ui/widget/ZoneBackgroundLabel.java @@ -5,7 +5,9 @@ import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.image.BufferedImage; + import javax.swing.JLabel; + import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.ui.duel.resolution.ResolutionProfileResult; diff --git a/src/magic/ui/widget/about/AboutButton.java b/src/magic/ui/widget/about/AboutButton.java index 176359a0f4..cf86de6d0c 100644 --- a/src/magic/ui/widget/about/AboutButton.java +++ b/src/magic/ui/widget/about/AboutButton.java @@ -1,14 +1,16 @@ package magic.ui.widget.about; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.ImageIcon; import javax.swing.JButton; -import magic.translate.StringContext; + import magic.translate.MText; +import magic.translate.StringContext; import magic.ui.MagicImages; -import magic.ui.helpers.MouseHelper; import magic.ui.ScreenController; +import magic.ui.helpers.MouseHelper; import magic.ui.helpers.WidgetHelper; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/about/AboutPanel.java b/src/magic/ui/widget/about/AboutPanel.java index 528ea97a86..760ea9c783 100644 --- a/src/magic/ui/widget/about/AboutPanel.java +++ b/src/magic/ui/widget/about/AboutPanel.java @@ -1,6 +1,7 @@ package magic.ui.widget.about; import javax.swing.JPanel; + import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/about/ScreenLabel.java b/src/magic/ui/widget/about/ScreenLabel.java index fcbbb7a84a..c84788ccf3 100644 --- a/src/magic/ui/widget/about/ScreenLabel.java +++ b/src/magic/ui/widget/about/ScreenLabel.java @@ -1,7 +1,9 @@ package magic.ui.widget.about; import java.awt.Color; + import javax.swing.JLabel; + import magic.ui.FontsAndBorders; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/about/TitlePanel.java b/src/magic/ui/widget/about/TitlePanel.java index 4d04707903..520509223b 100644 --- a/src/magic/ui/widget/about/TitlePanel.java +++ b/src/magic/ui/widget/about/TitlePanel.java @@ -1,6 +1,7 @@ package magic.ui.widget.about; import javax.swing.JPanel; + import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/about/VersionLabel.java b/src/magic/ui/widget/about/VersionLabel.java index abff8edd49..fe1b92262d 100644 --- a/src/magic/ui/widget/about/VersionLabel.java +++ b/src/magic/ui/widget/about/VersionLabel.java @@ -1,7 +1,9 @@ package magic.ui.widget.about; import java.awt.Color; + import javax.swing.JLabel; + import magic.ui.FontsAndBorders; import magic.utility.MagicSystem; diff --git a/src/magic/ui/widget/alerter/AlertButton.java b/src/magic/ui/widget/alerter/AlertButton.java index a72adb5fec..c9f300aa41 100644 --- a/src/magic/ui/widget/alerter/AlertButton.java +++ b/src/magic/ui/widget/alerter/AlertButton.java @@ -5,9 +5,11 @@ import java.awt.Font; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.concurrent.ExecutionException; + import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.SwingWorker; + import magic.ui.MagicSound; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/alerter/AlertPanel.java b/src/magic/ui/widget/alerter/AlertPanel.java index 2b479dc1ea..757e07becc 100644 --- a/src/magic/ui/widget/alerter/AlertPanel.java +++ b/src/magic/ui/widget/alerter/AlertPanel.java @@ -2,7 +2,9 @@ package magic.ui.widget.alerter; import java.util.ArrayList; import java.util.List; + import javax.swing.JPanel; + import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/alerter/MissingImagesAlertButton.java b/src/magic/ui/widget/alerter/MissingImagesAlertButton.java index 6bf83a165a..5206553dd4 100644 --- a/src/magic/ui/widget/alerter/MissingImagesAlertButton.java +++ b/src/magic/ui/widget/alerter/MissingImagesAlertButton.java @@ -1,8 +1,10 @@ package magic.ui.widget.alerter; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.SwingUtilities; + import magic.data.CardDefinitions; import magic.data.GeneralConfig; import magic.translate.MText; diff --git a/src/magic/ui/widget/alerter/NewVersionAlertButton.java b/src/magic/ui/widget/alerter/NewVersionAlertButton.java index dd2c4cb79d..58e031bcfb 100644 --- a/src/magic/ui/widget/alerter/NewVersionAlertButton.java +++ b/src/magic/ui/widget/alerter/NewVersionAlertButton.java @@ -1,14 +1,16 @@ package magic.ui.widget.alerter; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; -import magic.ui.helpers.UrlHelper; import magic.data.json.NewVersionJsonParser; -import magic.ui.ScreenController; import magic.translate.MText; +import magic.ui.ScreenController; +import magic.ui.helpers.UrlHelper; @SuppressWarnings("serial") public class NewVersionAlertButton extends AlertButton { diff --git a/src/magic/ui/widget/alerter/UpgradeJavaAlertButton.java b/src/magic/ui/widget/alerter/UpgradeJavaAlertButton.java index f1edec1bc2..568e77e0ef 100644 --- a/src/magic/ui/widget/alerter/UpgradeJavaAlertButton.java +++ b/src/magic/ui/widget/alerter/UpgradeJavaAlertButton.java @@ -1,12 +1,14 @@ package magic.ui.widget.alerter; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; + import magic.data.json.NewVersionJsonParser; -import magic.ui.ScreenController; import magic.translate.MText; +import magic.ui.ScreenController; @SuppressWarnings("serial") public class UpgradeJavaAlertButton extends AlertButton { diff --git a/src/magic/ui/widget/button/LayoutButton.java b/src/magic/ui/widget/button/LayoutButton.java index 3b4a99de51..0996f70fba 100644 --- a/src/magic/ui/widget/button/LayoutButton.java +++ b/src/magic/ui/widget/button/LayoutButton.java @@ -1,7 +1,9 @@ package magic.ui.widget.button; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; + import magic.data.MagicIcon; import magic.ui.MagicImages; import magic.ui.screen.widget.ActionBarButton; diff --git a/src/magic/ui/widget/card/AnnotatedCardPanel.java b/src/magic/ui/widget/card/AnnotatedCardPanel.java index be4dff2677..2f5f0f4f0d 100644 --- a/src/magic/ui/widget/card/AnnotatedCardPanel.java +++ b/src/magic/ui/widget/card/AnnotatedCardPanel.java @@ -22,10 +22,15 @@ import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.List; + import javax.swing.ImageIcon; import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.Timer; + +import org.pushingpixels.trident.Timeline; +import org.pushingpixels.trident.ease.Spline; + import magic.data.GeneralConfig; import magic.model.MagicCardDefinition; import magic.model.MagicObject; @@ -41,8 +46,6 @@ import magic.ui.theme.AbilityIcon; import magic.ui.widget.duel.animation.AnimationFx; import magic.ui.widget.duel.animation.MagicAnimations; import magic.utility.MagicSystem; -import org.pushingpixels.trident.Timeline; -import org.pushingpixels.trident.ease.Spline; @SuppressWarnings("serial") public class AnnotatedCardPanel extends JPanel { diff --git a/src/magic/ui/widget/card/MagicInfoWindow.java b/src/magic/ui/widget/card/MagicInfoWindow.java index 1bb5d47ec4..043407e5ca 100644 --- a/src/magic/ui/widget/card/MagicInfoWindow.java +++ b/src/magic/ui/widget/card/MagicInfoWindow.java @@ -7,13 +7,16 @@ import java.awt.Font; import java.awt.FontMetrics; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JLabel; import javax.swing.JWindow; -import magic.ui.helpers.ImageHelper; -import net.miginfocom.swing.MigLayout; + import org.pushingpixels.trident.Timeline; import org.pushingpixels.trident.ease.Spline; +import magic.ui.helpers.ImageHelper; +import net.miginfocom.swing.MigLayout; + @SuppressWarnings("serial") public class MagicInfoWindow extends JWindow { diff --git a/src/magic/ui/widget/card/decks/CardDecksListCellRenderer.java b/src/magic/ui/widget/card/decks/CardDecksListCellRenderer.java index 6e9facdcfd..edfea9fc6f 100644 --- a/src/magic/ui/widget/card/decks/CardDecksListCellRenderer.java +++ b/src/magic/ui/widget/card/decks/CardDecksListCellRenderer.java @@ -2,8 +2,10 @@ package magic.ui.widget.card.decks; import java.awt.Component; import java.io.File; + import javax.swing.DefaultListCellRenderer; import javax.swing.JList; + import org.apache.commons.io.FilenameUtils; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/card/decks/CardDecksPanel.java b/src/magic/ui/widget/card/decks/CardDecksPanel.java index a3f215794e..f3352ed7a8 100644 --- a/src/magic/ui/widget/card/decks/CardDecksPanel.java +++ b/src/magic/ui/widget/card/decks/CardDecksPanel.java @@ -13,6 +13,7 @@ import java.util.Comparator; import java.util.List; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; + import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -20,6 +21,7 @@ import javax.swing.ScrollPaneConstants; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; import javax.swing.Timer; + import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.translate.MText; diff --git a/src/magic/ui/widget/card/filter/CardFilterPanel.java b/src/magic/ui/widget/card/filter/CardFilterPanel.java index b1af5c80b1..f2ea5aed89 100644 --- a/src/magic/ui/widget/card/filter/CardFilterPanel.java +++ b/src/magic/ui/widget/card/filter/CardFilterPanel.java @@ -8,8 +8,10 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; + import javax.swing.AbstractAction; import javax.swing.JButton; + import magic.data.CardDefinitions; import magic.model.MagicCardDefinition; import magic.translate.MText; diff --git a/src/magic/ui/widget/card/filter/CardFilterTextField.java b/src/magic/ui/widget/card/filter/CardFilterTextField.java index 780a5ca3fa..90964de9e9 100644 --- a/src/magic/ui/widget/card/filter/CardFilterTextField.java +++ b/src/magic/ui/widget/card/filter/CardFilterTextField.java @@ -6,14 +6,16 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; + import javax.swing.JTextField; import javax.swing.Timer; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; + import magic.translate.MText; -import magic.ui.widget.card.filter.button.FilterPanel; -import magic.ui.widget.*; +import magic.ui.widget.TextPrompt; import magic.ui.widget.TextPrompt.Show; +import magic.ui.widget.card.filter.button.FilterPanel; @SuppressWarnings("serial") public class CardFilterTextField extends JTextField diff --git a/src/magic/ui/widget/card/filter/CheckBoxFilterValuesPanel.java b/src/magic/ui/widget/card/filter/CheckBoxFilterValuesPanel.java index 54c2e0a266..f4434d57bf 100644 --- a/src/magic/ui/widget/card/filter/CheckBoxFilterValuesPanel.java +++ b/src/magic/ui/widget/card/filter/CheckBoxFilterValuesPanel.java @@ -3,8 +3,9 @@ package magic.ui.widget.card.filter; import java.awt.Color; import java.util.ArrayList; import java.util.List; -import magic.ui.widget.card.filter.button.FilterPanel; + import magic.ui.widget.TexturedPanel; +import magic.ui.widget.card.filter.button.FilterPanel; @SuppressWarnings("serial") abstract class CheckBoxFilterValuesPanel extends TexturedPanel diff --git a/src/magic/ui/widget/card/filter/CheckboxValuesPanel.java b/src/magic/ui/widget/card/filter/CheckboxValuesPanel.java index b0037133b3..784fbba397 100644 --- a/src/magic/ui/widget/card/filter/CheckboxValuesPanel.java +++ b/src/magic/ui/widget/card/filter/CheckboxValuesPanel.java @@ -1,6 +1,7 @@ package magic.ui.widget.card.filter; import java.awt.Component; + import magic.ui.helpers.MouseHelper; import magic.ui.widget.card.filter.button.FilterPanel; diff --git a/src/magic/ui/widget/card/filter/ColorCheckBoxPanel.java b/src/magic/ui/widget/card/filter/ColorCheckBoxPanel.java index 2f6f18ed22..ba6d66f5c0 100644 --- a/src/magic/ui/widget/card/filter/ColorCheckBoxPanel.java +++ b/src/magic/ui/widget/card/filter/ColorCheckBoxPanel.java @@ -2,8 +2,10 @@ package magic.ui.widget.card.filter; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JLabel; import javax.swing.JPanel; + import magic.model.MagicColor; import magic.ui.MagicImages; import magic.ui.helpers.MouseHelper; diff --git a/src/magic/ui/widget/card/filter/ColorValuesPanel.java b/src/magic/ui/widget/card/filter/ColorValuesPanel.java index 3daf0b1a33..dfc357debb 100644 --- a/src/magic/ui/widget/card/filter/ColorValuesPanel.java +++ b/src/magic/ui/widget/card/filter/ColorValuesPanel.java @@ -1,8 +1,8 @@ package magic.ui.widget.card.filter; import magic.model.MagicColor; -import magic.ui.widget.card.filter.button.FilterPanel; import magic.ui.FontsAndBorders; +import magic.ui.widget.card.filter.button.FilterPanel; @SuppressWarnings("serial") public class ColorValuesPanel extends CheckBoxFilterValuesPanel { diff --git a/src/magic/ui/widget/card/filter/FilterOptionButton.java b/src/magic/ui/widget/card/filter/FilterOptionButton.java index 35010db3ad..7d69015c2c 100644 --- a/src/magic/ui/widget/card/filter/FilterOptionButton.java +++ b/src/magic/ui/widget/card/filter/FilterOptionButton.java @@ -3,8 +3,10 @@ package magic.ui.widget.card.filter; import java.awt.Color; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JButton; import javax.swing.SwingUtilities; + import magic.ui.helpers.MouseHelper; import magic.ui.utility.MagicStyle; diff --git a/src/magic/ui/widget/card/filter/FilterOptionsPanel.java b/src/magic/ui/widget/card/filter/FilterOptionsPanel.java index 5b4ac27675..5841298f5c 100644 --- a/src/magic/ui/widget/card/filter/FilterOptionsPanel.java +++ b/src/magic/ui/widget/card/filter/FilterOptionsPanel.java @@ -1,7 +1,8 @@ package magic.ui.widget.card.filter; -import magic.ui.widget.card.filter.button.FilterPanel; import javax.swing.JPanel; + +import magic.ui.widget.card.filter.button.FilterPanel; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/card/filter/FilterResetButton.java b/src/magic/ui/widget/card/filter/FilterResetButton.java index 51ba6b6f30..6aa84ce4f2 100644 --- a/src/magic/ui/widget/card/filter/FilterResetButton.java +++ b/src/magic/ui/widget/card/filter/FilterResetButton.java @@ -1,13 +1,15 @@ package magic.ui.widget.card.filter; -import magic.ui.widget.card.filter.button.FilterPanel; import java.awt.Color; import java.awt.Font; import java.awt.event.ActionEvent; + import javax.swing.AbstractAction; import javax.swing.JButton; + import magic.translate.MText; import magic.ui.helpers.MouseHelper; +import magic.ui.widget.card.filter.button.FilterPanel; @SuppressWarnings("serial") class FilterResetButton extends JButton { diff --git a/src/magic/ui/widget/card/filter/ScrollableFilterPane.java b/src/magic/ui/widget/card/filter/ScrollableFilterPane.java index 3a0b116ee5..cc2fb8b7f3 100644 --- a/src/magic/ui/widget/card/filter/ScrollableFilterPane.java +++ b/src/magic/ui/widget/card/filter/ScrollableFilterPane.java @@ -2,9 +2,11 @@ package magic.ui.widget.card.filter; import java.awt.Component; import java.util.List; + import javax.swing.JScrollPane; -import magic.ui.widget.card.filter.button.FilterPanel; + import magic.ui.FontsAndBorders; +import magic.ui.widget.card.filter.button.FilterPanel; import net.miginfocom.swing.MigLayout; /** diff --git a/src/magic/ui/widget/card/filter/SearchOperand.java b/src/magic/ui/widget/card/filter/SearchOperand.java index 19abfa349c..bdb8422117 100644 --- a/src/magic/ui/widget/card/filter/SearchOperand.java +++ b/src/magic/ui/widget/card/filter/SearchOperand.java @@ -2,6 +2,7 @@ package magic.ui.widget.card.filter; import java.util.EnumSet; import java.util.Set; + import magic.translate.MText; public enum SearchOperand { diff --git a/src/magic/ui/widget/card/filter/SearchOperandCombo.java b/src/magic/ui/widget/card/filter/SearchOperandCombo.java index b98dd62788..3f5568ff78 100644 --- a/src/magic/ui/widget/card/filter/SearchOperandCombo.java +++ b/src/magic/ui/widget/card/filter/SearchOperandCombo.java @@ -1,13 +1,15 @@ package magic.ui.widget.card.filter; -import magic.ui.widget.card.filter.button.FilterPanel; import java.awt.event.ItemEvent; + import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; + import magic.ui.helpers.MouseHelper; +import magic.ui.widget.card.filter.button.FilterPanel; @SuppressWarnings("serial") class SearchOperandCombo extends JComboBox { diff --git a/src/magic/ui/widget/card/filter/button/CheckBoxFilterPanel.java b/src/magic/ui/widget/card/filter/button/CheckBoxFilterPanel.java index 764a9591a8..42e1845546 100644 --- a/src/magic/ui/widget/card/filter/button/CheckBoxFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/CheckBoxFilterPanel.java @@ -2,6 +2,7 @@ package magic.ui.widget.card.filter.button; import java.awt.LayoutManager; import java.util.List; + import magic.model.MagicCardDefinition; import magic.ui.widget.card.filter.IFilterListener; import magic.ui.widget.card.filter.dialog.CheckboxFilterDialog; diff --git a/src/magic/ui/widget/card/filter/button/ColorFilterPanel.java b/src/magic/ui/widget/card/filter/button/ColorFilterPanel.java index d21f5674ae..7fcb73aac2 100644 --- a/src/magic/ui/widget/card/filter/button/ColorFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/ColorFilterPanel.java @@ -3,6 +3,7 @@ package magic.ui.widget.card.filter.button; import java.awt.Dimension; import java.awt.LayoutManager; import java.util.List; + import magic.model.MagicCardDefinition; import magic.model.MagicColor; import magic.translate.MText; diff --git a/src/magic/ui/widget/card/filter/button/CostFilterPanel.java b/src/magic/ui/widget/card/filter/button/CostFilterPanel.java index f442c49ced..59da7528f2 100644 --- a/src/magic/ui/widget/card/filter/button/CostFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/CostFilterPanel.java @@ -2,6 +2,7 @@ package magic.ui.widget.card.filter.button; import java.awt.Dimension; import java.awt.LayoutManager; + import magic.model.MagicCardDefinition; import magic.model.MagicManaCost; import magic.translate.MText; diff --git a/src/magic/ui/widget/card/filter/button/FilterButton.java b/src/magic/ui/widget/card/filter/button/FilterButton.java index 1cbab55beb..469da9a6e9 100644 --- a/src/magic/ui/widget/card/filter/button/FilterButton.java +++ b/src/magic/ui/widget/card/filter/button/FilterButton.java @@ -2,10 +2,12 @@ package magic.ui.widget.card.filter.button; import java.awt.Dimension; import java.awt.Font; + import javax.swing.BorderFactory; import javax.swing.JButton; -import magic.ui.utility.MagicStyle; + import magic.ui.FontsAndBorders; +import magic.ui.utility.MagicStyle; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/card/filter/button/FilterPanel.java b/src/magic/ui/widget/card/filter/button/FilterPanel.java index 5499fe268c..c0c2f26970 100644 --- a/src/magic/ui/widget/card/filter/button/FilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/FilterPanel.java @@ -6,12 +6,14 @@ import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; + import javax.swing.AbstractAction; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JRootPane; import javax.swing.KeyStroke; import javax.swing.SwingUtilities; + import magic.model.MagicCardDefinition; import magic.ui.helpers.MouseHelper; import magic.ui.widget.card.filter.ClickPreventer; diff --git a/src/magic/ui/widget/card/filter/button/FormatFilterPanel.java b/src/magic/ui/widget/card/filter/button/FormatFilterPanel.java index 6246af5fe6..aeafa25ad9 100644 --- a/src/magic/ui/widget/card/filter/button/FormatFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/FormatFilterPanel.java @@ -1,6 +1,7 @@ package magic.ui.widget.card.filter.button; import java.util.stream.Collectors; + import magic.data.MagicFormat; import magic.data.MagicPredefinedFormat; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/widget/card/filter/button/RarityFilterPanel.java b/src/magic/ui/widget/card/filter/button/RarityFilterPanel.java index b95ff525a8..848d148eec 100644 --- a/src/magic/ui/widget/card/filter/button/RarityFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/RarityFilterPanel.java @@ -1,6 +1,7 @@ package magic.ui.widget.card.filter.button; import java.awt.Dimension; + import magic.model.MagicCardDefinition; import magic.model.MagicRarity; import magic.translate.MText; diff --git a/src/magic/ui/widget/card/filter/button/SearchFilterPanel.java b/src/magic/ui/widget/card/filter/button/SearchFilterPanel.java index 3ad2272a24..7166a4d931 100644 --- a/src/magic/ui/widget/card/filter/button/SearchFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/SearchFilterPanel.java @@ -1,6 +1,7 @@ package magic.ui.widget.card.filter.button; import java.awt.Dimension; + import magic.model.MagicCardDefinition; import magic.translate.MText; import magic.ui.widget.card.filter.CardFilterTextField; diff --git a/src/magic/ui/widget/card/filter/button/SetsFilterPanel.java b/src/magic/ui/widget/card/filter/button/SetsFilterPanel.java index 09e322dc11..09d6fcaddd 100644 --- a/src/magic/ui/widget/card/filter/button/SetsFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/SetsFilterPanel.java @@ -1,11 +1,12 @@ package magic.ui.widget.card.filter.button; import java.util.stream.Stream; + import magic.data.MagicSetDefinitions; import magic.data.MagicSets; import magic.model.MagicCardDefinition; -import magic.translate.StringContext; import magic.translate.MText; +import magic.translate.StringContext; import magic.ui.widget.card.filter.IFilterListener; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/card/filter/button/StatusFilterPanel.java b/src/magic/ui/widget/card/filter/button/StatusFilterPanel.java index ebb9a2fb41..89d649abbd 100644 --- a/src/magic/ui/widget/card/filter/button/StatusFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/StatusFilterPanel.java @@ -1,6 +1,7 @@ package magic.ui.widget.card.filter.button; import java.awt.Dimension; + import magic.data.CardDefinitions; import magic.model.MagicCardDefinition; import magic.translate.MText; diff --git a/src/magic/ui/widget/card/filter/button/SubTypeFilterPanel.java b/src/magic/ui/widget/card/filter/button/SubTypeFilterPanel.java index 62129c9ce8..1f2193f2ae 100644 --- a/src/magic/ui/widget/card/filter/button/SubTypeFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/SubTypeFilterPanel.java @@ -2,6 +2,7 @@ package magic.ui.widget.card.filter.button; import java.util.List; import java.util.stream.Collectors; + import magic.model.MagicCardDefinition; import magic.model.MagicSubType; import magic.translate.MText; diff --git a/src/magic/ui/widget/card/filter/button/TypeFilterPanel.java b/src/magic/ui/widget/card/filter/button/TypeFilterPanel.java index 53db66ab28..3879ee0566 100644 --- a/src/magic/ui/widget/card/filter/button/TypeFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/TypeFilterPanel.java @@ -2,10 +2,11 @@ package magic.ui.widget.card.filter.button; import java.util.List; import java.util.stream.Collectors; + import magic.model.MagicCardDefinition; import magic.model.MagicType; -import magic.translate.StringContext; import magic.translate.MText; +import magic.translate.StringContext; import magic.ui.widget.card.filter.IFilterListener; import magic.utility.MagicSystem; diff --git a/src/magic/ui/widget/card/filter/button/UnsupportedFilterPanel.java b/src/magic/ui/widget/card/filter/button/UnsupportedFilterPanel.java index c46ad518c1..92496becc4 100644 --- a/src/magic/ui/widget/card/filter/button/UnsupportedFilterPanel.java +++ b/src/magic/ui/widget/card/filter/button/UnsupportedFilterPanel.java @@ -1,6 +1,7 @@ package magic.ui.widget.card.filter.button; import java.awt.Dimension; + import magic.model.MagicCardDefinition; import magic.ui.widget.card.filter.IFilterListener; diff --git a/src/magic/ui/widget/card/filter/dialog/CheckboxFilterDialog.java b/src/magic/ui/widget/card/filter/dialog/CheckboxFilterDialog.java index 7bb9c1c68b..0b7a8bfec3 100644 --- a/src/magic/ui/widget/card/filter/dialog/CheckboxFilterDialog.java +++ b/src/magic/ui/widget/card/filter/dialog/CheckboxFilterDialog.java @@ -1,9 +1,9 @@ package magic.ui.widget.card.filter.dialog; -import magic.ui.widget.card.filter.button.CheckBoxFilterPanel; import magic.model.MagicCardDefinition; import magic.ui.widget.card.filter.FilterOptionsPanel; import magic.ui.widget.card.filter.ScrollableFilterPane; +import magic.ui.widget.card.filter.button.CheckBoxFilterPanel; @SuppressWarnings("serial") public class CheckboxFilterDialog extends MultiSelectFilterDialog { diff --git a/src/magic/ui/widget/card/filter/dialog/FilterDialog.java b/src/magic/ui/widget/card/filter/dialog/FilterDialog.java index 1c979368c7..f81d29b46e 100644 --- a/src/magic/ui/widget/card/filter/dialog/FilterDialog.java +++ b/src/magic/ui/widget/card/filter/dialog/FilterDialog.java @@ -1,9 +1,11 @@ package magic.ui.widget.card.filter.dialog; import java.awt.LayoutManager2; + import javax.swing.JDialog; -import magic.ui.ScreenController; + import magic.ui.FontsAndBorders; +import magic.ui.ScreenController; import magic.ui.widget.TexturedPanel; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/widget/card/filter/dialog/MultiSelectFilterDialog.java b/src/magic/ui/widget/card/filter/dialog/MultiSelectFilterDialog.java index d2e378d8b8..85074c5351 100644 --- a/src/magic/ui/widget/card/filter/dialog/MultiSelectFilterDialog.java +++ b/src/magic/ui/widget/card/filter/dialog/MultiSelectFilterDialog.java @@ -1,6 +1,7 @@ package magic.ui.widget.card.filter.dialog; import java.util.List; + import magic.model.MagicCardDefinition; import magic.ui.widget.card.filter.FilterOptionsPanel; import magic.ui.widget.card.filter.IMultiSelectFilter; diff --git a/src/magic/ui/widget/cards/canvas/CardCanvas.java b/src/magic/ui/widget/cards/canvas/CardCanvas.java index e7600b2162..26063ce759 100644 --- a/src/magic/ui/widget/cards/canvas/CardCanvas.java +++ b/src/magic/ui/widget/cards/canvas/CardCanvas.java @@ -4,6 +4,7 @@ import java.awt.Dimension; import java.awt.Point; import java.awt.Rectangle; import java.awt.image.BufferedImage; + import magic.model.IRenderableCard; import magic.model.MagicCardDefinition; import magic.ui.MagicImages; diff --git a/src/magic/ui/widget/cards/canvas/CardImageOverlay.java b/src/magic/ui/widget/cards/canvas/CardImageOverlay.java index 62f9fa37de..d562514d71 100644 --- a/src/magic/ui/widget/cards/canvas/CardImageOverlay.java +++ b/src/magic/ui/widget/cards/canvas/CardImageOverlay.java @@ -11,9 +11,11 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; import java.awt.image.BufferedImage; + import javax.swing.AbstractAction; import javax.swing.JPanel; import javax.swing.KeyStroke; + import magic.data.MagicSetDefinitions; import magic.data.MagicSets; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/widget/cards/canvas/CardsCanvas.java b/src/magic/ui/widget/cards/canvas/CardsCanvas.java index 50f6a7191a..600e86d065 100644 --- a/src/magic/ui/widget/cards/canvas/CardsCanvas.java +++ b/src/magic/ui/widget/cards/canvas/CardsCanvas.java @@ -20,7 +20,9 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; + import javax.swing.JPanel; + import magic.model.IRenderableCard; import magic.ui.dialog.prefs.ImageSizePresets; import magic.ui.helpers.ImageHelper; diff --git a/src/magic/ui/widget/cards/canvas/ImageHandler.java b/src/magic/ui/widget/cards/canvas/ImageHandler.java index cccd315461..5719dca5e5 100644 --- a/src/magic/ui/widget/cards/canvas/ImageHandler.java +++ b/src/magic/ui/widget/cards/canvas/ImageHandler.java @@ -1,7 +1,5 @@ package magic.ui.widget.cards.canvas; -import javax.imageio.ImageIO; - import java.awt.Color; import java.awt.Font; import java.awt.Graphics2D; @@ -11,6 +9,9 @@ import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; import java.io.IOException; import java.io.InputStream; + +import javax.imageio.ImageIO; + import magic.ui.helpers.ImageHelper; public class ImageHandler { diff --git a/src/magic/ui/widget/cards/table/BasicDeckTablePanel.java b/src/magic/ui/widget/cards/table/BasicDeckTablePanel.java index ec6ab3c8dc..1c89bc0d63 100644 --- a/src/magic/ui/widget/cards/table/BasicDeckTablePanel.java +++ b/src/magic/ui/widget/cards/table/BasicDeckTablePanel.java @@ -1,9 +1,11 @@ package magic.ui.widget.cards.table; import java.awt.Color; + import javax.swing.BorderFactory; import javax.swing.JTable; import javax.swing.event.ListSelectionListener; + import magic.model.MagicCardDefinition; import magic.ui.FontsAndBorders; import magic.ui.mwidgets.MScrollPane; diff --git a/src/magic/ui/widget/cards/table/CardTableModel.java b/src/magic/ui/widget/cards/table/CardTableModel.java index f14ed6396f..52db64ffd6 100644 --- a/src/magic/ui/widget/cards/table/CardTableModel.java +++ b/src/magic/ui/widget/cards/table/CardTableModel.java @@ -6,8 +6,10 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; + import javax.swing.event.TableModelListener; import javax.swing.table.AbstractTableModel; + import magic.model.MagicCardDefinition; import magic.model.MagicCondensedCardDefinition; import magic.model.MagicCondensedDeck; diff --git a/src/magic/ui/widget/cards/table/CardTablePanelA.java b/src/magic/ui/widget/cards/table/CardTablePanelA.java index 38c5c6fdd4..4cc3eb238f 100644 --- a/src/magic/ui/widget/cards/table/CardTablePanelA.java +++ b/src/magic/ui/widget/cards/table/CardTablePanelA.java @@ -5,10 +5,12 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; + import javax.swing.JTable; import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionListener; import javax.swing.event.TableModelEvent; + import magic.model.MagicCardDefinition; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/cards/table/CardTablePanelB.java b/src/magic/ui/widget/cards/table/CardTablePanelB.java index 2f4b1fb78b..531d64158d 100644 --- a/src/magic/ui/widget/cards/table/CardTablePanelB.java +++ b/src/magic/ui/widget/cards/table/CardTablePanelB.java @@ -6,10 +6,12 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.util.ArrayList; import java.util.List; + import javax.swing.ListSelectionModel; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.TableModelEvent; + import magic.model.MagicCardDefinition; import magic.model.MagicRandom; diff --git a/src/magic/ui/widget/cards/table/CardsJTable.java b/src/magic/ui/widget/cards/table/CardsJTable.java index 6476728bd0..7236ea54b0 100644 --- a/src/magic/ui/widget/cards/table/CardsJTable.java +++ b/src/magic/ui/widget/cards/table/CardsJTable.java @@ -5,6 +5,7 @@ import java.awt.Component; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.awt.event.MouseMotionListener; + import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JTable; @@ -17,6 +18,7 @@ import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; + import magic.model.MagicCardDefinition; import magic.model.MagicManaCost; import magic.ui.helpers.ColorHelper; diff --git a/src/magic/ui/widget/cards/table/CardsTablePanel.java b/src/magic/ui/widget/cards/table/CardsTablePanel.java index 31430634cb..95b5eb95bd 100644 --- a/src/magic/ui/widget/cards/table/CardsTablePanel.java +++ b/src/magic/ui/widget/cards/table/CardsTablePanel.java @@ -6,10 +6,12 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; + import javax.swing.JViewport; import javax.swing.event.TableModelEvent; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; + import magic.awt.MagicClipboard; import magic.data.GeneralConfig; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/widget/cards/table/CardsTableStyle.java b/src/magic/ui/widget/cards/table/CardsTableStyle.java index 41620bd8f2..81702f1c18 100644 --- a/src/magic/ui/widget/cards/table/CardsTableStyle.java +++ b/src/magic/ui/widget/cards/table/CardsTableStyle.java @@ -1,6 +1,7 @@ package magic.ui.widget.cards.table; import java.awt.Color; + import magic.ui.theme.Theme; import magic.ui.utility.MagicStyle; diff --git a/src/magic/ui/widget/cards/table/DeckTablePanel.java b/src/magic/ui/widget/cards/table/DeckTablePanel.java index 7c869fe2cf..994870e16a 100644 --- a/src/magic/ui/widget/cards/table/DeckTablePanel.java +++ b/src/magic/ui/widget/cards/table/DeckTablePanel.java @@ -5,11 +5,13 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; + import javax.swing.JTable; import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.TableModelEvent; + import magic.model.MagicCardDefinition; import magic.model.MagicDeck; diff --git a/src/magic/ui/widget/cards/table/DeckViewTablePanel.java b/src/magic/ui/widget/cards/table/DeckViewTablePanel.java index 69b74ddc1d..5e80404943 100644 --- a/src/magic/ui/widget/cards/table/DeckViewTablePanel.java +++ b/src/magic/ui/widget/cards/table/DeckViewTablePanel.java @@ -6,9 +6,11 @@ import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; import javax.swing.event.TableModelEvent; + import magic.model.MagicCardDefinition; import magic.model.MagicDeck; import magic.ui.screen.decks.ICardsTableListener; diff --git a/src/magic/ui/widget/deck/DeckDescriptionViewer.java b/src/magic/ui/widget/deck/DeckDescriptionViewer.java index 11dc9050f6..27625ebd6a 100644 --- a/src/magic/ui/widget/deck/DeckDescriptionViewer.java +++ b/src/magic/ui/widget/deck/DeckDescriptionViewer.java @@ -2,9 +2,11 @@ package magic.ui.widget.deck; import java.awt.Color; import java.awt.Dimension; + import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; + import magic.model.DuelPlayerConfig; import magic.model.MagicDeck; import magic.translate.MText; diff --git a/src/magic/ui/widget/deck/DeckFilesComboBox.java b/src/magic/ui/widget/deck/DeckFilesComboBox.java index cc8dc44d8b..73a0446314 100644 --- a/src/magic/ui/widget/deck/DeckFilesComboBox.java +++ b/src/magic/ui/widget/deck/DeckFilesComboBox.java @@ -6,8 +6,10 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; + import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; + import magic.utility.DeckUtils; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/deck/DeckInfoPanel.java b/src/magic/ui/widget/deck/DeckInfoPanel.java index 52a0999b76..f2897ccdd5 100644 --- a/src/magic/ui/widget/deck/DeckInfoPanel.java +++ b/src/magic/ui/widget/deck/DeckInfoPanel.java @@ -1,9 +1,9 @@ package magic.ui.widget.deck; -import magic.ui.widget.deck.stats.DeckStatisticsViewer; import magic.model.MagicDeck; import magic.ui.FontsAndBorders; import magic.ui.widget.TexturedPanel; +import magic.ui.widget.deck.stats.DeckStatisticsViewer; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/deck/DeckPicker.java b/src/magic/ui/widget/deck/DeckPicker.java index f580b64a33..8ea1be81f5 100644 --- a/src/magic/ui/widget/deck/DeckPicker.java +++ b/src/magic/ui/widget/deck/DeckPicker.java @@ -10,6 +10,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; @@ -22,6 +23,7 @@ import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; + import magic.data.DeckType; import magic.data.stats.MagicStats; import magic.exception.InvalidDeckException; diff --git a/src/magic/ui/widget/deck/DeckStatusPanel.java b/src/magic/ui/widget/deck/DeckStatusPanel.java index 235d46fefd..294174dff5 100644 --- a/src/magic/ui/widget/deck/DeckStatusPanel.java +++ b/src/magic/ui/widget/deck/DeckStatusPanel.java @@ -2,9 +2,11 @@ package magic.ui.widget.deck; import java.awt.Color; import java.awt.Font; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.model.MagicDeck; import magic.translate.MText; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/widget/deck/DecksListCellRenderer.java b/src/magic/ui/widget/deck/DecksListCellRenderer.java index be9e305529..2d654e76c1 100644 --- a/src/magic/ui/widget/deck/DecksListCellRenderer.java +++ b/src/magic/ui/widget/deck/DecksListCellRenderer.java @@ -4,10 +4,12 @@ import java.awt.Color; import java.awt.Component; import java.awt.Font; import java.awt.font.TextAttribute; -import java.util.Map; import java.util.HashMap; +import java.util.Map; + import javax.swing.DefaultListCellRenderer; import javax.swing.JList; + import magic.model.MagicDeck; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/deck/RandomDecksComboBox.java b/src/magic/ui/widget/deck/RandomDecksComboBox.java index 8a0f494198..8489dc2635 100644 --- a/src/magic/ui/widget/deck/RandomDecksComboBox.java +++ b/src/magic/ui/widget/deck/RandomDecksComboBox.java @@ -1,9 +1,10 @@ package magic.ui.widget.deck; -import magic.data.DeckGenerators; -import magic.ui.MagicImages; -import magic.model.MagicColor; -import magic.ui.FontsAndBorders; +import java.awt.Color; +import java.awt.Component; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.util.Vector; import javax.swing.DefaultComboBoxModel; import javax.swing.ImageIcon; @@ -13,13 +14,12 @@ import javax.swing.JList; import javax.swing.JPanel; import javax.swing.ListCellRenderer; -import java.awt.Color; -import java.awt.Component; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.util.Vector; +import magic.data.DeckGenerators; import magic.data.MagicIcon; +import magic.model.MagicColor; import magic.model.MagicDeckProfile; +import magic.ui.FontsAndBorders; +import magic.ui.MagicImages; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/deck/legality/CardsLegalityPanel.java b/src/magic/ui/widget/deck/legality/CardsLegalityPanel.java index 2da8b0d72d..3b78eb83d6 100644 --- a/src/magic/ui/widget/deck/legality/CardsLegalityPanel.java +++ b/src/magic/ui/widget/deck/legality/CardsLegalityPanel.java @@ -11,6 +11,7 @@ import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.Arrays; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JLabel; @@ -23,6 +24,7 @@ import javax.swing.event.ListSelectionListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; + import magic.data.MagicFormat; import magic.data.MagicIcon; import magic.model.MagicCardDefinition; @@ -31,8 +33,8 @@ import magic.translate.MText; import magic.translate.StringContext; import magic.ui.FontsAndBorders; import magic.ui.MagicImages; -import magic.ui.screen.decks.ICardsTableListener; import magic.ui.mwidgets.MScrollPane; +import magic.ui.screen.decks.ICardsTableListener; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/deck/legality/CardsLegalityTableModel.java b/src/magic/ui/widget/deck/legality/CardsLegalityTableModel.java index 7d6c9ca9f4..46d2d32db2 100644 --- a/src/magic/ui/widget/deck/legality/CardsLegalityTableModel.java +++ b/src/magic/ui/widget/deck/legality/CardsLegalityTableModel.java @@ -3,8 +3,10 @@ package magic.ui.widget.deck.legality; import java.util.ArrayList; import java.util.Comparator; import java.util.List; + import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; + import magic.data.CardLegality; import magic.data.MagicFormat; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/widget/deck/legality/FormatsLegalityPanel.java b/src/magic/ui/widget/deck/legality/FormatsLegalityPanel.java index 5ef0735e9e..597b67eb26 100644 --- a/src/magic/ui/widget/deck/legality/FormatsLegalityPanel.java +++ b/src/magic/ui/widget/deck/legality/FormatsLegalityPanel.java @@ -6,6 +6,7 @@ import java.awt.Dimension; import java.awt.Font; import java.util.ArrayList; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.DefaultListCellRenderer; import javax.swing.ImageIcon; @@ -14,12 +15,13 @@ import javax.swing.JList; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.event.ListSelectionListener; + import magic.data.MagicFormat; -import magic.data.MagicPredefinedFormat; import magic.data.MagicIcon; +import magic.data.MagicPredefinedFormat; import magic.model.MagicDeck; -import magic.ui.MagicImages; import magic.translate.MText; +import magic.ui.MagicImages; import magic.ui.mwidgets.MScrollPane; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/widget/deck/legality/LegalityPanel.java b/src/magic/ui/widget/deck/legality/LegalityPanel.java index d3b929bfc6..1eec8ae80c 100644 --- a/src/magic/ui/widget/deck/legality/LegalityPanel.java +++ b/src/magic/ui/widget/deck/legality/LegalityPanel.java @@ -4,9 +4,11 @@ import java.awt.Color; import java.awt.Dimension; import java.util.ArrayList; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; + import magic.data.MagicIcon; import magic.model.MagicCardDefinition; import magic.model.MagicDeck; diff --git a/src/magic/ui/widget/deck/stats/CardColorStatsPanel.java b/src/magic/ui/widget/deck/stats/CardColorStatsPanel.java index 4bd5a5c0a4..1b6da2aa17 100644 --- a/src/magic/ui/widget/deck/stats/CardColorStatsPanel.java +++ b/src/magic/ui/widget/deck/stats/CardColorStatsPanel.java @@ -4,9 +4,11 @@ import java.awt.Color; import java.awt.Font; import java.util.ArrayList; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; + import magic.data.CardStatistics; import magic.model.MagicColor; import magic.translate.MText; diff --git a/src/magic/ui/widget/deck/stats/CardTypeStatsPanel.java b/src/magic/ui/widget/deck/stats/CardTypeStatsPanel.java index 8adf0bd5a7..899c5beb13 100644 --- a/src/magic/ui/widget/deck/stats/CardTypeStatsPanel.java +++ b/src/magic/ui/widget/deck/stats/CardTypeStatsPanel.java @@ -1,14 +1,16 @@ package magic.ui.widget.deck.stats; import java.awt.Color; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.data.CardStatistics; import magic.translate.MText; -import magic.ui.MagicImages; import magic.ui.FontsAndBorders; +import magic.ui.MagicImages; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/deck/stats/DeckStatisticsViewer.java b/src/magic/ui/widget/deck/stats/DeckStatisticsViewer.java index ed924c9397..097c461c2c 100644 --- a/src/magic/ui/widget/deck/stats/DeckStatisticsViewer.java +++ b/src/magic/ui/widget/deck/stats/DeckStatisticsViewer.java @@ -3,6 +3,7 @@ package magic.ui.widget.deck.stats; import java.awt.event.ActionEvent; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -11,6 +12,7 @@ import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; + import magic.data.CardStatistics; import magic.data.MagicIcon; import magic.model.DuelPlayerConfig; diff --git a/src/magic/ui/widget/deck/stats/ManaCurvePanel.java b/src/magic/ui/widget/deck/stats/ManaCurvePanel.java index 55e843d449..e3bc51fe75 100644 --- a/src/magic/ui/widget/deck/stats/ManaCurvePanel.java +++ b/src/magic/ui/widget/deck/stats/ManaCurvePanel.java @@ -1,9 +1,11 @@ package magic.ui.widget.deck.stats; import java.awt.Color; + import javax.swing.BorderFactory; import javax.swing.JLabel; import javax.swing.JPanel; + import magic.data.CardStatistics; import magic.data.MagicIcon; import magic.ui.MagicImages; diff --git a/src/magic/ui/widget/deck/stats/ManaCurveUnitPanel.java b/src/magic/ui/widget/deck/stats/ManaCurveUnitPanel.java index 1e3beaadc8..67ad906ffe 100644 --- a/src/magic/ui/widget/deck/stats/ManaCurveUnitPanel.java +++ b/src/magic/ui/widget/deck/stats/ManaCurveUnitPanel.java @@ -4,8 +4,10 @@ import java.awt.Color; import java.awt.GradientPaint; import java.awt.Graphics; import java.awt.Graphics2D; + import javax.swing.JLabel; import javax.swing.JPanel; + import magic.data.MagicIcon; import magic.ui.MagicImages; import magic.ui.helpers.ColorHelper; diff --git a/src/magic/ui/widget/deck/stats/PwlWorker.java b/src/magic/ui/widget/deck/stats/PwlWorker.java index 1661082b56..0e2838e33e 100644 --- a/src/magic/ui/widget/deck/stats/PwlWorker.java +++ b/src/magic/ui/widget/deck/stats/PwlWorker.java @@ -6,8 +6,10 @@ import java.util.List; import java.util.concurrent.CancellationException; import java.util.logging.Level; import java.util.logging.Logger; + import javax.swing.SwingUtilities; import javax.swing.SwingWorker; + import magic.data.stats.MagicStats; import magic.model.MagicDeck; diff --git a/src/magic/ui/widget/deck/stats/StatsTable.java b/src/magic/ui/widget/deck/stats/StatsTable.java index ffefb1b3c4..9e5d7913c3 100644 --- a/src/magic/ui/widget/deck/stats/StatsTable.java +++ b/src/magic/ui/widget/deck/stats/StatsTable.java @@ -4,9 +4,11 @@ import java.awt.Color; import java.awt.Image; import java.util.HashMap; import java.util.Map; + import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; + import magic.data.CardStatistics; import magic.data.MagicIcon; import magic.model.MagicColor; diff --git a/src/magic/ui/widget/duel/DuelDialogPanel.java b/src/magic/ui/widget/duel/DuelDialogPanel.java index 9c23f0b892..af99fa6525 100644 --- a/src/magic/ui/widget/duel/DuelDialogPanel.java +++ b/src/magic/ui/widget/duel/DuelDialogPanel.java @@ -2,6 +2,7 @@ package magic.ui.widget.duel; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import magic.ui.FontsAndBorders; import magic.ui.duel.viewerinfo.GameViewerInfo; import magic.ui.widget.TexturedPanel; diff --git a/src/magic/ui/widget/duel/EndGameMessagePanel.java b/src/magic/ui/widget/duel/EndGameMessagePanel.java index 0707721707..d38f567dd0 100644 --- a/src/magic/ui/widget/duel/EndGameMessagePanel.java +++ b/src/magic/ui/widget/duel/EndGameMessagePanel.java @@ -1,10 +1,12 @@ package magic.ui.widget.duel; import java.awt.Dimension; + import javax.swing.BorderFactory; import javax.swing.Icon; import javax.swing.JLabel; import javax.swing.SwingConstants; + import magic.translate.MText; import magic.ui.FontsAndBorders; import magic.ui.duel.viewerinfo.GameViewerInfo; diff --git a/src/magic/ui/widget/duel/animation/AnimationPanel.java b/src/magic/ui/widget/duel/animation/AnimationPanel.java index c244dd7343..310e62e4a8 100644 --- a/src/magic/ui/widget/duel/animation/AnimationPanel.java +++ b/src/magic/ui/widget/duel/animation/AnimationPanel.java @@ -6,8 +6,10 @@ import java.awt.event.ComponentEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.ui.helpers.KeyEventAction; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/animation/CardAnimation.java b/src/magic/ui/widget/duel/animation/CardAnimation.java index fec742e67c..db9157a23d 100644 --- a/src/magic/ui/widget/duel/animation/CardAnimation.java +++ b/src/magic/ui/widget/duel/animation/CardAnimation.java @@ -6,17 +6,20 @@ import java.awt.Graphics; import java.awt.Image; import java.awt.Point; import java.awt.Rectangle; + import javax.swing.SwingUtilities; -import magic.data.GeneralConfig; -import magic.ui.MagicImages; -import magic.ui.duel.viewerinfo.CardViewerInfo; -import magic.ui.duel.viewerinfo.PlayerViewerInfo; + import org.pushingpixels.trident.Timeline; import org.pushingpixels.trident.Timeline.TimelineState; import org.pushingpixels.trident.TimelineScenario; import org.pushingpixels.trident.callback.TimelineCallbackAdapter; import org.pushingpixels.trident.ease.Spline; +import magic.data.GeneralConfig; +import magic.ui.MagicImages; +import magic.ui.duel.viewerinfo.CardViewerInfo; +import magic.ui.duel.viewerinfo.PlayerViewerInfo; + abstract class CardAnimation extends MagicAnimation { protected static final int GROW_DURATION = 800; // milliseconds diff --git a/src/magic/ui/widget/duel/animation/DrawCardAnimation.java b/src/magic/ui/widget/duel/animation/DrawCardAnimation.java index f60a05b395..8ce2eaac11 100644 --- a/src/magic/ui/widget/duel/animation/DrawCardAnimation.java +++ b/src/magic/ui/widget/duel/animation/DrawCardAnimation.java @@ -1,6 +1,7 @@ package magic.ui.widget.duel.animation; import java.awt.Rectangle; + import magic.ui.duel.viewerinfo.CardViewerInfo; import magic.ui.duel.viewerinfo.PlayerViewerInfo; diff --git a/src/magic/ui/widget/duel/animation/ImageScaler.java b/src/magic/ui/widget/duel/animation/ImageScaler.java index 149ba75ab6..8e26e8984a 100644 --- a/src/magic/ui/widget/duel/animation/ImageScaler.java +++ b/src/magic/ui/widget/duel/animation/ImageScaler.java @@ -4,6 +4,7 @@ import java.awt.Dimension; import java.awt.Image; import java.awt.RenderingHints; import java.awt.image.BufferedImage; + import magic.ui.helpers.ImageHelper; class ImageScaler { diff --git a/src/magic/ui/widget/duel/animation/MagicAnimation.java b/src/magic/ui/widget/duel/animation/MagicAnimation.java index 3d22de856f..aa3b07cf26 100644 --- a/src/magic/ui/widget/duel/animation/MagicAnimation.java +++ b/src/magic/ui/widget/duel/animation/MagicAnimation.java @@ -2,6 +2,7 @@ package magic.ui.widget.duel.animation; import java.awt.Graphics; import java.util.concurrent.atomic.AtomicBoolean; + import javax.swing.JComponent; public abstract class MagicAnimation { diff --git a/src/magic/ui/widget/duel/animation/MagicAnimations.java b/src/magic/ui/widget/duel/animation/MagicAnimations.java index 35681b284b..fb041990ef 100644 --- a/src/magic/ui/widget/duel/animation/MagicAnimations.java +++ b/src/magic/ui/widget/duel/animation/MagicAnimations.java @@ -3,7 +3,9 @@ package magic.ui.widget.duel.animation; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; + import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.model.MagicCard; diff --git a/src/magic/ui/widget/duel/animation/PlayCardAnimation.java b/src/magic/ui/widget/duel/animation/PlayCardAnimation.java index 4525e88e3e..ddba50d934 100644 --- a/src/magic/ui/widget/duel/animation/PlayCardAnimation.java +++ b/src/magic/ui/widget/duel/animation/PlayCardAnimation.java @@ -1,6 +1,7 @@ package magic.ui.widget.duel.animation; import java.awt.Rectangle; + import magic.ui.duel.viewerinfo.CardViewerInfo; import magic.ui.duel.viewerinfo.PlayerViewerInfo; diff --git a/src/magic/ui/widget/duel/choice/ColorChoicePanel.java b/src/magic/ui/widget/duel/choice/ColorChoicePanel.java index a827686dfe..3d0b576b2f 100644 --- a/src/magic/ui/widget/duel/choice/ColorChoicePanel.java +++ b/src/magic/ui/widget/duel/choice/ColorChoicePanel.java @@ -5,15 +5,17 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; + import javax.swing.JButton; import javax.swing.JPanel; + import magic.model.MagicColor; import magic.model.MagicSource; +import magic.translate.MText; +import magic.ui.FontsAndBorders; import magic.ui.MagicImages; import magic.ui.screen.duel.game.SwingGameController; -import magic.translate.MText; import magic.ui.widget.duel.viewer.UserActionPanel; -import magic.ui.FontsAndBorders; import magic.ui.widget.message.TextLabel; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/choice/ManaCostXChoicePanel.java b/src/magic/ui/widget/duel/choice/ManaCostXChoicePanel.java index 8177b3acd1..fcfe66a938 100644 --- a/src/magic/ui/widget/duel/choice/ManaCostXChoicePanel.java +++ b/src/magic/ui/widget/duel/choice/ManaCostXChoicePanel.java @@ -5,15 +5,17 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; + import javax.swing.JButton; import javax.swing.JPanel; + import magic.data.MagicIcon; import magic.model.MagicSource; +import magic.translate.MText; +import magic.ui.FontsAndBorders; import magic.ui.MagicImages; import magic.ui.screen.duel.game.SwingGameController; -import magic.translate.MText; import magic.ui.widget.duel.viewer.UserActionPanel; -import magic.ui.FontsAndBorders; import magic.ui.widget.message.TextLabel; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/choice/MayChoicePanel.java b/src/magic/ui/widget/duel/choice/MayChoicePanel.java index fa6ffb02a5..f6ef3f8c4d 100644 --- a/src/magic/ui/widget/duel/choice/MayChoicePanel.java +++ b/src/magic/ui/widget/duel/choice/MayChoicePanel.java @@ -5,17 +5,19 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; + import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JPanel; import javax.swing.KeyStroke; + import magic.data.MagicIcon; import magic.model.MagicSource; +import magic.translate.MText; +import magic.ui.FontsAndBorders; import magic.ui.MagicImages; import magic.ui.screen.duel.game.SwingGameController; -import magic.translate.MText; import magic.ui.widget.duel.viewer.UserActionPanel; -import magic.ui.FontsAndBorders; import magic.ui.widget.message.TextLabel; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/choice/ModeChoicePanel.java b/src/magic/ui/widget/duel/choice/ModeChoicePanel.java index a357ee74ef..c8221a6f95 100644 --- a/src/magic/ui/widget/duel/choice/ModeChoicePanel.java +++ b/src/magic/ui/widget/duel/choice/ModeChoicePanel.java @@ -6,14 +6,16 @@ import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JPanel; + import magic.model.MagicSource; -import magic.ui.screen.duel.game.SwingGameController; import magic.translate.MText; -import magic.ui.widget.duel.viewer.UserActionPanel; import magic.ui.FontsAndBorders; +import magic.ui.screen.duel.game.SwingGameController; +import magic.ui.widget.duel.viewer.UserActionPanel; import magic.ui.widget.message.TextLabel; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/choice/MulliganChoicePanel.java b/src/magic/ui/widget/duel/choice/MulliganChoicePanel.java index 80d105e355..f3ca5b7feb 100644 --- a/src/magic/ui/widget/duel/choice/MulliganChoicePanel.java +++ b/src/magic/ui/widget/duel/choice/MulliganChoicePanel.java @@ -1,11 +1,11 @@ package magic.ui.widget.duel.choice; -import magic.model.MagicCardList; -import magic.model.MagicSource; +import java.util.Collections; import javax.swing.SwingUtilities; -import java.util.Collections; +import magic.model.MagicCardList; +import magic.model.MagicSource; import magic.ui.ScreenController; import magic.ui.screen.duel.game.SwingGameController; diff --git a/src/magic/ui/widget/duel/choice/MultiKickerChoicePanel.java b/src/magic/ui/widget/duel/choice/MultiKickerChoicePanel.java index 3226a20cf6..cccb357d7d 100644 --- a/src/magic/ui/widget/duel/choice/MultiKickerChoicePanel.java +++ b/src/magic/ui/widget/duel/choice/MultiKickerChoicePanel.java @@ -5,16 +5,18 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; + import javax.swing.JButton; import javax.swing.JPanel; + import magic.data.MagicIcon; import magic.model.MagicManaCost; import magic.model.MagicSource; +import magic.translate.MText; +import magic.ui.FontsAndBorders; import magic.ui.MagicImages; import magic.ui.screen.duel.game.SwingGameController; -import magic.translate.MText; import magic.ui.widget.duel.viewer.UserActionPanel; -import magic.ui.FontsAndBorders; import magic.ui.widget.message.TextLabel; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/choice/PlayChoicePanel.java b/src/magic/ui/widget/duel/choice/PlayChoicePanel.java index 468310870f..fbc3aa7fb5 100644 --- a/src/magic/ui/widget/duel/choice/PlayChoicePanel.java +++ b/src/magic/ui/widget/duel/choice/PlayChoicePanel.java @@ -6,15 +6,17 @@ import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JPanel; + import magic.model.MagicSource; import magic.model.choice.MagicPlayChoiceResult; -import magic.ui.screen.duel.game.SwingGameController; import magic.translate.MText; -import magic.ui.widget.duel.viewer.UserActionPanel; import magic.ui.FontsAndBorders; +import magic.ui.screen.duel.game.SwingGameController; +import magic.ui.widget.duel.viewer.UserActionPanel; import magic.ui.widget.message.TextLabel; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/player/AnimationPanel.java b/src/magic/ui/widget/duel/player/AnimationPanel.java index 6a972da6d7..5cac3afb30 100644 --- a/src/magic/ui/widget/duel/player/AnimationPanel.java +++ b/src/magic/ui/widget/duel/player/AnimationPanel.java @@ -4,15 +4,18 @@ import java.awt.BasicStroke; import java.awt.Color; import java.awt.Graphics2D; import java.awt.Stroke; + import javax.swing.JPanel; + +import org.pushingpixels.trident.Timeline; +import org.pushingpixels.trident.Timeline.TimelineState; +import org.pushingpixels.trident.ease.Spline; + import magic.data.GeneralConfig; import magic.data.settings.BooleanSetting; import magic.ui.theme.Theme; import magic.ui.theme.ThemeFactory; import magic.ui.utility.MagicStyle; -import org.pushingpixels.trident.Timeline; -import org.pushingpixels.trident.Timeline.TimelineState; -import org.pushingpixels.trident.ease.Spline; @SuppressWarnings("serial") public class AnimationPanel extends JPanel { diff --git a/src/magic/ui/widget/duel/player/GamePlayerPanel.java b/src/magic/ui/widget/duel/player/GamePlayerPanel.java index 38878cd19d..0324f0edd3 100644 --- a/src/magic/ui/widget/duel/player/GamePlayerPanel.java +++ b/src/magic/ui/widget/duel/player/GamePlayerPanel.java @@ -5,7 +5,9 @@ import java.awt.Dimension; import java.awt.Font; import java.awt.Rectangle; import java.util.Set; + import javax.swing.JLabel; + import magic.model.MagicPlayerZone; import magic.ui.FontsAndBorders; import magic.ui.IChoiceViewer; diff --git a/src/magic/ui/widget/duel/player/PlayerAvatarButton.java b/src/magic/ui/widget/duel/player/PlayerAvatarButton.java index 8082c1d1bd..f84e9d8580 100644 --- a/src/magic/ui/widget/duel/player/PlayerAvatarButton.java +++ b/src/magic/ui/widget/duel/player/PlayerAvatarButton.java @@ -2,6 +2,7 @@ package magic.ui.widget.duel.player; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import magic.ui.duel.viewerinfo.PlayerViewerInfo; import magic.ui.helpers.MouseHelper; import magic.ui.screen.duel.game.SwingGameController; diff --git a/src/magic/ui/widget/duel/player/PlayerCounterPanel.java b/src/magic/ui/widget/duel/player/PlayerCounterPanel.java index e949cfe6ea..3bd5aa86db 100644 --- a/src/magic/ui/widget/duel/player/PlayerCounterPanel.java +++ b/src/magic/ui/widget/duel/player/PlayerCounterPanel.java @@ -3,10 +3,12 @@ package magic.ui.widget.duel.player; import java.awt.Color; import java.awt.Dimension; import java.awt.Font; + import javax.swing.ImageIcon; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.data.MagicIcon; import magic.ui.MagicImages; import magic.ui.helpers.ImageHelper; diff --git a/src/magic/ui/widget/duel/player/PlayerCountersPanel.java b/src/magic/ui/widget/duel/player/PlayerCountersPanel.java index 8515414a39..45006f8870 100644 --- a/src/magic/ui/widget/duel/player/PlayerCountersPanel.java +++ b/src/magic/ui/widget/duel/player/PlayerCountersPanel.java @@ -1,6 +1,7 @@ package magic.ui.widget.duel.player; import javax.swing.JPanel; + import magic.data.MagicIcon; import magic.translate.MText; import magic.ui.duel.viewerinfo.PlayerViewerInfo; diff --git a/src/magic/ui/widget/duel/player/PlayerImagePanel.java b/src/magic/ui/widget/duel/player/PlayerImagePanel.java index d49ebc6c5c..dc59e99c1a 100644 --- a/src/magic/ui/widget/duel/player/PlayerImagePanel.java +++ b/src/magic/ui/widget/duel/player/PlayerImagePanel.java @@ -7,7 +7,12 @@ import java.awt.Graphics2D; import java.awt.Image; import java.awt.RenderingHints; import java.awt.image.BufferedImage; + import javax.swing.JPanel; + +import org.pushingpixels.trident.Timeline; +import org.pushingpixels.trident.ease.Spline; + import magic.data.GeneralConfig; import magic.data.MagicIcon; import magic.data.settings.BooleanSetting; @@ -15,8 +20,6 @@ import magic.ui.MagicImages; import magic.ui.duel.viewerinfo.PlayerViewerInfo; import magic.ui.helpers.ImageHelper; import magic.ui.utility.MagicStyle; -import org.pushingpixels.trident.Timeline; -import org.pushingpixels.trident.ease.Spline; @SuppressWarnings("serial") public class PlayerImagePanel extends JPanel { diff --git a/src/magic/ui/widget/duel/player/PlayerZoneButtonsPanel.java b/src/magic/ui/widget/duel/player/PlayerZoneButtonsPanel.java index 560c90f83e..65ee118b45 100644 --- a/src/magic/ui/widget/duel/player/PlayerZoneButtonsPanel.java +++ b/src/magic/ui/widget/duel/player/PlayerZoneButtonsPanel.java @@ -12,9 +12,11 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; + import javax.swing.ButtonGroup; import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.model.MagicCardList; import magic.model.MagicPlayerZone; import magic.translate.MText; diff --git a/src/magic/ui/widget/duel/player/ZoneToggleButton.java b/src/magic/ui/widget/duel/player/ZoneToggleButton.java index 5fa43ff713..22fe382dae 100644 --- a/src/magic/ui/widget/duel/player/ZoneToggleButton.java +++ b/src/magic/ui/widget/duel/player/ZoneToggleButton.java @@ -13,7 +13,11 @@ import java.awt.Stroke; import java.awt.Transparency; import java.awt.image.BufferedImage; import java.util.Set; + import javax.swing.JToggleButton; + +import org.pushingpixels.trident.Timeline; + import magic.data.MagicIcon; import magic.model.MagicCardList; import magic.model.MagicPlayerZone; @@ -23,7 +27,6 @@ import magic.ui.theme.Theme; import magic.ui.utility.MagicStyle; import magic.ui.widget.duel.animation.AnimationFx; import magic.ui.widget.duel.animation.MagicAnimations; -import org.pushingpixels.trident.Timeline; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/sidebar/DuelSideBarPanel.java b/src/magic/ui/widget/duel/sidebar/DuelSideBarPanel.java index d75ef76688..0d7f0835f8 100644 --- a/src/magic/ui/widget/duel/sidebar/DuelSideBarPanel.java +++ b/src/magic/ui/widget/duel/sidebar/DuelSideBarPanel.java @@ -4,8 +4,10 @@ import java.awt.Component; import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; + import javax.swing.JComponent; import javax.swing.JPanel; + import magic.data.GeneralConfig; import magic.model.MagicPlayer; import magic.model.MagicPlayerZone; diff --git a/src/magic/ui/widget/duel/sidebar/LogStackViewer.java b/src/magic/ui/widget/duel/sidebar/LogStackViewer.java index e2fddbf375..318f2d871b 100644 --- a/src/magic/ui/widget/duel/sidebar/LogStackViewer.java +++ b/src/magic/ui/widget/duel/sidebar/LogStackViewer.java @@ -10,6 +10,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.BorderFactory; import javax.swing.Icon; @@ -18,6 +19,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.data.MagicIcon; import magic.model.IUIGameController; diff --git a/src/magic/ui/widget/duel/sidebar/LogViewer.java b/src/magic/ui/widget/duel/sidebar/LogViewer.java index 22940421d5..97bebc8493 100644 --- a/src/magic/ui/widget/duel/sidebar/LogViewer.java +++ b/src/magic/ui/widget/duel/sidebar/LogViewer.java @@ -2,17 +2,19 @@ package magic.ui.widget.duel.sidebar; import java.awt.Component; import java.util.List; + import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.JScrollBar; import javax.swing.JScrollPane; + import magic.data.GeneralConfig; import magic.model.MagicMessage; +import magic.ui.FontsAndBorders; import magic.ui.screen.duel.game.SwingGameController; +import magic.ui.widget.TexturedPanel; import magic.ui.widget.message.MessageStyle; import magic.ui.widget.message.TextComponent; -import magic.ui.FontsAndBorders; -import magic.ui.widget.TexturedPanel; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/sidebar/MessagePanel.java b/src/magic/ui/widget/duel/sidebar/MessagePanel.java index eb49f07747..8e42ff7ffe 100644 --- a/src/magic/ui/widget/duel/sidebar/MessagePanel.java +++ b/src/magic/ui/widget/duel/sidebar/MessagePanel.java @@ -2,18 +2,20 @@ package magic.ui.widget.duel.sidebar; import java.awt.Color; import java.awt.Insets; + import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.border.CompoundBorder; + import magic.data.MagicIcon; import magic.model.MagicMessage; +import magic.ui.FontsAndBorders; import magic.ui.MagicImages; import magic.ui.screen.duel.game.SwingGameController; import magic.ui.widget.message.TextLabel; -import magic.ui.FontsAndBorders; import net.miginfocom.swing.MigLayout; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/sidebar/StackButton.java b/src/magic/ui/widget/duel/sidebar/StackButton.java index 987afff8ba..00443f294e 100644 --- a/src/magic/ui/widget/duel/sidebar/StackButton.java +++ b/src/magic/ui/widget/duel/sidebar/StackButton.java @@ -5,8 +5,10 @@ import java.awt.Font; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Set; + import javax.swing.JLabel; import javax.swing.JPanel; + import magic.ui.FontsAndBorders; import magic.ui.IChoiceViewer; import magic.ui.duel.viewerinfo.StackItemViewerInfo; diff --git a/src/magic/ui/widget/duel/sidebar/StackViewer.java b/src/magic/ui/widget/duel/sidebar/StackViewer.java index cf933752bc..e9c8cfd4a0 100644 --- a/src/magic/ui/widget/duel/sidebar/StackViewer.java +++ b/src/magic/ui/widget/duel/sidebar/StackViewer.java @@ -6,10 +6,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Set; + import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.ScrollPaneConstants; import javax.swing.Scrollable; + import magic.ui.FontsAndBorders; import magic.ui.IChoiceViewer; import magic.ui.duel.viewerinfo.StackItemViewerInfo; diff --git a/src/magic/ui/widget/duel/viewer/CardImageWorker.java b/src/magic/ui/widget/duel/viewer/CardImageWorker.java index b5690dc861..c7a3107b7d 100644 --- a/src/magic/ui/widget/duel/viewer/CardImageWorker.java +++ b/src/magic/ui/widget/duel/viewer/CardImageWorker.java @@ -8,8 +8,10 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; + import javax.swing.SwingUtilities; import javax.swing.SwingWorker; + import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/widget/duel/viewer/CardViewer.java b/src/magic/ui/widget/duel/viewer/CardViewer.java index 146f2b4407..b7f397c48a 100644 --- a/src/magic/ui/widget/duel/viewer/CardViewer.java +++ b/src/magic/ui/widget/duel/viewer/CardViewer.java @@ -10,11 +10,13 @@ import java.awt.Image; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.Timer; + import magic.data.GeneralConfig; import magic.data.MagicIcon; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/widget/duel/viewer/GameStatusPanel.java b/src/magic/ui/widget/duel/viewer/GameStatusPanel.java index 4d35644b65..9689c340a3 100644 --- a/src/magic/ui/widget/duel/viewer/GameStatusPanel.java +++ b/src/magic/ui/widget/duel/viewer/GameStatusPanel.java @@ -3,9 +3,11 @@ package magic.ui.widget.duel.viewer; import java.awt.Component; import java.awt.Point; import java.awt.Rectangle; + import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; + import magic.ui.FontsAndBorders; import magic.ui.duel.viewerinfo.GameViewerInfo; import magic.ui.screen.duel.game.SwingGameController; diff --git a/src/magic/ui/widget/duel/viewer/ImageBattlefieldViewer.java b/src/magic/ui/widget/duel/viewer/ImageBattlefieldViewer.java index 8513f928e3..03e35b22b3 100644 --- a/src/magic/ui/widget/duel/viewer/ImageBattlefieldViewer.java +++ b/src/magic/ui/widget/duel/viewer/ImageBattlefieldViewer.java @@ -1,19 +1,19 @@ package magic.ui.widget.duel.viewer; -import magic.ui.screen.duel.game.PermanentFilter; -import magic.ui.IUpdatable; -import magic.ui.IChoiceViewer; -import magic.ui.screen.duel.game.SwingGameController; -import magic.ui.theme.Theme; -import magic.ui.FontsAndBorders; - -import javax.swing.JLabel; -import javax.swing.JPanel; - import java.awt.BorderLayout; import java.awt.Dimension; import java.util.Set; + +import javax.swing.JLabel; +import javax.swing.JPanel; + +import magic.ui.FontsAndBorders; +import magic.ui.IChoiceViewer; +import magic.ui.IUpdatable; import magic.ui.duel.viewerinfo.CardViewerInfo; +import magic.ui.screen.duel.game.PermanentFilter; +import magic.ui.screen.duel.game.SwingGameController; +import magic.ui.theme.Theme; import magic.ui.utility.MagicStyle; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/duel/viewer/ImageCardListViewer.java b/src/magic/ui/widget/duel/viewer/ImageCardListViewer.java index 8cf933b54e..fbb92e2d2d 100644 --- a/src/magic/ui/widget/duel/viewer/ImageCardListViewer.java +++ b/src/magic/ui/widget/duel/viewer/ImageCardListViewer.java @@ -18,8 +18,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; + import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.model.MagicCard; import magic.model.MagicCardDefinition; diff --git a/src/magic/ui/widget/duel/viewer/ImageCombatViewer.java b/src/magic/ui/widget/duel/viewer/ImageCombatViewer.java index 3d8cc1a9a5..3c0e1d49ba 100644 --- a/src/magic/ui/widget/duel/viewer/ImageCombatViewer.java +++ b/src/magic/ui/widget/duel/viewer/ImageCombatViewer.java @@ -6,8 +6,10 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; import java.util.stream.Stream; + import javax.swing.JLabel; import javax.swing.JPanel; + import magic.ui.FontsAndBorders; import magic.ui.IChoiceViewer; import magic.ui.duel.viewerinfo.CardViewerInfo; diff --git a/src/magic/ui/widget/duel/viewer/ImagePermanentViewer.java b/src/magic/ui/widget/duel/viewer/ImagePermanentViewer.java index 839dd9ac3f..422fd98a13 100644 --- a/src/magic/ui/widget/duel/viewer/ImagePermanentViewer.java +++ b/src/magic/ui/widget/duel/viewer/ImagePermanentViewer.java @@ -18,8 +18,10 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.Collections; import java.util.List; + import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.data.GeneralConfig; import magic.data.MagicIcon; import magic.data.settings.IntegerSetting; diff --git a/src/magic/ui/widget/duel/viewer/ImagePermanentsViewer.java b/src/magic/ui/widget/duel/viewer/ImagePermanentsViewer.java index 73a7650fb3..da5eb1128f 100644 --- a/src/magic/ui/widget/duel/viewer/ImagePermanentsViewer.java +++ b/src/magic/ui/widget/duel/viewer/ImagePermanentsViewer.java @@ -7,7 +7,9 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; + import javax.swing.JPanel; + import magic.ui.dialog.prefs.ImageSizePresets; import magic.ui.duel.viewerinfo.CardViewerInfo; import magic.ui.duel.viewerinfo.PermanentViewerInfo; diff --git a/src/magic/ui/widget/duel/viewer/NewTurnPanel.java b/src/magic/ui/widget/duel/viewer/NewTurnPanel.java index 28a30204b9..d317060eef 100644 --- a/src/magic/ui/widget/duel/viewer/NewTurnPanel.java +++ b/src/magic/ui/widget/duel/viewer/NewTurnPanel.java @@ -2,6 +2,7 @@ package magic.ui.widget.duel.viewer; import javax.swing.JLabel; import javax.swing.JPanel; + import magic.translate.MText; import magic.ui.duel.viewerinfo.GameViewerInfo; import magic.ui.theme.Theme; diff --git a/src/magic/ui/widget/duel/viewer/PhaseStepViewer.java b/src/magic/ui/widget/duel/viewer/PhaseStepViewer.java index 5a7012489b..a186be9262 100644 --- a/src/magic/ui/widget/duel/viewer/PhaseStepViewer.java +++ b/src/magic/ui/widget/duel/viewer/PhaseStepViewer.java @@ -4,9 +4,11 @@ import java.awt.Color; import java.awt.Font; import java.util.LinkedHashMap; import java.util.Map; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.model.phase.MagicPhaseType; import magic.translate.MText; import magic.ui.utility.MagicStyle; diff --git a/src/magic/ui/widget/duel/viewer/PlayerZoneViewer.java b/src/magic/ui/widget/duel/viewer/PlayerZoneViewer.java index 4805cfec89..3768ac6379 100644 --- a/src/magic/ui/widget/duel/viewer/PlayerZoneViewer.java +++ b/src/magic/ui/widget/duel/viewer/PlayerZoneViewer.java @@ -1,10 +1,12 @@ package magic.ui.widget.duel.viewer; import java.awt.BorderLayout; + import javax.swing.JPanel; import javax.swing.JToggleButton; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; + import magic.model.MagicCardList; import magic.model.MagicPlayerZone; import magic.translate.MText; diff --git a/src/magic/ui/widget/duel/viewer/TurnStatusPanel.java b/src/magic/ui/widget/duel/viewer/TurnStatusPanel.java index f004100337..532ecb8d2b 100644 --- a/src/magic/ui/widget/duel/viewer/TurnStatusPanel.java +++ b/src/magic/ui/widget/duel/viewer/TurnStatusPanel.java @@ -1,6 +1,7 @@ package magic.ui.widget.duel.viewer; import javax.swing.JPanel; + import magic.ui.duel.viewerinfo.GameViewerInfo; import magic.ui.screen.duel.game.SwingGameController; import magic.ui.theme.Theme; diff --git a/src/magic/ui/widget/duel/viewer/TurnTitlePanel.java b/src/magic/ui/widget/duel/viewer/TurnTitlePanel.java index 2e3892f812..1c2685ef39 100644 --- a/src/magic/ui/widget/duel/viewer/TurnTitlePanel.java +++ b/src/magic/ui/widget/duel/viewer/TurnTitlePanel.java @@ -5,6 +5,7 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; + import javax.swing.AbstractAction; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -13,6 +14,7 @@ import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; + import magic.data.MagicIcon; import magic.translate.MText; import magic.translate.StringContext; diff --git a/src/magic/ui/widget/duel/viewer/UserActionPanel.java b/src/magic/ui/widget/duel/viewer/UserActionPanel.java index dbea07d40c..456c5101e9 100644 --- a/src/magic/ui/widget/duel/viewer/UserActionPanel.java +++ b/src/magic/ui/widget/duel/viewer/UserActionPanel.java @@ -13,6 +13,7 @@ import java.awt.event.InputEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; + import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JComponent; @@ -22,6 +23,7 @@ import javax.swing.JScrollPane; import javax.swing.ScrollPaneConstants; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; + import magic.data.MagicIcon; import magic.model.MagicCardDefinition; import magic.ui.MagicImages; diff --git a/src/magic/ui/widget/firemind/FiremindWorkerPanel.java b/src/magic/ui/widget/firemind/FiremindWorkerPanel.java index 4028bab7a0..d31cbfc73b 100644 --- a/src/magic/ui/widget/firemind/FiremindWorkerPanel.java +++ b/src/magic/ui/widget/firemind/FiremindWorkerPanel.java @@ -5,10 +5,11 @@ import static java.nio.charset.StandardCharsets.UTF_8; import java.awt.Font; import java.awt.event.ActionEvent; import java.io.FileNotFoundException; -import java.io.UnsupportedEncodingException; import java.io.PrintWriter; +import java.io.UnsupportedEncodingException; import java.nio.file.Path; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.ImageIcon; import javax.swing.JButton; @@ -18,6 +19,7 @@ import javax.swing.JTextField; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; + import magic.FiremindQueueWorker; import magic.data.GeneralConfig; import magic.data.MagicIcon; diff --git a/src/magic/ui/widget/message/EmptyComponent.java b/src/magic/ui/widget/message/EmptyComponent.java index fc1004651f..69afe196c5 100644 --- a/src/magic/ui/widget/message/EmptyComponent.java +++ b/src/magic/ui/widget/message/EmptyComponent.java @@ -3,6 +3,7 @@ package magic.ui.widget.message; import java.awt.Dimension; import java.awt.Graphics; import java.awt.Rectangle; + import javax.swing.JComponent; class EmptyComponent extends TComponent { diff --git a/src/magic/ui/widget/message/IconComponent.java b/src/magic/ui/widget/message/IconComponent.java index 8767a991fc..4adca5fbb5 100644 --- a/src/magic/ui/widget/message/IconComponent.java +++ b/src/magic/ui/widget/message/IconComponent.java @@ -3,6 +3,7 @@ package magic.ui.widget.message; import java.awt.Dimension; import java.awt.Graphics; import java.awt.Rectangle; + import javax.swing.ImageIcon; import javax.swing.JComponent; diff --git a/src/magic/ui/widget/message/TComponent.java b/src/magic/ui/widget/message/TComponent.java index 04280bd42f..86fe12add6 100644 --- a/src/magic/ui/widget/message/TComponent.java +++ b/src/magic/ui/widget/message/TComponent.java @@ -3,6 +3,7 @@ package magic.ui.widget.message; import java.awt.Dimension; import java.awt.Graphics; import java.awt.Rectangle; + import javax.swing.JComponent; abstract class TComponent { diff --git a/src/magic/ui/widget/message/TComponentBuilder.java b/src/magic/ui/widget/message/TComponentBuilder.java index 827841ed1e..7848f4ce54 100644 --- a/src/magic/ui/widget/message/TComponentBuilder.java +++ b/src/magic/ui/widget/message/TComponentBuilder.java @@ -3,11 +3,13 @@ package magic.ui.widget.message; import java.awt.Color; import java.awt.Font; import java.util.List; + import javax.swing.JComponent; + import magic.data.TextImages; import magic.model.MagicMessage; -import magic.ui.MagicImages; import magic.ui.FontsAndBorders; +import magic.ui.MagicImages; import magic.utility.MagicSystem; class TComponentBuilder { diff --git a/src/magic/ui/widget/message/TextComponent.java b/src/magic/ui/widget/message/TextComponent.java index b065a30ea6..dbaa536b7e 100644 --- a/src/magic/ui/widget/message/TextComponent.java +++ b/src/magic/ui/widget/message/TextComponent.java @@ -6,7 +6,9 @@ import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Rectangle; + import javax.swing.JComponent; + import magic.data.GeneralConfig; import magic.model.MagicMessage; diff --git a/src/magic/ui/widget/message/TextLabel.java b/src/magic/ui/widget/message/TextLabel.java index b2f32a14c8..6bf924e6e5 100644 --- a/src/magic/ui/widget/message/TextLabel.java +++ b/src/magic/ui/widget/message/TextLabel.java @@ -16,8 +16,10 @@ import java.awt.event.MouseMotionAdapter; import java.util.ArrayList; import java.util.List; import java.util.Map; + import javax.swing.JPanel; import javax.swing.SwingUtilities; + import magic.ui.FontsAndBorders; import magic.ui.screen.duel.game.SwingGameController; import magic.ui.theme.Theme; diff --git a/src/magic/ui/widget/player/PlayerDetailsPanel.java b/src/magic/ui/widget/player/PlayerDetailsPanel.java index 32abccbe91..040d42433f 100644 --- a/src/magic/ui/widget/player/PlayerDetailsPanel.java +++ b/src/magic/ui/widget/player/PlayerDetailsPanel.java @@ -1,9 +1,11 @@ package magic.ui.widget.player; import java.awt.Color; + import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.SwingConstants; + import magic.model.player.PlayerProfile; import magic.ui.FontsAndBorders; import net.miginfocom.swing.MigLayout; diff --git a/src/magic/ui/widget/scrollbar/MScrollBarUI.java b/src/magic/ui/widget/scrollbar/MScrollBarUI.java index 43eafa7611..346699cc2b 100644 --- a/src/magic/ui/widget/scrollbar/MScrollBarUI.java +++ b/src/magic/ui/widget/scrollbar/MScrollBarUI.java @@ -8,6 +8,7 @@ import java.awt.Graphics2D; import java.awt.Point; import java.awt.Rectangle; import java.awt.RenderingHints; + import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JScrollBar; diff --git a/src/magic/ui/widget/scrollbar/NoButton.java b/src/magic/ui/widget/scrollbar/NoButton.java index 10a055c34e..d8b4684ee1 100644 --- a/src/magic/ui/widget/scrollbar/NoButton.java +++ b/src/magic/ui/widget/scrollbar/NoButton.java @@ -1,6 +1,7 @@ package magic.ui.widget.scrollbar; import java.awt.Dimension; + import javax.swing.JButton; @SuppressWarnings("serial") diff --git a/src/magic/ui/widget/throbber/AbstractThrobber.java b/src/magic/ui/widget/throbber/AbstractThrobber.java index 726ef6aa79..8ae9784c46 100644 --- a/src/magic/ui/widget/throbber/AbstractThrobber.java +++ b/src/magic/ui/widget/throbber/AbstractThrobber.java @@ -7,12 +7,15 @@ import java.awt.RenderingHints; import java.awt.Transparency; import java.awt.event.HierarchyEvent; import java.awt.image.BufferedImage; + import javax.swing.JComponent; import javax.swing.SwingUtilities; -import magic.ui.helpers.ImageHelper; + import org.pushingpixels.trident.Timeline; import org.pushingpixels.trident.Timeline.RepeatBehavior; +import magic.ui.helpers.ImageHelper; + /** * TODO * diff --git a/src/magic/ui/widget/throbber/ImageThrobber.java b/src/magic/ui/widget/throbber/ImageThrobber.java index bdb5bb9079..330f5655eb 100644 --- a/src/magic/ui/widget/throbber/ImageThrobber.java +++ b/src/magic/ui/widget/throbber/ImageThrobber.java @@ -8,6 +8,7 @@ import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.event.HierarchyEvent; import java.awt.image.BufferedImage; + import magic.ui.helpers.ImageHelper; @SuppressWarnings("serial") diff --git a/src/magic/utility/DeckParser.java b/src/magic/utility/DeckParser.java index 5e5fd5a835..be9cb8bf92 100644 --- a/src/magic/utility/DeckParser.java +++ b/src/magic/utility/DeckParser.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; + import magic.data.GeneralConfig; import magic.data.settings.IntegerSetting; import magic.model.MagicCardDefinition; diff --git a/src/magic/utility/DeckUtils.java b/src/magic/utility/DeckUtils.java index 33671e2679..53948b03b8 100644 --- a/src/magic/utility/DeckUtils.java +++ b/src/magic/utility/DeckUtils.java @@ -1,5 +1,8 @@ package magic.utility; +import static java.nio.charset.StandardCharsets.UTF_8; +import static java.nio.file.FileVisitOption.FOLLOW_LINKS; + import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -22,6 +25,9 @@ import java.util.TreeMap; import java.util.logging.Level; import java.util.logging.Logger; import java.util.zip.CRC32; + +import org.apache.commons.io.FilenameUtils; + import magic.data.CardDefinitions; import magic.data.DeckType; import magic.exception.InvalidDeckException; @@ -32,9 +38,6 @@ import magic.model.MagicDeck; import magic.model.MagicDeckProfile; import magic.model.MagicRandom; import magic.utility.MagicFileSystem.DataPath; -import org.apache.commons.io.FilenameUtils; -import static java.nio.charset.StandardCharsets.UTF_8; -import static java.nio.file.FileVisitOption.FOLLOW_LINKS; public class DeckUtils { diff --git a/src/magic/utility/FileIO.java b/src/magic/utility/FileIO.java index 7549b501aa..3d6a9eb42d 100644 --- a/src/magic/utility/FileIO.java +++ b/src/magic/utility/FileIO.java @@ -1,5 +1,9 @@ package magic.utility; +import static java.nio.charset.StandardCharsets.UTF_8; +import static java.nio.file.StandardOpenOption.APPEND; +import static java.nio.file.StandardOpenOption.CREATE; + import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -15,9 +19,6 @@ import java.nio.file.Files; import java.nio.file.StandardOpenOption; import java.util.List; import java.util.Properties; -import static java.nio.charset.StandardCharsets.UTF_8; -import static java.nio.file.StandardOpenOption.APPEND; -import static java.nio.file.StandardOpenOption.CREATE; public class FileIO { diff --git a/src/magic/utility/MagicFileSystem.java b/src/magic/utility/MagicFileSystem.java index b8d1ae6d4d..95560fe2b4 100644 --- a/src/magic/utility/MagicFileSystem.java +++ b/src/magic/utility/MagicFileSystem.java @@ -18,12 +18,14 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Locale; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; + import magic.data.GeneralConfig; import magic.model.IRenderableCard; import magic.model.MagicCardDefinition; import magic.model.MagicGameLog; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.FilenameUtils; /** * Utility class for useful or common file-system related tasks. diff --git a/src/magic/utility/MagicResources.java b/src/magic/utility/MagicResources.java index c8fd02484c..eae1368bbd 100644 --- a/src/magic/utility/MagicResources.java +++ b/src/magic/utility/MagicResources.java @@ -2,11 +2,11 @@ package magic.utility; import static java.nio.charset.StandardCharsets.UTF_8; +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.BufferedInputStream; import java.io.InputStreamReader; -import java.net.URL; + import magic.data.MagicIcon; import magic.data.MagicPredefinedFormat; import magic.data.MagicSets; diff --git a/src/magic/utility/MagicSystem.java b/src/magic/utility/MagicSystem.java index 37e641f98d..1a6d8df5ed 100644 --- a/src/magic/utility/MagicSystem.java +++ b/src/magic/utility/MagicSystem.java @@ -14,6 +14,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.FutureTask; + import magic.data.CardDefinitions; import magic.data.DeckGenerators; import magic.data.GeneralConfig; diff --git a/test/magic/model/MagicManaCostTest.java b/test/magic/model/MagicManaCostTest.java index 7d4c24c84d..2d797ce663 100644 --- a/test/magic/model/MagicManaCostTest.java +++ b/test/magic/model/MagicManaCostTest.java @@ -1,9 +1,9 @@ package magic.model; -import org.junit.Test; - import static org.junit.Assert.assertEquals; +import org.junit.Test; + public class MagicManaCostTest { @Test public void testCostModification() { diff --git a/test/magic/model/MagicMessageTest.java b/test/magic/model/MagicMessageTest.java index 431b1ddbef..c88a615f51 100644 --- a/test/magic/model/MagicMessageTest.java +++ b/test/magic/model/MagicMessageTest.java @@ -1,11 +1,12 @@ package magic.model; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + import magic.ai.MagicAIImpl; import magic.model.player.AiProfile; import magic.model.player.HumanProfile; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; public class MagicMessageTest { private DuelPlayerConfig cfgAi = new DuelPlayerConfig(AiProfile.create(MagicAIImpl.MMAB, 12), new MagicDeckProfile("r"));