From fc62a41e46ed6b2b3e9121da2fb7944bae32b3fc Mon Sep 17 00:00:00 2001 From: "Jamin W. Collins" Date: Tue, 11 Sep 2018 17:35:03 -0600 Subject: [PATCH] implement basic checkstyle configuration Remove all unused or redundant imports Signed-off-by: Jamin W. Collins --- checkstyle.xml | 21 +++++++++++++++ forge-ai/pom.xml | 27 +++++++++++++++++++ .../main/java/forge/ai/ComputerUtilCost.java | 1 - forge-core/pom.xml | 27 +++++++++++++++++++ forge-core/src/main/java/forge/deck/Deck.java | 1 - forge-game/pom.xml | 27 +++++++++++++++++++ .../java/forge/game/player/PlayerView.java | 1 - .../game/trigger/TriggerSpellAbilityCast.java | 1 - forge-gui-android/pom.xml | 22 +++++++++++++++ forge-gui-desktop/pom.xml | 22 +++++++++++++++ .../java/forge/gui/framework/SLayoutIO.java | 1 - .../java/forge/itemmanager/CardManager.java | 2 -- .../deckeditor/controllers/CBrawlDecks.java | 2 -- .../controllers/CCommanderDecks.java | 1 - .../controllers/CEditorConstructed.java | 2 -- .../controllers/CEditorQuestLimited.java | 1 - .../controllers/CTinyLeadersDecks.java | 1 - .../java/forge/screens/home/PlayerPanel.java | 1 - .../home/quest/DialogChooseFormats.java | 2 -- .../java/forge/screens/match/CMatchUI.java | 1 - .../PlanarConquestCommanderGeneraterGA.java | 13 --------- .../PlanarConquestGeneraterGAStandard.java | 21 --------------- forge-gui-mobile-dev/pom.xml | 22 +++++++++++++++ forge-gui/pom.xml | 27 +++++++++++++++++++ .../forge/card/CardReaderExperiments.java | 1 - .../forge/deck/CardArchetypeLDAGenerator.java | 2 -- .../deck/CardRelationMatrixGenerator.java | 1 - .../java/forge/deck/DeckGeneratorTheme.java | 1 - .../src/main/java/forge/deck/DeckgenUtil.java | 1 - .../java/forge/deck/io/CardThemedLDAIO.java | 2 -- .../main/java/forge/error/BugReporter.java | 1 - .../java/forge/limited/CustomLimited.java | 2 -- .../forge/player/PlayerControllerHuman.java | 1 - 33 files changed, 195 insertions(+), 64 deletions(-) create mode 100644 checkstyle.xml diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 00000000000..8b36ec8b22b --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/forge-ai/pom.xml b/forge-ai/pom.xml index ef0d4c976c4..999ab0f07ce 100644 --- a/forge-ai/pom.xml +++ b/forge-ai/pom.xml @@ -29,4 +29,31 @@ 3.6.1 + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + checkstyle-validation + validate + + ../checkstyle.xml + true + UTF-8 + true + true + true + + + check + + + + + + diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java index 77ff6849087..e9a0ccee4e8 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java @@ -5,7 +5,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import forge.ai.ability.AnimateAi; import forge.card.ColorSet; -import forge.game.GameActionUtil; import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardCollection; diff --git a/forge-core/pom.xml b/forge-core/pom.xml index 9abe5828e22..75670239273 100644 --- a/forge-core/pom.xml +++ b/forge-core/pom.xml @@ -24,4 +24,31 @@ 3.7 + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + checkstyle-validation + validate + + ../checkstyle.xml + true + UTF-8 + true + true + true + + + check + + + + + + diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java index cd36aebfcb4..a4b43b51efd 100644 --- a/forge-core/src/main/java/forge/deck/Deck.java +++ b/forge-core/src/main/java/forge/deck/Deck.java @@ -24,7 +24,6 @@ import forge.StaticData; import forge.card.CardDb; import forge.item.IPaperCard; import forge.item.PaperCard; -import forge.util.ItemPool; import java.util.*; import java.util.Map.Entry; diff --git a/forge-game/pom.xml b/forge-game/pom.xml index aa907bb0261..f0fc23a2808 100644 --- a/forge-game/pom.xml +++ b/forge-game/pom.xml @@ -31,4 +31,31 @@ jar + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + checkstyle-validation + validate + + ../checkstyle.xml + true + UTF-8 + true + true + true + + + check + + + + + + diff --git a/forge-game/src/main/java/forge/game/player/PlayerView.java b/forge-game/src/main/java/forge/game/player/PlayerView.java index 7e1ba3b9bf8..33751b10e7d 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerView.java +++ b/forge-game/src/main/java/forge/game/player/PlayerView.java @@ -11,7 +11,6 @@ import forge.util.TextUtil; import org.apache.commons.lang3.StringUtils; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import com.google.common.collect.ImmutableMultiset; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java index 48e1bb9b6da..cb098f9db61 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java @@ -34,7 +34,6 @@ import forge.game.spellability.OptionalCost; import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityStackInstance; import forge.game.spellability.TargetChoices; -import forge.game.staticability.StaticAbility; import forge.game.zone.ZoneType; import forge.util.Expressions; diff --git a/forge-gui-android/pom.xml b/forge-gui-android/pom.xml index df6390683c2..b991de93705 100644 --- a/forge-gui-android/pom.xml +++ b/forge-gui-android/pom.xml @@ -36,6 +36,28 @@ 1.8 + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + checkstyle-validation + validate + + ../checkstyle.xml + true + UTF-8 + true + true + true + + + check + + + + diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml index 927a285e737..4b3fd81e123 100644 --- a/forge-gui-desktop/pom.xml +++ b/forge-gui-desktop/pom.xml @@ -153,6 +153,28 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + checkstyle-validation + validate + + ../checkstyle.xml + true + UTF-8 + true + true + true + + + check + + + + diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java index 87c5753bf31..b19618578d8 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java +++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java @@ -28,7 +28,6 @@ import javax.xml.stream.events.XMLEvent; import forge.FThreads; import forge.Singletons; -import forge.error.BugReporter; import forge.gui.SOverlayUtils; import forge.properties.FileLocation; import forge.properties.ForgeConstants; diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java index 8fe9f7f912e..aac030a4515 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/CardManager.java @@ -12,8 +12,6 @@ import forge.screens.home.quest.DialogChooseSets; import forge.screens.match.controllers.CDetailPicture; import javax.swing.*; -import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CBrawlDecks.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CBrawlDecks.java index 11c664f2b9c..bf2afd5c7ad 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CBrawlDecks.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CBrawlDecks.java @@ -4,8 +4,6 @@ import forge.deck.DeckProxy; import forge.gui.framework.ICDoc; import forge.itemmanager.ItemManagerConfig; import forge.screens.deckeditor.views.VBrawlDecks; -import forge.screens.deckeditor.views.VCommanderDecks; -import forge.screens.deckeditor.views.VTinyLeadersDecks; /** * Controls the "Commander Decks" panel in the deck editor UI. diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCommanderDecks.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCommanderDecks.java index ba77211f111..6f0c22469ee 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCommanderDecks.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CCommanderDecks.java @@ -3,7 +3,6 @@ package forge.screens.deckeditor.controllers; import forge.deck.DeckProxy; import forge.gui.framework.ICDoc; import forge.itemmanager.ItemManagerConfig; -import forge.screens.deckeditor.views.VAllDecks; import forge.screens.deckeditor.views.VCommanderDecks; /** diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java index 1d5bdb4938e..86e73560db7 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorConstructed.java @@ -38,9 +38,7 @@ import forge.screens.deckeditor.SEditorIO; import forge.screens.match.controllers.CDetailPicture; import forge.toolbox.FComboBox; import forge.util.ItemPool; -import sun.font.FontConfigManager; -import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java index 1a819e64dbe..9b1208e91b6 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestLimited.java @@ -20,7 +20,6 @@ package forge.screens.deckeditor.controllers; import com.google.common.base.Function; import com.google.common.base.Supplier; import forge.UiCommand; -import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckSection; diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CTinyLeadersDecks.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CTinyLeadersDecks.java index 4393a38999a..a20e47aa8f1 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CTinyLeadersDecks.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CTinyLeadersDecks.java @@ -3,7 +3,6 @@ package forge.screens.deckeditor.controllers; import forge.deck.DeckProxy; import forge.gui.framework.ICDoc; import forge.itemmanager.ItemManagerConfig; -import forge.screens.deckeditor.views.VCommanderDecks; import forge.screens.deckeditor.views.VTinyLeadersDecks; /** diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java index 8ff11ea0b9a..875da3c0689 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/PlayerPanel.java @@ -35,7 +35,6 @@ import forge.model.FModel; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.CDeckEditorUI; -import forge.screens.deckeditor.controllers.CEditorCommander; import forge.screens.deckeditor.controllers.CEditorVariant; import forge.screens.home.sanctioned.AvatarSelector; import forge.toolbox.FCheckBox; diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java index 37577c55809..70e3896d7a3 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java @@ -1,12 +1,10 @@ package forge.screens.home.quest; import forge.assets.FSkinProp; -import forge.card.CardEdition; import forge.game.GameFormat; import forge.gui.SOverlayUtils; import forge.model.FModel; import forge.toolbox.*; -import forge.util.TextUtil; import net.miginfocom.swing.MigLayout; import javax.swing.*; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java index 174c28be469..6d6b6c6f555 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java @@ -28,7 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicReference; -import java.util.prefs.Preferences; import javax.swing.JMenu; import javax.swing.JPopupMenu; diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java index 9931f6e98a1..3eedba838c6 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestCommanderGeneraterGA.java @@ -6,7 +6,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import forge.GuiBase; import forge.GuiDesktop; -import forge.LobbyPlayer; import forge.StaticData; import forge.card.CardRulesPredicates; import forge.deck.*; @@ -14,27 +13,15 @@ import forge.deck.io.DeckStorage; import forge.game.GameFormat; import forge.game.GameRules; import forge.game.GameType; -import forge.game.Match; -import forge.game.player.RegisteredPlayer; import forge.item.PaperCard; import forge.limited.CardRanker; import forge.model.FModel; -import forge.player.GamePlayerUtil; import forge.properties.ForgeConstants; import forge.properties.ForgePreferences; -import forge.tournament.system.AbstractTournament; -import forge.tournament.system.TournamentPairing; -import forge.tournament.system.TournamentPlayer; -import forge.tournament.system.TournamentSwiss; -import forge.util.AbstractGeneticAlgorithm; -import forge.util.MyRandom; -import forge.util.TextUtil; -import forge.view.SimulateMatch; import java.io.File; import java.util.ArrayList; import java.util.List; -import java.util.Map; public class PlanarConquestCommanderGeneraterGA extends PlanarConquestGeneraterGA { diff --git a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java index 649c4544c33..4d6a459d1d5 100644 --- a/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java +++ b/forge-gui-desktop/src/test/java/forge/planarconquestgenerate/PlanarConquestGeneraterGAStandard.java @@ -1,40 +1,19 @@ package forge.planarconquestgenerate; import com.google.common.base.Function; -import com.google.common.base.Predicates; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import forge.GuiBase; import forge.GuiDesktop; -import forge.LobbyPlayer; -import forge.StaticData; -import forge.card.CardRulesPredicates; import forge.deck.*; import forge.deck.io.DeckStorage; import forge.game.GameFormat; import forge.game.GameRules; import forge.game.GameType; -import forge.game.Match; -import forge.game.player.RegisteredPlayer; import forge.item.PaperCard; -import forge.limited.CardRanker; import forge.model.FModel; -import forge.player.GamePlayerUtil; import forge.properties.ForgeConstants; import forge.properties.ForgePreferences; -import forge.tournament.system.AbstractTournament; -import forge.tournament.system.TournamentPairing; -import forge.tournament.system.TournamentPlayer; -import forge.tournament.system.TournamentSwiss; -import forge.util.AbstractGeneticAlgorithm; -import forge.util.MyRandom; -import forge.util.TextUtil; -import forge.view.SimulateMatch; - import java.io.File; -import java.util.ArrayList; import java.util.List; -import java.util.Map; public class PlanarConquestGeneraterGAStandard extends PlanarConquestGeneraterGA { diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml index 5439c84f44d..3e186468f97 100644 --- a/forge-gui-mobile-dev/pom.xml +++ b/forge-gui-mobile-dev/pom.xml @@ -52,6 +52,28 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + checkstyle-validation + validate + + ../checkstyle.xml + true + UTF-8 + true + true + true + + + check + + + + diff --git a/forge-gui/pom.xml b/forge-gui/pom.xml index 905ccdd89ba..a9bab656328 100644 --- a/forge-gui/pom.xml +++ b/forge-gui/pom.xml @@ -78,4 +78,31 @@ 1.7.22 + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + checkstyle-validation + validate + + ../checkstyle.xml + true + UTF-8 + true + true + true + + + check + + + + + + diff --git a/forge-gui/src/main/java/forge/card/CardReaderExperiments.java b/forge-gui/src/main/java/forge/card/CardReaderExperiments.java index d0877b739d0..8e355bb9eaf 100644 --- a/forge-gui/src/main/java/forge/card/CardReaderExperiments.java +++ b/forge-gui/src/main/java/forge/card/CardReaderExperiments.java @@ -1,7 +1,6 @@ package forge.card; import forge.CardStorageReader; -import forge.card.CardRules; import forge.properties.ForgeConstants; import forge.util.FileUtil; diff --git a/forge-gui/src/main/java/forge/deck/CardArchetypeLDAGenerator.java b/forge-gui/src/main/java/forge/deck/CardArchetypeLDAGenerator.java index 31172dae50c..1d38d76c8ac 100644 --- a/forge-gui/src/main/java/forge/deck/CardArchetypeLDAGenerator.java +++ b/forge-gui/src/main/java/forge/deck/CardArchetypeLDAGenerator.java @@ -3,11 +3,9 @@ package forge.deck; import forge.StaticData; import forge.deck.io.Archetype; import forge.deck.io.CardThemedLDAIO; -import forge.game.GameFormat; import forge.model.FModel; import org.apache.commons.lang3.tuple.Pair; -import java.io.File; import java.util.*; /** diff --git a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java index 41de3695fcb..440b6d3950f 100644 --- a/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java +++ b/forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java @@ -6,7 +6,6 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import forge.card.CardRules; import forge.card.CardRulesPredicates; -import forge.deck.io.CardThemedLDAIO; import forge.deck.io.CardThemedMatrixIO; import forge.deck.io.DeckStorage; import forge.game.GameFormat; diff --git a/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java b/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java index 7b49a832d34..f58b986ac60 100644 --- a/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java +++ b/forge-gui/src/main/java/forge/deck/DeckGeneratorTheme.java @@ -17,7 +17,6 @@ */ package forge.deck; -import forge.deck.CardPool; import forge.deck.generation.DeckGeneratorBase; import forge.deck.generation.IDeckGenPool; import forge.properties.ForgeConstants; diff --git a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java index 128f5213d37..f1854cb2ea6 100644 --- a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java +++ b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java @@ -35,7 +35,6 @@ import forge.util.gui.SOptionPane; import forge.util.storage.IStorage; import org.apache.commons.lang3.tuple.Pair; -import java.awt.print.Paper; import java.util.*; /** diff --git a/forge-gui/src/main/java/forge/deck/io/CardThemedLDAIO.java b/forge-gui/src/main/java/forge/deck/io/CardThemedLDAIO.java index b05ae41f57a..75257a9a78d 100644 --- a/forge-gui/src/main/java/forge/deck/io/CardThemedLDAIO.java +++ b/forge-gui/src/main/java/forge/deck/io/CardThemedLDAIO.java @@ -1,12 +1,10 @@ package forge.deck.io; import forge.game.GameFormat; -import forge.item.PaperCard; import forge.properties.ForgeConstants; import org.apache.commons.lang3.tuple.Pair; import java.io.*; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/forge-gui/src/main/java/forge/error/BugReporter.java b/forge-gui/src/main/java/forge/error/BugReporter.java index c58fe050ac8..05614e7ff42 100644 --- a/forge-gui/src/main/java/forge/error/BugReporter.java +++ b/forge-gui/src/main/java/forge/error/BugReporter.java @@ -30,7 +30,6 @@ import forge.model.FModel; import forge.properties.ForgePreferences; import forge.util.gui.SOptionPane; import io.sentry.Sentry; -import io.sentry.event.Breadcrumb; import io.sentry.event.BreadcrumbBuilder; /** diff --git a/forge-gui/src/main/java/forge/limited/CustomLimited.java b/forge-gui/src/main/java/forge/limited/CustomLimited.java index 2fa28091406..dda54f28604 100644 --- a/forge-gui/src/main/java/forge/limited/CustomLimited.java +++ b/forge-gui/src/main/java/forge/limited/CustomLimited.java @@ -18,10 +18,8 @@ package forge.limited; import forge.card.CardEdition; -import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckBase; -import forge.deck.DeckSection; import forge.item.PaperCard; import forge.item.SealedProduct; import forge.model.FModel; diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 27641f27c17..e7d05e729a2 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -18,7 +18,6 @@ import forge.control.FControlGamePlayback; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; -import forge.error.BugReporter; import forge.events.UiEventNextGameDecision; import forge.game.*; import forge.game.ability.AbilityFactory;