diff --git a/forge-core/src/main/java/forge/CardStorageReader.java b/forge-core/src/main/java/forge/CardStorageReader.java index cb3911172a0..704e6b618a1 100644 --- a/forge-core/src/main/java/forge/CardStorageReader.java +++ b/forge-core/src/main/java/forge/CardStorageReader.java @@ -17,33 +17,17 @@ */ package forge; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.Enumeration; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.concurrent.Callable; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -import org.apache.commons.lang3.time.StopWatch; - import forge.card.CardRules; import forge.util.FileUtil; import forge.util.ThreadUtil; +import org.apache.commons.lang3.time.StopWatch; + +import java.io.*; +import java.nio.charset.Charset; +import java.util.*; +import java.util.concurrent.*; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; /** *

diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java index 43c44a5ac6a..5512ce13330 100644 --- a/forge-core/src/main/java/forge/StaticData.java +++ b/forge-core/src/main/java/forge/StaticData.java @@ -1,9 +1,5 @@ package forge; -import java.io.File; -import java.util.Map; -import java.util.TreeMap; - import forge.card.CardDb; import forge.card.CardEdition; import forge.card.CardRules; @@ -13,6 +9,10 @@ import forge.item.SealedProduct; import forge.util.storage.IStorage; import forge.util.storage.StorageBase; +import java.io.File; +import java.util.Map; +import java.util.TreeMap; + /** * The class holding game invariants, such as cards, editions, game formats. All that data, which is not supposed to be changed by player diff --git a/forge-core/src/main/java/forge/card/BoosterGenerator.java b/forge-core/src/main/java/forge/card/BoosterGenerator.java index f0c07f56bea..8f2ee9cd1db 100644 --- a/forge-core/src/main/java/forge/card/BoosterGenerator.java +++ b/forge-core/src/main/java/forge/card/BoosterGenerator.java @@ -17,31 +17,22 @@ */ package forge.card; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; - - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.StaticData; import forge.card.CardEdition.FoilType; -import forge.item.PaperCard; import forge.item.IPaperCard; +import forge.item.PaperCard; import forge.item.SealedProduct; import forge.util.Aggregates; import forge.util.MyRandom; import forge.util.TextUtil; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.*; /** *

diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java index 0ea5243ffed..5e060ef2b5c 100644 --- a/forge-core/src/main/java/forge/card/CardDb.java +++ b/forge-core/src/main/java/forge/card/CardDb.java @@ -17,35 +17,20 @@ */ package forge.card; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimaps; - import forge.card.CardEdition.CardInSet; import forge.card.CardEdition.Type; import forge.item.PaperCard; -import forge.util.Aggregates; -import forge.util.CollectionSuppliers; -import forge.util.Lang; -import forge.util.MyRandom; -import forge.util.TextUtil; +import forge.util.*; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.*; +import java.util.Map.Entry; public final class CardDb implements ICardDatabase { public final static String foilSuffix = "+"; diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java index 48688b0e61e..bd87a09207d 100644 --- a/forge-core/src/main/java/forge/card/CardEdition.java +++ b/forge-core/src/main/java/forge/card/CardEdition.java @@ -17,29 +17,10 @@ */ package forge.card; -import java.io.File; -import java.io.FilenameFilter; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; - -import org.apache.commons.lang3.StringUtils; - - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.StaticData; import forge.card.CardDb.SetPreference; import forge.deck.CardPool; @@ -52,6 +33,14 @@ import forge.util.IItemReader; import forge.util.storage.StorageBase; import forge.util.storage.StorageReaderBase; import forge.util.storage.StorageReaderFolder; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.io.FilenameFilter; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.Map.Entry; /** diff --git a/forge-core/src/main/java/forge/card/CardFace.java b/forge-core/src/main/java/forge/card/CardFace.java index 6712b629d47..c272d8722be 100644 --- a/forge-core/src/main/java/forge/card/CardFace.java +++ b/forge-core/src/main/java/forge/card/CardFace.java @@ -1,15 +1,10 @@ package forge.card; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.TreeMap; - +import forge.card.mana.ManaCost; import org.apache.commons.lang3.StringUtils; -import forge.card.mana.ManaCost; +import java.util.*; +import java.util.Map.Entry; // // DO NOT AUTOFORMAT / CHECKSTYLE THIS FILE diff --git a/forge-core/src/main/java/forge/card/CardRules.java b/forge-core/src/main/java/forge/card/CardRules.java index d353a82ec4e..e5190db9325 100644 --- a/forge-core/src/main/java/forge/card/CardRules.java +++ b/forge-core/src/main/java/forge/card/CardRules.java @@ -17,14 +17,13 @@ */ package forge.card; -import java.util.List; -import java.util.StringTokenizer; - -import org.apache.commons.lang3.StringUtils; - import forge.card.mana.IParserManaCost; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.StringTokenizer; /** * A collection of methods containing full diff --git a/forge-core/src/main/java/forge/card/CardRulesPredicates.java b/forge-core/src/main/java/forge/card/CardRulesPredicates.java index e680bb5658e..a3bd407fbab 100644 --- a/forge-core/src/main/java/forge/card/CardRulesPredicates.java +++ b/forge-core/src/main/java/forge/card/CardRulesPredicates.java @@ -1,15 +1,14 @@ package forge.card; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; - import forge.util.ComparableOp; import forge.util.PredicateString; +import java.util.ArrayList; +import java.util.List; + /** * Filtering conditions specific for CardRules class, defined here along with * some presets. diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java index 0667621dd76..800e301fb04 100644 --- a/forge-core/src/main/java/forge/card/CardType.java +++ b/forge-core/src/main/java/forge/card/CardType.java @@ -17,13 +17,13 @@ */ package forge.card; +import org.apache.commons.lang3.StringUtils; + import java.util.ArrayList; import java.util.EnumSet; import java.util.HashMap; import java.util.List; -import org.apache.commons.lang3.StringUtils; - /** *

* Immutable Card type. Can be built only from parsing a string. diff --git a/forge-core/src/main/java/forge/card/ColorSet.java b/forge-core/src/main/java/forge/card/ColorSet.java index 325984e4018..7bda7c128b3 100644 --- a/forge-core/src/main/java/forge/card/ColorSet.java +++ b/forge-core/src/main/java/forge/card/ColorSet.java @@ -17,14 +17,13 @@ */ package forge.card; -import java.util.Iterator; -import java.util.NoSuchElementException; - import com.google.common.collect.UnmodifiableIterator; - import forge.card.mana.ManaCost; import forge.util.BinaryUtil; +import java.util.Iterator; +import java.util.NoSuchElementException; + /** *

CardColor class.

*

Represents a set of any number of colors out of 5 possible in the game

diff --git a/forge-core/src/main/java/forge/card/DeckHints.java b/forge-core/src/main/java/forge/card/DeckHints.java index 0f3c3b8c634..1f6618623b1 100644 --- a/forge-core/src/main/java/forge/card/DeckHints.java +++ b/forge-core/src/main/java/forge/card/DeckHints.java @@ -1,18 +1,17 @@ package forge.card; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.item.PaperCard; import forge.util.PredicateString.StringOp; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** * DeckHints provides the ability for a Card to "want" another Card or type of * Cards in its random deck. diff --git a/forge-core/src/main/java/forge/card/ICardDatabase.java b/forge-core/src/main/java/forge/card/ICardDatabase.java index b22d065e920..c8ece9228c1 100644 --- a/forge-core/src/main/java/forge/card/ICardDatabase.java +++ b/forge-core/src/main/java/forge/card/ICardDatabase.java @@ -1,14 +1,13 @@ package forge.card; +import com.google.common.base.Predicate; +import forge.card.CardDb.SetPreference; +import forge.item.PaperCard; + import java.util.Collection; import java.util.Date; import java.util.List; -import com.google.common.base.Predicate; - -import forge.card.CardDb.SetPreference; -import forge.item.PaperCard; - public interface ICardDatabase extends Iterable { PaperCard getCard(String cardName); PaperCard getCard(String cardName, String edition); diff --git a/forge-core/src/main/java/forge/card/IUnOpenedProduct.java b/forge-core/src/main/java/forge/card/IUnOpenedProduct.java index bff54703f7f..c2a7eb85b2e 100644 --- a/forge-core/src/main/java/forge/card/IUnOpenedProduct.java +++ b/forge-core/src/main/java/forge/card/IUnOpenedProduct.java @@ -1,11 +1,10 @@ package forge.card; -import java.util.List; - import com.google.common.base.Supplier; - import forge.item.PaperCard; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-core/src/main/java/forge/card/MagicColor.java b/forge-core/src/main/java/forge/card/MagicColor.java index 3a670d6916c..f9fd57062bb 100644 --- a/forge-core/src/main/java/forge/card/MagicColor.java +++ b/forge-core/src/main/java/forge/card/MagicColor.java @@ -1,9 +1,9 @@ package forge.card; -import java.util.List; - import com.google.common.collect.ImmutableList; +import java.util.List; + /** * Holds byte values for each color magic has. * diff --git a/forge-core/src/main/java/forge/card/PrintSheet.java b/forge-core/src/main/java/forge/card/PrintSheet.java index d37b201daa0..82a95f3a9e9 100644 --- a/forge-core/src/main/java/forge/card/PrintSheet.java +++ b/forge-core/src/main/java/forge/card/PrintSheet.java @@ -1,19 +1,18 @@ package forge.card; -import java.io.File; -import java.util.List; -import java.util.Map.Entry; -import java.util.ArrayList; -import java.util.Collection; - import com.google.common.base.Function; - -import forge.util.ItemPool; import forge.deck.CardPool; import forge.item.PaperCard; +import forge.util.ItemPool; import forge.util.MyRandom; import forge.util.storage.StorageReaderFileSections; +import java.io.File; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map.Entry; + /** * TODO: Write javadoc for this type. diff --git a/forge-core/src/main/java/forge/card/UnOpenedProduct.java b/forge-core/src/main/java/forge/card/UnOpenedProduct.java index 6ffaac442c9..7b16b3f6835 100644 --- a/forge-core/src/main/java/forge/card/UnOpenedProduct.java +++ b/forge-core/src/main/java/forge/card/UnOpenedProduct.java @@ -1,20 +1,18 @@ package forge.card; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import forge.StaticData; +import forge.item.PaperCard; +import forge.item.SealedProduct; +import forge.util.ItemPool; +import org.apache.commons.lang3.tuple.Pair; + import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.apache.commons.lang3.tuple.Pair; - -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; - -import forge.StaticData; -import forge.item.PaperCard; -import forge.item.SealedProduct; -import forge.util.ItemPool; - public class UnOpenedProduct implements IUnOpenedProduct { diff --git a/forge-core/src/main/java/forge/deck/CardPool.java b/forge-core/src/main/java/forge/deck/CardPool.java index 442312475e7..3a433dc523b 100644 --- a/forge-core/src/main/java/forge/deck/CardPool.java +++ b/forge-core/src/main/java/forge/deck/CardPool.java @@ -17,22 +17,21 @@ */ package forge.deck; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map.Entry; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.Lists; - import forge.StaticData; import forge.card.CardDb; import forge.item.PaperCard; import forge.util.ItemPool; import forge.util.ItemPoolSorter; import forge.util.MyRandom; +import org.apache.commons.lang3.StringUtils; + +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Deck section. diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java index eed877ce69b..04f809b12a9 100644 --- a/forge-core/src/main/java/forge/deck/Deck.java +++ b/forge-core/src/main/java/forge/deck/Deck.java @@ -17,22 +17,15 @@ */ package forge.deck; -import java.util.Calendar; -import java.util.Date; -import java.util.EnumMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeSet; - import com.google.common.base.Function; import forge.StaticData; - -import forge.card.CardEdition; import forge.card.CardDb.SetPreference; +import forge.card.CardEdition; import forge.item.PaperCard; +import java.util.*; +import java.util.Map.Entry; + /** diff --git a/forge-core/src/main/java/forge/deck/DeckBase.java b/forge-core/src/main/java/forge/deck/DeckBase.java index 136b0ebcf01..012687c290e 100644 --- a/forge-core/src/main/java/forge/deck/DeckBase.java +++ b/forge-core/src/main/java/forge/deck/DeckBase.java @@ -17,10 +17,10 @@ */ package forge.deck; -import java.io.Serializable; - import forge.item.InventoryItem; +import java.io.Serializable; + /** * TODO: Write javadoc for this type. * diff --git a/forge-core/src/main/java/forge/deck/DeckFormat.java b/forge-core/src/main/java/forge/deck/DeckFormat.java index b11a774f29b..e945d82e972 100644 --- a/forge-core/src/main/java/forge/deck/DeckFormat.java +++ b/forge-core/src/main/java/forge/deck/DeckFormat.java @@ -17,21 +17,19 @@ */ package forge.deck; +import forge.StaticData; +import forge.card.CardType; +import forge.card.ColorSet; +import forge.item.IPaperCard; +import forge.item.PaperCard; +import forge.util.Aggregates; +import org.apache.commons.lang3.Range; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map.Entry; - -import org.apache.commons.lang3.Range; - -import forge.StaticData; -import forge.card.CardType; -import forge.card.ColorSet; -import forge.item.PaperCard; -import forge.item.IPaperCard; -import forge.util.Aggregates; - /** * GameType is an enum to determine the type of current game. :) */ diff --git a/forge-core/src/main/java/forge/deck/DeckGroup.java b/forge-core/src/main/java/forge/deck/DeckGroup.java index 2c444f5ba52..b81abfa184d 100644 --- a/forge-core/src/main/java/forge/deck/DeckGroup.java +++ b/forge-core/src/main/java/forge/deck/DeckGroup.java @@ -17,13 +17,13 @@ */ package forge.deck; +import com.google.common.base.Function; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import com.google.common.base.Function; - /** * TODO: Write javadoc for this type. * diff --git a/forge-core/src/main/java/forge/deck/DeckRecognizer.java b/forge-core/src/main/java/forge/deck/DeckRecognizer.java index 158af415044..5bdc62ba408 100644 --- a/forge-core/src/main/java/forge/deck/DeckRecognizer.java +++ b/forge-core/src/main/java/forge/deck/DeckRecognizer.java @@ -17,17 +17,16 @@ */ package forge.deck; -import java.util.Calendar; -import java.util.Date; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.lang3.StringUtils; - import forge.card.CardDb; import forge.card.CardDb.SetPreference; import forge.card.ICardDatabase; import forge.item.PaperCard; +import org.apache.commons.lang3.StringUtils; + +import java.util.Calendar; +import java.util.Date; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** *

diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGenerator2Color.java b/forge-core/src/main/java/forge/deck/generation/DeckGenerator2Color.java index 5c3cbd9aac8..2af98d607db 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGenerator2Color.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGenerator2Color.java @@ -17,16 +17,15 @@ */ package forge.deck.generation; -import java.util.Arrays; -import java.util.List; - -import org.apache.commons.lang3.tuple.ImmutablePair; import com.google.common.collect.Lists; - import forge.card.ColorSet; import forge.card.ICardDatabase; import forge.card.MagicColor; import forge.deck.CardPool; +import org.apache.commons.lang3.tuple.ImmutablePair; + +import java.util.Arrays; +import java.util.List; /** *

diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGenerator3Color.java b/forge-core/src/main/java/forge/deck/generation/DeckGenerator3Color.java index 20ab568ee04..4ca2f99c92e 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGenerator3Color.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGenerator3Color.java @@ -17,17 +17,15 @@ */ package forge.deck.generation; -import java.util.List; - -import org.apache.commons.lang3.tuple.ImmutablePair; - import com.google.common.collect.Lists; - import forge.card.ColorSet; import forge.card.ICardDatabase; import forge.card.MagicColor; import forge.deck.CardPool; import forge.util.MyRandom; +import org.apache.commons.lang3.tuple.ImmutablePair; + +import java.util.List; /** *

diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java b/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java index 642b90ec8e7..0564a5f0388 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java @@ -17,15 +17,13 @@ */ package forge.deck.generation; -import java.util.List; - -import org.apache.commons.lang3.tuple.ImmutablePair; - import com.google.common.collect.Lists; - import forge.card.ColorSet; import forge.card.ICardDatabase; import forge.deck.CardPool; +import org.apache.commons.lang3.tuple.ImmutablePair; + +import java.util.List; /** *

diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java index a107ee108c9..db781135ec6 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java @@ -17,32 +17,21 @@ */ package forge.deck.generation; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; -import java.util.TreeMap; - -import org.apache.commons.lang3.tuple.ImmutablePair; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - -import forge.card.CardRules; -import forge.card.CardRulesPredicates; -import forge.card.ColorSet; -import forge.card.ICardDatabase; -import forge.card.MagicColor; +import forge.card.*; import forge.card.mana.ManaCost; import forge.deck.CardPool; import forge.item.PaperCard; import forge.util.Aggregates; import forge.util.ItemPool; import forge.util.MyRandom; +import org.apache.commons.lang3.tuple.ImmutablePair; + +import java.util.*; +import java.util.Map.Entry; /** *

diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorMonoColor.java b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorMonoColor.java index 52d49a24a90..81b6a58e8cc 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorMonoColor.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorMonoColor.java @@ -17,16 +17,14 @@ */ package forge.deck.generation; -import java.util.List; - -import org.apache.commons.lang3.tuple.ImmutablePair; - import com.google.common.collect.Lists; - import forge.card.ColorSet; import forge.card.ICardDatabase; import forge.card.MagicColor; import forge.deck.CardPool; +import org.apache.commons.lang3.tuple.ImmutablePair; + +import java.util.List; /** *

diff --git a/forge-core/src/main/java/forge/deck/io/DeckFileHeader.java b/forge-core/src/main/java/forge/deck/io/DeckFileHeader.java index b432afe309f..06a06926c88 100644 --- a/forge-core/src/main/java/forge/deck/io/DeckFileHeader.java +++ b/forge-core/src/main/java/forge/deck/io/DeckFileHeader.java @@ -17,13 +17,12 @@ */ package forge.deck.io; -import java.util.Set; -import java.util.TreeSet; - -import org.apache.commons.lang3.StringUtils; - import forge.deck.DeckFormat; import forge.util.FileSection; +import org.apache.commons.lang3.StringUtils; + +import java.util.Set; +import java.util.TreeSet; /** * TODO: Write javadoc for this type. diff --git a/forge-core/src/main/java/forge/deck/io/DeckSerializer.java b/forge-core/src/main/java/forge/deck/io/DeckSerializer.java index 3ee898aac07..ab837d48773 100644 --- a/forge-core/src/main/java/forge/deck/io/DeckSerializer.java +++ b/forge-core/src/main/java/forge/deck/io/DeckSerializer.java @@ -1,13 +1,5 @@ package forge.deck.io; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.commons.lang3.StringUtils; - import forge.card.CardDb; import forge.deck.CardPool; import forge.deck.Deck; @@ -16,6 +8,13 @@ import forge.item.IPaperCard; import forge.util.FileSection; import forge.util.FileSectionManual; import forge.util.FileUtil; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; public class DeckSerializer { diff --git a/forge-core/src/main/java/forge/deck/io/DeckStorage.java b/forge-core/src/main/java/forge/deck/io/DeckStorage.java index 02f49d77277..e92e11cdb4e 100644 --- a/forge-core/src/main/java/forge/deck/io/DeckStorage.java +++ b/forge-core/src/main/java/forge/deck/io/DeckStorage.java @@ -17,13 +17,6 @@ */ package forge.deck.io; -import java.io.File; -import java.io.FilenameFilter; -import java.util.List; -import java.util.Map; - - - import forge.deck.Deck; import forge.util.FileSection; import forge.util.FileUtil; @@ -31,6 +24,11 @@ import forge.util.IItemReader; import forge.util.IItemSerializer; import forge.util.storage.StorageReaderFolder; +import java.io.File; +import java.io.FilenameFilter; +import java.util.List; +import java.util.Map; + /** * This class knows how to make a file out of a deck object and vice versa. */ diff --git a/forge-core/src/main/java/forge/item/BoosterPack.java b/forge-core/src/main/java/forge/item/BoosterPack.java index 031c2a6461e..e2ae80aaae9 100644 --- a/forge-core/src/main/java/forge/item/BoosterPack.java +++ b/forge-core/src/main/java/forge/item/BoosterPack.java @@ -19,7 +19,6 @@ package forge.item; import com.google.common.base.Function; - import forge.StaticData; import forge.card.CardEdition; import forge.util.MyRandom; diff --git a/forge-core/src/main/java/forge/item/FatPack.java b/forge-core/src/main/java/forge/item/FatPack.java index ef6cf1ae969..3e7e7a522d4 100644 --- a/forge-core/src/main/java/forge/item/FatPack.java +++ b/forge-core/src/main/java/forge/item/FatPack.java @@ -18,19 +18,17 @@ package forge.item; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Function; - import forge.StaticData; import forge.card.BoosterGenerator; import forge.card.CardEdition; import forge.util.TextUtil; import forge.util.storage.StorageReaderFile; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.List; public class FatPack extends SealedProduct { public static final Function FN_FROM_SET = new Function() { diff --git a/forge-core/src/main/java/forge/item/IPaperCard.java b/forge-core/src/main/java/forge/item/IPaperCard.java index a6da09e699d..3f6436cfd29 100644 --- a/forge-core/src/main/java/forge/item/IPaperCard.java +++ b/forge-core/src/main/java/forge/item/IPaperCard.java @@ -1,18 +1,17 @@ package forge.item; +import com.google.common.base.Predicate; +import com.google.common.collect.Lists; +import forge.card.CardRarity; +import forge.card.CardRules; +import forge.util.PredicateString; +import org.apache.commons.lang3.StringUtils; + import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang3.StringUtils; - -import com.google.common.base.Predicate; -import com.google.common.collect.Lists; - //import forge.Card; -import forge.card.CardRarity; -import forge.card.CardRules; -import forge.util.PredicateString; public interface IPaperCard extends InventoryItem { diff --git a/forge-core/src/main/java/forge/item/PaperCard.java b/forge-core/src/main/java/forge/item/PaperCard.java index f954e5aaab5..17e4f888e94 100644 --- a/forge-core/src/main/java/forge/item/PaperCard.java +++ b/forge-core/src/main/java/forge/item/PaperCard.java @@ -18,7 +18,6 @@ package forge.item; import com.google.common.base.Function; - import forge.card.CardRarity; import forge.card.CardRules; diff --git a/forge-core/src/main/java/forge/item/PaperToken.java b/forge-core/src/main/java/forge/item/PaperToken.java index 0cc75578183..152ee77329d 100644 --- a/forge-core/src/main/java/forge/item/PaperToken.java +++ b/forge-core/src/main/java/forge/item/PaperToken.java @@ -1,11 +1,11 @@ package forge.item; -import java.util.Locale; - import forge.card.CardEdition; import forge.card.CardRarity; import forge.card.CardRules; +import java.util.Locale; + public class PaperToken implements InventoryItemFromSet, IPaperCard { private String name; diff --git a/forge-core/src/main/java/forge/item/PreconDeck.java b/forge-core/src/main/java/forge/item/PreconDeck.java index 6f9df21cea2..cda6a84e45e 100644 --- a/forge-core/src/main/java/forge/item/PreconDeck.java +++ b/forge-core/src/main/java/forge/item/PreconDeck.java @@ -17,13 +17,7 @@ */ package forge.item; -import java.io.File; -import java.io.FilenameFilter; -import java.util.List; -import java.util.Map; - import com.google.common.base.Function; - import forge.StaticData; import forge.deck.Deck; import forge.deck.io.DeckSerializer; @@ -32,6 +26,11 @@ import forge.util.FileSection; import forge.util.FileUtil; import forge.util.storage.StorageReaderFolder; +import java.io.File; +import java.io.FilenameFilter; +import java.util.List; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-core/src/main/java/forge/item/SealedProduct.java b/forge-core/src/main/java/forge/item/SealedProduct.java index d22266ed834..fa35be7ead3 100644 --- a/forge-core/src/main/java/forge/item/SealedProduct.java +++ b/forge-core/src/main/java/forge/item/SealedProduct.java @@ -18,19 +18,11 @@ package forge.item; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.StaticData; import forge.card.BoosterGenerator; import forge.card.BoosterSlots; @@ -38,6 +30,12 @@ import forge.card.CardRulesPredicates; import forge.util.Aggregates; import forge.util.TextUtil; import forge.util.storage.StorageReaderFile; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; public abstract class SealedProduct implements InventoryItemFromSet { protected final Template contents; diff --git a/forge-core/src/main/java/forge/item/TournamentPack.java b/forge-core/src/main/java/forge/item/TournamentPack.java index 2938b6234e0..be95661764d 100644 --- a/forge-core/src/main/java/forge/item/TournamentPack.java +++ b/forge-core/src/main/java/forge/item/TournamentPack.java @@ -17,14 +17,13 @@ */ package forge.item; -import java.util.List; - import com.google.common.base.Function; - import forge.StaticData; import forge.card.BoosterGenerator; import forge.card.CardEdition; +import java.util.List; + public class TournamentPack extends SealedProduct { /** The Constant fnFromSet. */ diff --git a/forge-core/src/main/java/forge/util/Aggregates.java b/forge-core/src/main/java/forge/util/Aggregates.java index a1a507d6069..e43e4a07646 100644 --- a/forge-core/src/main/java/forge/util/Aggregates.java +++ b/forge-core/src/main/java/forge/util/Aggregates.java @@ -1,15 +1,10 @@ package forge.util; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Random; - import com.google.common.base.Function; +import java.util.*; +import java.util.Map.Entry; + /** * TODO: Write javadoc for this type. * diff --git a/forge-core/src/main/java/forge/util/CollectionSuppliers.java b/forge-core/src/main/java/forge/util/CollectionSuppliers.java index c3c1205d29e..1c94ab0d6d7 100644 --- a/forge-core/src/main/java/forge/util/CollectionSuppliers.java +++ b/forge-core/src/main/java/forge/util/CollectionSuppliers.java @@ -1,11 +1,11 @@ package forge.util; +import com.google.common.base.Supplier; + import java.util.ArrayList; import java.util.HashSet; import java.util.TreeSet; -import com.google.common.base.Supplier; - /** * TODO: Write javadoc for this type. * diff --git a/forge-core/src/main/java/forge/util/FileUtil.java b/forge-core/src/main/java/forge/util/FileUtil.java index 703f9b9e4b5..5730a148543 100644 --- a/forge-core/src/main/java/forge/util/FileUtil.java +++ b/forge-core/src/main/java/forge/util/FileUtil.java @@ -17,20 +17,15 @@ */ package forge.util; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.Reader; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; + +import java.io.*; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.regex.Pattern; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; - /** *

* FileUtil class. diff --git a/forge-core/src/main/java/forge/util/ItemPool.java b/forge-core/src/main/java/forge/util/ItemPool.java index 7da8fb85ae2..bcf48201784 100644 --- a/forge-core/src/main/java/forge/util/ItemPool.java +++ b/forge-core/src/main/java/forge/util/ItemPool.java @@ -17,19 +17,13 @@ */ package forge.util; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Hashtable; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.google.common.base.Function; import com.google.common.base.Predicate; - import forge.item.InventoryItem; +import java.util.*; +import java.util.Map.Entry; + /** *

* ItemPool class. diff --git a/forge-core/src/main/java/forge/util/ItemPoolSorter.java b/forge-core/src/main/java/forge/util/ItemPoolSorter.java index 7525c1a6220..005fc748b99 100644 --- a/forge-core/src/main/java/forge/util/ItemPoolSorter.java +++ b/forge-core/src/main/java/forge/util/ItemPoolSorter.java @@ -17,13 +17,12 @@ */ package forge.util; +import com.google.common.base.Function; +import forge.item.PaperCard; + import java.util.Comparator; import java.util.Map.Entry; -import com.google.common.base.Function; - -import forge.item.PaperCard; - /** *

diff --git a/forge-core/src/main/java/forge/util/Lang.java b/forge-core/src/main/java/forge/util/Lang.java index 7b71bd0c80b..bcbcfe17579 100644 --- a/forge-core/src/main/java/forge/util/Lang.java +++ b/forge-core/src/main/java/forge/util/Lang.java @@ -1,13 +1,12 @@ package forge.util; -import java.util.Collection; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; +import org.apache.commons.lang3.StringUtils; + +import java.util.Collection; +import java.util.List; /** * TODO: Write javadoc for this type. diff --git a/forge-core/src/main/java/forge/util/PredicateString.java b/forge-core/src/main/java/forge/util/PredicateString.java index 70ec7415e51..eee01bb9c02 100644 --- a/forge-core/src/main/java/forge/util/PredicateString.java +++ b/forge-core/src/main/java/forge/util/PredicateString.java @@ -17,9 +17,8 @@ */ package forge.util; -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; +import org.apache.commons.lang3.StringUtils; /** * Special predicate class to perform string operations. diff --git a/forge-core/src/main/java/forge/util/TextUtil.java b/forge-core/src/main/java/forge/util/TextUtil.java index 8d3ecb6ab3d..30e68c3c503 100644 --- a/forge-core/src/main/java/forge/util/TextUtil.java +++ b/forge-core/src/main/java/forge/util/TextUtil.java @@ -1,5 +1,9 @@ package forge.util; +import forge.item.PaperCard; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.StringUtils; + import java.awt.event.KeyEvent; import java.util.ArrayList; import java.util.List; @@ -7,11 +11,6 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.StringUtils; - -import forge.item.PaperCard; - /** * TODO: Write javadoc for this type. * diff --git a/forge-core/src/main/java/forge/util/ThreadUtil.java b/forge-core/src/main/java/forge/util/ThreadUtil.java index 0d7a059d44b..3ab0062e6e7 100644 --- a/forge-core/src/main/java/forge/util/ThreadUtil.java +++ b/forge-core/src/main/java/forge/util/ThreadUtil.java @@ -1,10 +1,6 @@ package forge.util; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; +import java.util.concurrent.*; public class ThreadUtil { static { diff --git a/forge-core/src/main/java/forge/util/maps/EnumMapOfLists.java b/forge-core/src/main/java/forge/util/maps/EnumMapOfLists.java index 9e9482c7b56..afc92c0b4db 100644 --- a/forge-core/src/main/java/forge/util/maps/EnumMapOfLists.java +++ b/forge-core/src/main/java/forge/util/maps/EnumMapOfLists.java @@ -1,12 +1,12 @@ package forge.util.maps; +import com.google.common.base.Supplier; + import java.util.Collection; import java.util.EnumMap; import java.util.List; import java.util.Map; -import com.google.common.base.Supplier; - public class EnumMapOfLists, V> extends EnumMap> implements MapOfLists { private final Supplier> factory; diff --git a/forge-core/src/main/java/forge/util/maps/HashMapOfLists.java b/forge-core/src/main/java/forge/util/maps/HashMapOfLists.java index e76dee73b13..5b19c7cd4b9 100644 --- a/forge-core/src/main/java/forge/util/maps/HashMapOfLists.java +++ b/forge-core/src/main/java/forge/util/maps/HashMapOfLists.java @@ -1,12 +1,12 @@ package forge.util.maps; +import com.google.common.base.Supplier; + import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.google.common.base.Supplier; - public class HashMapOfLists extends HashMap> implements MapOfLists { private final Supplier> factory; diff --git a/forge-core/src/main/java/forge/util/storage/IStorage.java b/forge-core/src/main/java/forge/util/storage/IStorage.java index c0f1bd48421..bca7ac3be20 100644 --- a/forge-core/src/main/java/forge/util/storage/IStorage.java +++ b/forge-core/src/main/java/forge/util/storage/IStorage.java @@ -17,12 +17,11 @@ */ package forge.util.storage; -import java.util.Collection; - import com.google.common.base.Predicate; - import forge.util.IHasName; +import java.util.Collection; + /** * TODO: Write javadoc for this type. * diff --git a/forge-core/src/main/java/forge/util/storage/StorageBase.java b/forge-core/src/main/java/forge/util/storage/StorageBase.java index 06f1e8342ab..97de009c62c 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageBase.java +++ b/forge-core/src/main/java/forge/util/storage/StorageBase.java @@ -17,17 +17,12 @@ */ package forge.util.storage; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; - import forge.util.IItemReader; +import java.util.*; + /** *

* StorageBase class. diff --git a/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java b/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java index 52d6fc76b0b..516527bdf5a 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java +++ b/forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java @@ -17,13 +17,12 @@ */ package forge.util.storage; -import java.io.File; - import com.google.common.base.Function; - import forge.util.IItemSerializer; import forge.util.TextUtil; +import java.io.File; + /** *

* StorageImmediatelySerialized class. diff --git a/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java b/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java index b3e6e6891f3..bc41f8d7dac 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java +++ b/forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java @@ -1,10 +1,10 @@ package forge.util.storage; +import com.google.common.base.Function; + import java.io.File; import java.util.HashMap; -import com.google.common.base.Function; - public class StorageNestedFolders extends StorageBase> { private final File thisFolder; diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java b/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java index 4e66d6408b4..bfcfc6ddf90 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java +++ b/forge-core/src/main/java/forge/util/storage/StorageReaderBase.java @@ -1,12 +1,11 @@ package forge.util.storage; -import java.io.File; - import com.google.common.base.Function; import com.google.common.collect.ImmutableList; - import forge.util.IItemReader; +import java.io.File; + public abstract class StorageReaderBase implements IItemReader { protected final Function keySelector; public StorageReaderBase(final Function keySelector0) { diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java index 068a7a606ae..97f11840369 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java +++ b/forge-core/src/main/java/forge/util/storage/StorageReaderFile.java @@ -17,16 +17,14 @@ */ package forge.util.storage; +import com.google.common.base.Function; +import forge.util.FileUtil; +import org.apache.commons.lang3.StringUtils; + import java.io.File; import java.util.Map; import java.util.TreeMap; -import org.apache.commons.lang3.StringUtils; - -import com.google.common.base.Function; - -import forge.util.FileUtil; - /** * This class treats every line of a given file as a source for a named object. * diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java index ef453283335..a3395f9230a 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java +++ b/forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java @@ -17,18 +17,16 @@ */ package forge.util.storage; +import com.google.common.base.Function; +import forge.util.FileUtil; +import org.apache.commons.lang3.StringUtils; + import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.apache.commons.lang3.StringUtils; - -import com.google.common.base.Function; - -import forge.util.FileUtil; - /** * This class treats every line of a given file as a source for a named object. * diff --git a/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java b/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java index bba63d5e7b7..e52a5956703 100644 --- a/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java +++ b/forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java @@ -17,18 +17,13 @@ */ package forge.util.storage; +import com.google.common.base.Function; + import java.io.File; import java.io.FileFilter; import java.io.FilenameFilter; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.TreeMap; - -import com.google.common.base.Function; +import java.util.*; /** * This class treats every file in the given folder as a source for a named diff --git a/forge-game/src/main/java/forge/ImageKeys.java b/forge-game/src/main/java/forge/ImageKeys.java index 8928e8cd4f9..02803599241 100644 --- a/forge-game/src/main/java/forge/ImageKeys.java +++ b/forge-game/src/main/java/forge/ImageKeys.java @@ -1,13 +1,7 @@ package forge; import forge.card.CardDb; -import forge.item.BoosterPack; -import forge.item.FatPack; -import forge.item.InventoryItem; -import forge.item.PaperCard; -import forge.item.PaperToken; -import forge.item.PreconDeck; -import forge.item.TournamentPack; +import forge.item.*; public class ImageKeys { public static final String CARD_PREFIX = "c:"; diff --git a/forge-game/src/main/java/forge/ai/AiAttackController.java b/forge-game/src/main/java/forge/ai/AiAttackController.java index 34fe742c66e..372a94a4a8d 100644 --- a/forge-game/src/main/java/forge/ai/AiAttackController.java +++ b/forge-game/src/main/java/forge/ai/AiAttackController.java @@ -17,13 +17,8 @@ */ package forge.ai; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; import com.google.common.collect.Lists; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CardLists; @@ -35,6 +30,10 @@ import forge.game.trigger.Trigger; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + //doesHumanAttackAndWin() uses the global variable AllZone.getComputerPlayer() /** diff --git a/forge-game/src/main/java/forge/ai/AiBlockController.java b/forge-game/src/main/java/forge/ai/AiBlockController.java index dae77d3c716..1f293b13ba7 100644 --- a/forge-game/src/main/java/forge/ai/AiBlockController.java +++ b/forge-game/src/main/java/forge/ai/AiBlockController.java @@ -17,13 +17,8 @@ */ package forge.ai; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.game.GameEntity; import forge.game.TriggerReplacementBase; import forge.game.card.Card; @@ -36,6 +31,10 @@ import forge.game.player.Player; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerType; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** *

@@ -227,7 +226,7 @@ public class AiBlockController { // check for triggers when unblocked for (Trigger trigger : attacker.getTriggers()) { - final HashMap trigParams = trigger.getMapParams(); + final Map trigParams = trigger.getMapParams(); TriggerType mode = trigger.getMode(); if (!trigger.requirementsCheck(attacker.getGame())) { diff --git a/forge-game/src/main/java/forge/ai/AiController.java b/forge-game/src/main/java/forge/ai/AiController.java index 307f49d8392..032bb99d6bf 100644 --- a/forge-game/src/main/java/forge/ai/AiController.java +++ b/forge-game/src/main/java/forge/ai/AiController.java @@ -17,55 +17,39 @@ */ package forge.ai; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.esotericsoftware.minlog.Log; import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.card.CardType; import forge.card.MagicColor; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; -import forge.game.GameActionUtil; import forge.game.Game; +import forge.game.GameActionUtil; import forge.game.GameEntity; import forge.game.ability.ApiType; -import forge.game.card.Card; -import forge.game.card.CardFactoryUtil; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; +import forge.game.card.*; import forge.game.card.CardPredicates.Presets; -import forge.game.card.CounterType; import forge.game.combat.Combat; import forge.game.cost.CostDiscard; import forge.game.cost.CostPart; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; -import forge.game.spellability.Ability; -import forge.game.spellability.AbilityManaPart; -import forge.game.spellability.Spell; -import forge.game.spellability.SpellAbility; -import forge.game.spellability.SpellPermanent; +import forge.game.spellability.*; import forge.game.zone.ZoneType; import forge.item.PaperCard; import forge.util.Aggregates; import forge.util.Expressions; import forge.util.MyRandom; +import java.util.*; +import java.util.Map.Entry; + /** *

* ComputerAI_General class. diff --git a/forge-game/src/main/java/forge/ai/AiCostDecision.java b/forge-game/src/main/java/forge/ai/AiCostDecision.java index 6bb581e4ac7..9aad468fcc1 100644 --- a/forge-game/src/main/java/forge/ai/AiCostDecision.java +++ b/forge-game/src/main/java/forge/ai/AiCostDecision.java @@ -1,53 +1,25 @@ package forge.ai; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.collect.Lists; - import forge.card.CardType; import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; -import forge.game.card.CounterType; import forge.game.card.CardPredicates.Presets; -import forge.game.cost.CostAddMana; -import forge.game.cost.CostChooseCreatureType; -import forge.game.cost.CostDamage; -import forge.game.cost.CostDecisionMakerBase; -import forge.game.cost.CostDiscard; -import forge.game.cost.CostDraw; -import forge.game.cost.CostExile; -import forge.game.cost.CostExiledMoveToGrave; -import forge.game.cost.CostFlipCoin; -import forge.game.cost.CostGainControl; -import forge.game.cost.CostGainLife; -import forge.game.cost.CostMill; -import forge.game.cost.CostPartMana; -import forge.game.cost.CostPayLife; -import forge.game.cost.CostPutCardToLib; -import forge.game.cost.CostPutCounter; -import forge.game.cost.CostRemoveAnyCounter; -import forge.game.cost.CostRemoveCounter; -import forge.game.cost.CostReturn; -import forge.game.cost.CostReveal; -import forge.game.cost.CostSacrifice; -import forge.game.cost.CostTap; -import forge.game.cost.CostTapType; -import forge.game.cost.CostUnattach; -import forge.game.cost.CostUntap; -import forge.game.cost.CostUntapType; -import forge.game.cost.PaymentDecision; -import forge.game.cost.ICostVisitor; +import forge.game.card.CounterType; +import forge.game.cost.*; import forge.game.player.Player; import forge.game.player.PlayerControllerAi; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class AiCostDecision extends CostDecisionMakerBase implements ICostVisitor { diff --git a/forge-game/src/main/java/forge/ai/AiProfileUtil.java b/forge-game/src/main/java/forge/ai/AiProfileUtil.java index 632ecf50af4..695dd7e9f13 100644 --- a/forge-game/src/main/java/forge/ai/AiProfileUtil.java +++ b/forge-game/src/main/java/forge/ai/AiProfileUtil.java @@ -21,14 +21,13 @@ import forge.game.player.LobbyPlayer; import forge.game.player.LobbyPlayerAi; import forge.util.Aggregates; import forge.util.FileUtil; +import org.apache.commons.lang3.ArrayUtils; import java.io.File; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.ArrayList; - -import org.apache.commons.lang3.ArrayUtils; /** * Holds default AI personality profile values in an enum. diff --git a/forge-game/src/main/java/forge/ai/ComputerUtil.java b/forge-game/src/main/java/forge/ai/ComputerUtil.java index f6792adc27b..11c00d672f1 100644 --- a/forge-game/src/main/java/forge/ai/ComputerUtil.java +++ b/forge-game/src/main/java/forge/ai/ComputerUtil.java @@ -17,41 +17,22 @@ */ package forge.ai; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; - import forge.card.CardType; -import forge.card.MagicColor; import forge.card.CardType.Constant; +import forge.card.MagicColor; import forge.game.Game; import forge.game.GameObject; import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; import forge.game.ability.effects.CharmEffect; -import forge.game.card.Card; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; -import forge.game.card.CardUtil; -import forge.game.card.CounterType; +import forge.game.card.*; import forge.game.card.CardPredicates.Presets; import forge.game.combat.Combat; import forge.game.combat.CombatUtil; -import forge.game.cost.Cost; -import forge.game.cost.CostDiscard; -import forge.game.cost.CostPart; -import forge.game.cost.CostPayment; -import forge.game.cost.CostPutCounter; -import forge.game.cost.CostSacrifice; +import forge.game.cost.*; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; @@ -67,6 +48,9 @@ import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.MyRandom; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; /** @@ -1754,7 +1738,7 @@ public class ComputerUtil { theTriggers.addAll(card.getTriggers()); } for (Trigger trigger : theTriggers) { - HashMap trigParams = trigger.getMapParams(); + Map trigParams = trigger.getMapParams(); final Card source = trigger.getHostCard(); diff --git a/forge-game/src/main/java/forge/ai/ComputerUtilCard.java b/forge-game/src/main/java/forge/ai/ComputerUtilCard.java index e3bc2c5866f..c16c91b14c8 100644 --- a/forge-game/src/main/java/forge/ai/ComputerUtilCard.java +++ b/forge-game/src/main/java/forge/ai/ComputerUtilCard.java @@ -1,22 +1,9 @@ package forge.ai; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.commons.lang3.tuple.MutablePair; -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; - import forge.card.CardType; import forge.card.ColorSet; import forge.card.MagicColor; @@ -24,17 +11,18 @@ import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; import forge.game.Game; -import forge.game.card.Card; -import forge.game.card.CardFactoryUtil; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; -import forge.game.card.CardUtil; +import forge.game.card.*; import forge.game.combat.Combat; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.item.PaperCard; import forge.util.Aggregates; +import org.apache.commons.lang3.tuple.MutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.*; +import java.util.Map.Entry; /** * TODO: Write javadoc for this type. diff --git a/forge-game/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-game/src/main/java/forge/ai/ComputerUtilCombat.java index 00562807500..e2283992b1a 100644 --- a/forge-game/src/main/java/forge/ai/ComputerUtilCombat.java +++ b/forge-game/src/main/java/forge/ai/ComputerUtilCombat.java @@ -17,13 +17,7 @@ */ package forge.ai; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import com.google.common.base.Predicate; - import forge.game.Game; import forge.game.GameEntity; import forge.game.GlobalRuleChange; @@ -47,6 +41,11 @@ import forge.game.trigger.TriggerHandler; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** *

@@ -605,7 +604,7 @@ public class ComputerUtilCombat { public static boolean combatTriggerWillTrigger(final Card attacker, final Card defender, final Trigger trigger, Combat combat) { final Game game = attacker.getGame(); - final HashMap trigParams = trigger.getMapParams(); + final Map trigParams = trigger.getMapParams(); boolean willTrigger = false; final Card source = trigger.getHostCard(); if (combat == null) { @@ -789,7 +788,7 @@ public class ComputerUtilCombat { } theTriggers.addAll(attacker.getTriggers()); for (final Trigger trigger : theTriggers) { - final HashMap trigParams = trigger.getMapParams(); + final Map trigParams = trigger.getMapParams(); final Card source = trigger.getHostCard(); if (!ComputerUtilCombat.combatTriggerWillTrigger(attacker, defender, trigger, null) @@ -902,7 +901,7 @@ public class ComputerUtilCombat { } theTriggers.addAll(attacker.getTriggers()); for (final Trigger trigger : theTriggers) { - final HashMap trigParams = trigger.getMapParams(); + final Map trigParams = trigger.getMapParams(); final Card source = trigger.getHostCard(); if (!ComputerUtilCombat.combatTriggerWillTrigger(attacker, defender, trigger, null) @@ -1079,7 +1078,7 @@ public class ComputerUtilCombat { } for (final Trigger trigger : theTriggers) { - final HashMap trigParams = trigger.getMapParams(); + final Map trigParams = trigger.getMapParams(); final Card source = trigger.getHostCard(); if (!ComputerUtilCombat.combatTriggerWillTrigger(attacker, defender, trigger, combat) @@ -1245,7 +1244,7 @@ public class ComputerUtilCombat { } for (final Trigger trigger : theTriggers) { - final HashMap trigParams = trigger.getMapParams(); + final Map trigParams = trigger.getMapParams(); final Card source = trigger.getHostCard(); if (!ComputerUtilCombat.combatTriggerWillTrigger(attacker, defender, trigger, combat) @@ -1376,7 +1375,7 @@ public class ComputerUtilCombat { theTriggers.addAll(card.getTriggers()); } for (Trigger trigger : theTriggers) { - HashMap trigParams = trigger.getMapParams(); + Map trigParams = trigger.getMapParams(); final Card source = trigger.getHostCard(); if (!ComputerUtilCombat.combatTriggerWillTrigger(attacker, defender, trigger, null)) { @@ -1431,7 +1430,7 @@ public class ComputerUtilCombat { theTriggers.addAll(card.getTriggers()); } for (Trigger trigger : theTriggers) { - HashMap trigParams = trigger.getMapParams(); + Map trigParams = trigger.getMapParams(); final Card source = trigger.getHostCard(); if (!ComputerUtilCombat.combatTriggerWillTrigger(attacker, defender, trigger, null)) { diff --git a/forge-game/src/main/java/forge/ai/ComputerUtilCost.java b/forge-game/src/main/java/forge/ai/ComputerUtilCost.java index 5a471d0a570..97b8cb8df01 100644 --- a/forge-game/src/main/java/forge/ai/ComputerUtilCost.java +++ b/forge-game/src/main/java/forge/ai/ComputerUtilCost.java @@ -1,28 +1,19 @@ package forge.ai; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; -import forge.game.cost.Cost; -import forge.game.cost.CostDamage; -import forge.game.cost.CostDiscard; -import forge.game.cost.CostPart; -import forge.game.cost.CostPayLife; -import forge.game.cost.CostPayment; -import forge.game.cost.CostPutCounter; -import forge.game.cost.CostRemoveCounter; -import forge.game.cost.CostSacrifice; +import forge.game.cost.*; import forge.game.player.Player; import forge.game.spellability.Spell; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.TextUtil; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; /** * TODO: Write javadoc for this type. diff --git a/forge-game/src/main/java/forge/ai/ComputerUtilMana.java b/forge-game/src/main/java/forge/ai/ComputerUtilMana.java index 2c1d51573bf..a2387cdaeb5 100644 --- a/forge-game/src/main/java/forge/ai/ComputerUtilMana.java +++ b/forge-game/src/main/java/forge/ai/ComputerUtilMana.java @@ -1,21 +1,8 @@ package forge.ai; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; - import forge.card.MagicColor; import forge.card.mana.ManaAtom; import forge.card.mana.ManaCost; @@ -41,6 +28,10 @@ import forge.util.CollectionSuppliers; import forge.util.TextUtil; import forge.util.maps.EnumMapOfLists; import forge.util.maps.MapOfLists; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; +import java.util.Map.Entry; /** * TODO: Write javadoc for this type. diff --git a/forge-game/src/main/java/forge/ai/SpellAbilityAi.java b/forge-game/src/main/java/forge/ai/SpellAbilityAi.java index 583f13e1462..69d3744beda 100644 --- a/forge-game/src/main/java/forge/ai/SpellAbilityAi.java +++ b/forge-game/src/main/java/forge/ai/SpellAbilityAi.java @@ -1,11 +1,7 @@ package forge.ai; -import java.util.Collection; -import java.util.List; - import com.google.common.collect.Iterables; - import forge.game.GameEntity; import forge.game.ability.SaTargetRoutines; import forge.game.card.Card; @@ -17,6 +13,9 @@ import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.Collection; +import java.util.List; + public abstract class SpellAbilityAi extends SaTargetRoutines { public final boolean canPlayAIWithSubs(final Player aiPlayer, final SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/ai/ability/AddTurnAi.java b/forge-game/src/main/java/forge/ai/ability/AddTurnAi.java index a2570608262..c9a81b69c78 100644 --- a/forge-game/src/main/java/forge/ai/ability/AddTurnAi.java +++ b/forge-game/src/main/java/forge/ai/ability/AddTurnAi.java @@ -17,13 +17,13 @@ */ package forge.ai.ability; -import java.util.List; - import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityUtils; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + /** *

* AbilityFactory_Turns class. diff --git a/forge-game/src/main/java/forge/ai/ability/AnimateAi.java b/forge-game/src/main/java/forge/ai/ability/AnimateAi.java index c70e7b399b5..3bf122918bc 100644 --- a/forge-game/src/main/java/forge/ai/ability/AnimateAi.java +++ b/forge-game/src/main/java/forge/ai/ability/AnimateAi.java @@ -1,9 +1,6 @@ package forge.ai.ability; -import java.util.List; - import com.google.common.collect.Iterables; - import forge.ai.SpellAbilityAi; import forge.game.Game; import forge.game.ability.AbilityUtils; @@ -16,6 +13,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.List; + /** *

* AbilityFactoryAnimate class. diff --git a/forge-game/src/main/java/forge/ai/ability/AttachAi.java b/forge-game/src/main/java/forge/ai/ability/AttachAi.java index 8946482e6b7..68c6c4e2e57 100644 --- a/forge-game/src/main/java/forge/ai/ability/AttachAi.java +++ b/forge-game/src/main/java/forge/ai/ability/AttachAi.java @@ -1,29 +1,12 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCard; -import forge.ai.ComputerUtilCost; -import forge.ai.ComputerUtilMana; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.game.GameObject; import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; -import forge.game.card.Card; -import forge.game.card.CardFactoryUtil; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; -import forge.game.card.CardUtil; +import forge.game.card.*; import forge.game.combat.CombatUtil; import forge.game.cost.Cost; import forge.game.phase.PhaseHandler; @@ -37,6 +20,8 @@ import forge.game.trigger.Trigger; import forge.game.trigger.TriggerType; import forge.util.MyRandom; +import java.util.*; + public class AttachAi extends SpellAbilityAi { /* (non-Javadoc) @@ -778,7 +763,7 @@ public class AttachAi extends SpellAbilityAi { for (Card target : list) { for (Trigger t : target.getTriggers()) { if (t.getMode() == TriggerType.SpellCast) { - final HashMap params = t.getMapParams(); + final Map params = t.getMapParams(); if ("Card.Self".equals(params.get("TargetsValid")) && "You".equals(params.get("ValidActivatingPlayer"))) { magnetList.add(target); break; diff --git a/forge-game/src/main/java/forge/ai/ability/BalanceAi.java b/forge-game/src/main/java/forge/ai/ability/BalanceAi.java index 0656fd72e9b..59c6b89a10c 100644 --- a/forge-game/src/main/java/forge/ai/ability/BalanceAi.java +++ b/forge-game/src/main/java/forge/ai/ability/BalanceAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; @@ -11,6 +9,8 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; + public class BalanceAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/BecomesBlockedAi.java b/forge-game/src/main/java/forge/ai/ability/BecomesBlockedAi.java index a98abe5a271..09822d8fd3f 100644 --- a/forge-game/src/main/java/forge/ai/ability/BecomesBlockedAi.java +++ b/forge-game/src/main/java/forge/ai/ability/BecomesBlockedAi.java @@ -1,8 +1,6 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; import forge.game.Game; @@ -14,6 +12,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.List; + public class BecomesBlockedAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/BondAi.java b/forge-game/src/main/java/forge/ai/ability/BondAi.java index 71359218900..fbdd2e9c79c 100644 --- a/forge-game/src/main/java/forge/ai/ability/BondAi.java +++ b/forge-game/src/main/java/forge/ai/ability/BondAi.java @@ -17,14 +17,14 @@ */ package forge.ai.ability; -import java.util.Collection; - import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.Collection; + /** *

* AbilityFactoryBond class. diff --git a/forge-game/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java b/forge-game/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java index 327942b8ef9..c36b0e02528 100644 --- a/forge-game/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java +++ b/forge-game/src/main/java/forge/ai/ability/CanPlayAsDrawbackAi.java @@ -1,12 +1,12 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.SpellAbilityAi; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + public class CanPlayAsDrawbackAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/ChangeZoneAi.java b/forge-game/src/main/java/forge/ai/ability/ChangeZoneAi.java index 9d3f6312c58..ff2355341e2 100644 --- a/forge-game/src/main/java/forge/ai/ability/ChangeZoneAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ChangeZoneAi.java @@ -1,22 +1,10 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - -import forge.ai.AiBlockController; -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCard; -import forge.ai.ComputerUtilCombat; -import forge.ai.ComputerUtilCost; -import forge.ai.ComputerUtilMana; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.card.MagicColor; import forge.game.Game; import forge.game.GameObject; @@ -40,6 +28,11 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Random; + public class ChangeZoneAi extends SpellAbilityAi { /** diff --git a/forge-game/src/main/java/forge/ai/ability/ChangeZoneAllAi.java b/forge-game/src/main/java/forge/ai/ability/ChangeZoneAllAi.java index e1e2c884a32..19b9c8d19e0 100644 --- a/forge-game/src/main/java/forge/ai/ability/ChangeZoneAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ChangeZoneAllAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCost; import forge.ai.SpellAbilityAi; @@ -17,6 +14,9 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class ChangeZoneAllAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/CharmAi.java b/forge-game/src/main/java/forge/ai/ability/CharmAi.java index 140eafe9878..a1d5b3515eb 100644 --- a/forge-game/src/main/java/forge/ai/ability/CharmAi.java +++ b/forge-game/src/main/java/forge/ai/ability/CharmAi.java @@ -1,10 +1,5 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Random; - import forge.ai.SpellAbilityAi; import forge.game.ability.effects.CharmEffect; import forge.game.player.Player; @@ -13,6 +8,11 @@ import forge.game.spellability.SpellAbility; import forge.util.Aggregates; import forge.util.MyRandom; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Random; + public class CharmAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/ChooseCardAi.java b/forge-game/src/main/java/forge/ai/ability/ChooseCardAi.java index c2f70b8a815..d6b6895da33 100644 --- a/forge-game/src/main/java/forge/ai/ability/ChooseCardAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ChooseCardAi.java @@ -1,11 +1,6 @@ package forge.ai.ability; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCombat; import forge.ai.SpellAbilityAi; @@ -20,6 +15,10 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + public class ChooseCardAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java b/forge-game/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java index 491b3e39cf1..e3fdcc10bf1 100644 --- a/forge-game/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java @@ -1,12 +1,12 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.SpellAbilityAi; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.Aggregates; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/ai/ability/ChoosePlayerAi.java b/forge-game/src/main/java/forge/ai/ability/ChoosePlayerAi.java index 6a96ee3c512..ae47a3d622b 100644 --- a/forge-game/src/main/java/forge/ai/ability/ChoosePlayerAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ChoosePlayerAi.java @@ -1,17 +1,16 @@ package forge.ai.ability; -import java.util.Collection; -import java.util.List; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.ai.ComputerUtil; import forge.ai.SpellAbilityAi; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.Collection; +import java.util.List; + public class ChoosePlayerAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/ChooseSourceAi.java b/forge-game/src/main/java/forge/ai/ability/ChooseSourceAi.java index 44eac4b4a7a..a4356326464 100644 --- a/forge-game/src/main/java/forge/ai/ability/ChooseSourceAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ChooseSourceAi.java @@ -1,10 +1,6 @@ package forge.ai.ability; -import java.util.Collection; -import java.util.List; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCombat; import forge.ai.ComputerUtilCost; @@ -24,6 +20,9 @@ import forge.game.spellability.SpellAbilityStackInstance; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.Collection; +import java.util.List; + public class ChooseSourceAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/CloneAi.java b/forge-game/src/main/java/forge/ai/ability/CloneAi.java index 6c87181d239..50885a085db 100644 --- a/forge-game/src/main/java/forge/ai/ability/CloneAi.java +++ b/forge-game/src/main/java/forge/ai/ability/CloneAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.SpellAbilityAi; import forge.game.Game; import forge.game.ability.AbilityUtils; @@ -13,6 +11,8 @@ import forge.game.player.PlayerActionConfirmMode; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.List; + public class CloneAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/ControlExchangeAi.java b/forge-game/src/main/java/forge/ai/ability/ControlExchangeAi.java index b5a41430cfa..8f0fdad8902 100644 --- a/forge-game/src/main/java/forge/ai/ability/ControlExchangeAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ControlExchangeAi.java @@ -1,10 +1,6 @@ package forge.ai.ability; -import java.util.List; -import java.util.Map; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityUtils; @@ -16,6 +12,9 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Map; + public class ControlExchangeAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/ControlGainAi.java b/forge-game/src/main/java/forge/ai/ability/ControlGainAi.java index d9e632cb428..ed14c82d5cf 100644 --- a/forge-game/src/main/java/forge/ai/ability/ControlGainAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ControlGainAi.java @@ -17,12 +17,7 @@ */ package forge.ai.ability; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; import forge.game.Game; @@ -37,6 +32,10 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + //AB:GainControl|ValidTgts$Creature|TgtPrompt$Select target legendary creature|LoseControl$Untap,LoseControl|SpellDescription$Gain control of target xxxxxxx diff --git a/forge-game/src/main/java/forge/ai/ability/CopyPermanentAi.java b/forge-game/src/main/java/forge/ai/ability/CopyPermanentAi.java index 571e392c581..b57d51a0c16 100644 --- a/forge-game/src/main/java/forge/ai/ability/CopyPermanentAi.java +++ b/forge-game/src/main/java/forge/ai/ability/CopyPermanentAi.java @@ -1,11 +1,6 @@ package forge.ai.ability; -import java.util.Collection; -import java.util.List; -import java.util.Map; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; @@ -19,6 +14,10 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.Collection; +import java.util.List; +import java.util.Map; + public class CopyPermanentAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/CountersAi.java b/forge-game/src/main/java/forge/ai/ability/CountersAi.java index fa8cec27099..b233d563ffc 100644 --- a/forge-game/src/main/java/forge/ai/ability/CountersAi.java +++ b/forge-game/src/main/java/forge/ai/ability/CountersAi.java @@ -17,16 +17,15 @@ */ package forge.ai.ability; -import java.util.List; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCard; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; import forge.util.Aggregates; +import java.util.List; + /** *

diff --git a/forge-game/src/main/java/forge/ai/ability/CountersMoveAi.java b/forge-game/src/main/java/forge/ai/ability/CountersMoveAi.java index 71a46c0999b..d84c7b872b9 100644 --- a/forge-game/src/main/java/forge/ai/ability/CountersMoveAi.java +++ b/forge-game/src/main/java/forge/ai/ability/CountersMoveAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityUtils; @@ -16,6 +13,9 @@ import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class CountersMoveAi extends SpellAbilityAi { @Override protected boolean canPlayAI(Player ai, SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/ai/ability/CountersProliferateAi.java b/forge-game/src/main/java/forge/ai/ability/CountersProliferateAi.java index cff1c137996..49867da07d4 100644 --- a/forge-game/src/main/java/forge/ai/ability/CountersProliferateAi.java +++ b/forge-game/src/main/java/forge/ai/ability/CountersProliferateAi.java @@ -1,9 +1,6 @@ package forge.ai.ability; -import java.util.List; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtil; import forge.ai.SpellAbilityAi; import forge.game.card.Card; @@ -13,6 +10,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + public class CountersProliferateAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/CountersPutAi.java b/forge-game/src/main/java/forge/ai/ability/CountersPutAi.java index d93cc0c218b..42cfd753c2f 100644 --- a/forge-game/src/main/java/forge/ai/ability/CountersPutAi.java +++ b/forge-game/src/main/java/forge/ai/ability/CountersPutAi.java @@ -1,18 +1,8 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; - -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCard; -import forge.ai.ComputerUtilCost; -import forge.ai.ComputerUtilMana; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; @@ -28,6 +18,11 @@ import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.MyRandom; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Random; + public class CountersPutAi extends SpellAbilityAi { @Override protected boolean canPlayAI(Player ai, final SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/ai/ability/CountersPutAllAi.java b/forge-game/src/main/java/forge/ai/ability/CountersPutAllAi.java index 12f771158e3..27d77f9e90d 100644 --- a/forge-game/src/main/java/forge/ai/ability/CountersPutAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/CountersPutAllAi.java @@ -1,10 +1,6 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCost; import forge.ai.ComputerUtilMana; import forge.ai.SpellAbilityAi; @@ -22,6 +18,9 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class CountersPutAllAi extends SpellAbilityAi { @Override protected boolean canPlayAI(Player ai, SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java b/forge-game/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java index 9a08edf7dec..471161899db 100644 --- a/forge-game/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java +++ b/forge-game/src/main/java/forge/ai/ability/CountersPutOrRemoveAi.java @@ -17,10 +17,7 @@ */ package forge.ai.ability; -import java.util.List; - import com.google.common.base.Predicate; - import forge.ai.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; @@ -30,6 +27,8 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; + /** *

* AbilityFactory_PutOrRemoveCountersAi class. diff --git a/forge-game/src/main/java/forge/ai/ability/DamageAiBase.java b/forge-game/src/main/java/forge/ai/ability/DamageAiBase.java index f1779200692..bfb00c0e909 100644 --- a/forge-game/src/main/java/forge/ai/ability/DamageAiBase.java +++ b/forge-game/src/main/java/forge/ai/ability/DamageAiBase.java @@ -1,9 +1,6 @@ package forge.ai.ability; -import java.util.List; - import com.google.common.collect.Iterables; - import forge.ai.ComputerUtilCombat; import forge.ai.SpellAbilityAi; import forge.game.Game; @@ -14,6 +11,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + public abstract class DamageAiBase extends SpellAbilityAi { protected boolean shouldTgtP(final Player comp, final SpellAbility sa, final int d, final boolean noPrevention) { int restDamage = d; diff --git a/forge-game/src/main/java/forge/ai/ability/DamageAllAi.java b/forge-game/src/main/java/forge/ai/ability/DamageAllAi.java index 3734564c952..66a4d026529 100644 --- a/forge-game/src/main/java/forge/ai/ability/DamageAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DamageAllAi.java @@ -1,16 +1,7 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; - -import forge.ai.ComputerUtilCard; -import forge.ai.ComputerUtilCombat; -import forge.ai.ComputerUtilCost; -import forge.ai.ComputerUtilMana; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; @@ -21,6 +12,10 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public class DamageAllAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-game/src/main/java/forge/ai/ability/DamageDealAi.java index 2d89cd90fef..73e3902b99b 100644 --- a/forge-game/src/main/java/forge/ai/ability/DamageDealAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DamageDealAi.java @@ -1,17 +1,8 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; import com.google.common.collect.Lists; - -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCard; -import forge.ai.ComputerUtilCombat; -import forge.ai.ComputerUtilCost; -import forge.ai.ComputerUtilMana; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.game.Game; import forge.game.GameObject; import forge.game.ability.AbilityUtils; @@ -30,6 +21,9 @@ import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class DamageDealAi extends DamageAiBase { @Override public boolean chkAIDrawback(SpellAbility sa, Player ai) { diff --git a/forge-game/src/main/java/forge/ai/ability/DamagePreventAi.java b/forge-game/src/main/java/forge/ai/ability/DamagePreventAi.java index f7dfee6a91d..2f1e7706370 100644 --- a/forge-game/src/main/java/forge/ai/ability/DamagePreventAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DamagePreventAi.java @@ -1,13 +1,6 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; - -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCard; -import forge.ai.ComputerUtilCombat; -import forge.ai.ComputerUtilCost; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.game.Game; import forge.game.GameObject; import forge.game.ability.AbilityUtils; @@ -24,6 +17,9 @@ import forge.game.spellability.TargetChoices; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class DamagePreventAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/DebuffAi.java b/forge-game/src/main/java/forge/ai/ability/DebuffAi.java index a2b0b69ff43..cfb21ced6e4 100644 --- a/forge-game/src/main/java/forge/ai/ability/DebuffAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DebuffAi.java @@ -1,13 +1,8 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCost; import forge.ai.SpellAbilityAi; @@ -25,6 +20,10 @@ import forge.game.spellability.SpellAbilityRestriction; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class DebuffAi extends SpellAbilityAi { // ************************************************************************* // ***************************** Debuff ************************************ diff --git a/forge-game/src/main/java/forge/ai/ability/DebuffAllAi.java b/forge-game/src/main/java/forge/ai/ability/DebuffAllAi.java index a7305d4c6c4..0632f1d5cf8 100644 --- a/forge-game/src/main/java/forge/ai/ability/DebuffAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DebuffAllAi.java @@ -1,10 +1,6 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; - import forge.ai.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; @@ -15,6 +11,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class DebuffAllAi extends SpellAbilityAi { @Override protected boolean canPlayAI(Player ai, SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/ai/ability/DestroyAi.java b/forge-game/src/main/java/forge/ai/ability/DestroyAi.java index a6a4a4876f8..f2e648ec45c 100644 --- a/forge-game/src/main/java/forge/ai/ability/DestroyAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DestroyAi.java @@ -1,11 +1,6 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCost; @@ -23,6 +18,10 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public class DestroyAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/DestroyAllAi.java b/forge-game/src/main/java/forge/ai/ability/DestroyAllAi.java index 6ba0688c746..78ad43991b4 100644 --- a/forge-game/src/main/java/forge/ai/ability/DestroyAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DestroyAllAi.java @@ -1,10 +1,6 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCost; import forge.ai.ComputerUtilMana; @@ -17,6 +13,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class DestroyAllAi extends SpellAbilityAi { private static final Predicate predicate = new Predicate() { diff --git a/forge-game/src/main/java/forge/ai/ability/DigAi.java b/forge-game/src/main/java/forge/ai/ability/DigAi.java index 3de3f63ddcc..e445cd04fd7 100644 --- a/forge-game/src/main/java/forge/ai/ability/DigAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DigAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.Collection; -import java.util.Random; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; @@ -15,6 +12,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.Collection; +import java.util.Random; + public class DigAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/DigUntilAi.java b/forge-game/src/main/java/forge/ai/ability/DigUntilAi.java index 296c9a2b4f6..75b685a4cdc 100644 --- a/forge-game/src/main/java/forge/ai/ability/DigUntilAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DigUntilAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import forge.ai.ComputerUtilMana; import forge.ai.SpellAbilityAi; import forge.game.card.Card; @@ -15,6 +12,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class DigUntilAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/DiscardAi.java b/forge-game/src/main/java/forge/ai/ability/DiscardAi.java index 747100416b2..82cbbf40b15 100644 --- a/forge-game/src/main/java/forge/ai/ability/DiscardAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DiscardAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCost; import forge.ai.ComputerUtilMana; @@ -18,6 +15,9 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class DiscardAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/DrainManaAi.java b/forge-game/src/main/java/forge/ai/ability/DrainManaAi.java index 35e263aa287..46887dd690c 100644 --- a/forge-game/src/main/java/forge/ai/ability/DrainManaAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DrainManaAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityUtils; import forge.game.card.Card; @@ -11,6 +8,9 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class DrainManaAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/DrawAi.java b/forge-game/src/main/java/forge/ai/ability/DrawAi.java index b1fedf3dbc3..dd7e61115ee 100644 --- a/forge-game/src/main/java/forge/ai/ability/DrawAi.java +++ b/forge-game/src/main/java/forge/ai/ability/DrawAi.java @@ -18,11 +18,7 @@ */ package forge.ai.ability; -import forge.ai.AiCostDecision; -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCost; -import forge.ai.ComputerUtilMana; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.card.Card; diff --git a/forge-game/src/main/java/forge/ai/ability/EffectAi.java b/forge-game/src/main/java/forge/ai/ability/EffectAi.java index e99fb5c8eab..c5e07abd0c1 100644 --- a/forge-game/src/main/java/forge/ai/ability/EffectAi.java +++ b/forge-game/src/main/java/forge/ai/ability/EffectAi.java @@ -1,11 +1,7 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCombat; import forge.ai.SpellAbilityAi; @@ -23,6 +19,9 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class EffectAi extends SpellAbilityAi { @Override protected boolean canPlayAI(Player ai, SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/ai/ability/EncodeAi.java b/forge-game/src/main/java/forge/ai/ability/EncodeAi.java index 7abb7379556..2b534df5d4a 100644 --- a/forge-game/src/main/java/forge/ai/ability/EncodeAi.java +++ b/forge-game/src/main/java/forge/ai/ability/EncodeAi.java @@ -17,11 +17,7 @@ */ package forge.ai.ability; -import java.util.Collection; -import java.util.List; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; import forge.game.card.Card; @@ -31,6 +27,9 @@ import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; import forge.game.spellability.SpellAbility; +import java.util.Collection; +import java.util.List; + /** *

* AbilityFactoryBond class. diff --git a/forge-game/src/main/java/forge/ai/ability/FightAi.java b/forge-game/src/main/java/forge/ai/ability/FightAi.java index 290278f5c4a..5f9f6b3aef7 100644 --- a/forge-game/src/main/java/forge/ai/ability/FightAi.java +++ b/forge-game/src/main/java/forge/ai/ability/FightAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCombat; @@ -14,6 +11,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class FightAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/HauntAi.java b/forge-game/src/main/java/forge/ai/ability/HauntAi.java index 9513537ebe2..5708f6f806c 100644 --- a/forge-game/src/main/java/forge/ai/ability/HauntAi.java +++ b/forge-game/src/main/java/forge/ai/ability/HauntAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.Collection; -import java.util.List; - import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; import forge.game.card.Card; @@ -10,6 +7,9 @@ import forge.game.card.CardLists; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.Collection; +import java.util.List; + public class HauntAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/LegendaryRuleAi.java b/forge-game/src/main/java/forge/ai/ability/LegendaryRuleAi.java index c8f04cb5805..0fe92cffd7b 100644 --- a/forge-game/src/main/java/forge/ai/ability/LegendaryRuleAi.java +++ b/forge-game/src/main/java/forge/ai/ability/LegendaryRuleAi.java @@ -1,14 +1,13 @@ package forge.ai.ability; -import java.util.Collection; - import com.google.common.collect.Iterables; - import forge.ai.SpellAbilityAi; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.Collection; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/ai/ability/LifeExchangeAi.java b/forge-game/src/main/java/forge/ai/ability/LifeExchangeAi.java index 64dc0375c7f..241ed739733 100644 --- a/forge-game/src/main/java/forge/ai/ability/LifeExchangeAi.java +++ b/forge-game/src/main/java/forge/ai/ability/LifeExchangeAi.java @@ -1,13 +1,13 @@ package forge.ai.ability; -import java.util.Random; - import forge.ai.SpellAbilityAi; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; +import java.util.Random; + public class LifeExchangeAi extends SpellAbilityAi { /* diff --git a/forge-game/src/main/java/forge/ai/ability/LifeGainAi.java b/forge-game/src/main/java/forge/ai/ability/LifeGainAi.java index 4993c5e60c5..0e3e04c1145 100644 --- a/forge-game/src/main/java/forge/ai/ability/LifeGainAi.java +++ b/forge-game/src/main/java/forge/ai/ability/LifeGainAi.java @@ -1,10 +1,6 @@ package forge.ai.ability; -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCombat; -import forge.ai.ComputerUtilCost; -import forge.ai.ComputerUtilMana; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.card.Card; diff --git a/forge-game/src/main/java/forge/ai/ability/LifeLoseAi.java b/forge-game/src/main/java/forge/ai/ability/LifeLoseAi.java index 486dc546667..1aeec2b53b2 100644 --- a/forge-game/src/main/java/forge/ai/ability/LifeLoseAi.java +++ b/forge-game/src/main/java/forge/ai/ability/LifeLoseAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCost; import forge.ai.ComputerUtilMana; @@ -14,6 +12,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.List; + public class LifeLoseAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/LifeSetAi.java b/forge-game/src/main/java/forge/ai/ability/LifeSetAi.java index 65023309c30..4ee73bc437a 100644 --- a/forge-game/src/main/java/forge/ai/ability/LifeSetAi.java +++ b/forge-game/src/main/java/forge/ai/ability/LifeSetAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.Random; - import forge.ai.ComputerUtilMana; import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityUtils; @@ -13,6 +11,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; +import java.util.Random; + public class LifeSetAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/MillAi.java b/forge-game/src/main/java/forge/ai/ability/MillAi.java index 3acf9df4f74..844fb0354bf 100644 --- a/forge-game/src/main/java/forge/ai/ability/MillAi.java +++ b/forge-game/src/main/java/forge/ai/ability/MillAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCost; import forge.ai.ComputerUtilMana; @@ -16,6 +14,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.List; + public class MillAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/MustBlockAi.java b/forge-game/src/main/java/forge/ai/ability/MustBlockAi.java index 328df2e9447..f25d98c0bac 100644 --- a/forge-game/src/main/java/forge/ai/ability/MustBlockAi.java +++ b/forge-game/src/main/java/forge/ai/ability/MustBlockAi.java @@ -1,9 +1,6 @@ package forge.ai.ability; -import java.util.List; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCombat; import forge.ai.SpellAbilityAi; @@ -18,6 +15,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.List; + public class MustBlockAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/PermanentCreatureAi.java b/forge-game/src/main/java/forge/ai/ability/PermanentCreatureAi.java index 0fda55aab7c..164c1356f6b 100644 --- a/forge-game/src/main/java/forge/ai/ability/PermanentCreatureAi.java +++ b/forge-game/src/main/java/forge/ai/ability/PermanentCreatureAi.java @@ -1,10 +1,7 @@ package forge.ai.ability; -import java.util.List; - import com.google.common.base.Predicates; import com.google.common.collect.Iterables; - import forge.ai.ComputerUtil; import forge.ai.SpellAbilityAi; import forge.game.Game; @@ -15,6 +12,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + /** * AbilityFactory for Creature Spells. * diff --git a/forge-game/src/main/java/forge/ai/ability/PhasesAi.java b/forge-game/src/main/java/forge/ai/ability/PhasesAi.java index c7589a455a6..3f40e2dd26e 100644 --- a/forge-game/src/main/java/forge/ai/ability/PhasesAi.java +++ b/forge-game/src/main/java/forge/ai/ability/PhasesAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import forge.ai.SpellAbilityAi; import forge.game.Game; import forge.game.ability.AbilityUtils; @@ -14,6 +11,9 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class PhasesAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/PlayAi.java b/forge-game/src/main/java/forge/ai/ability/PlayAi.java index 19a910c5ed4..516e8833ae2 100644 --- a/forge-game/src/main/java/forge/ai/ability/PlayAi.java +++ b/forge-game/src/main/java/forge/ai/ability/PlayAi.java @@ -1,12 +1,6 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCost; import forge.ai.SpellAbilityAi; @@ -22,6 +16,11 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Random; + public class PlayAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/PoisonAi.java b/forge-game/src/main/java/forge/ai/ability/PoisonAi.java index d86fe41cafa..65446fb738f 100644 --- a/forge-game/src/main/java/forge/ai/ability/PoisonAi.java +++ b/forge-game/src/main/java/forge/ai/ability/PoisonAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCost; import forge.ai.SpellAbilityAi; @@ -13,6 +11,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.List; + public class PoisonAi extends SpellAbilityAi { /* diff --git a/forge-game/src/main/java/forge/ai/ability/PowerExchangeAi.java b/forge-game/src/main/java/forge/ai/ability/PowerExchangeAi.java index 95fe2bd2e47..73e98f72d28 100644 --- a/forge-game/src/main/java/forge/ai/ability/PowerExchangeAi.java +++ b/forge-game/src/main/java/forge/ai/ability/PowerExchangeAi.java @@ -1,11 +1,6 @@ package forge.ai.ability; -import java.util.Collections; -import java.util.List; -import java.util.Map; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityUtils; @@ -17,6 +12,10 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.Collections; +import java.util.List; +import java.util.Map; + public class PowerExchangeAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/ProtectAi.java b/forge-game/src/main/java/forge/ai/ability/ProtectAi.java index 125565bd7e2..b9db955f7ba 100644 --- a/forge-game/src/main/java/forge/ai/ability/ProtectAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ProtectAi.java @@ -1,15 +1,7 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicate; - -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCard; -import forge.ai.ComputerUtilCombat; -import forge.ai.ComputerUtilCost; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.card.MagicColor; import forge.game.Game; import forge.game.ability.AbilityUtils; @@ -24,6 +16,9 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class ProtectAi extends SpellAbilityAi { private static boolean hasProtectionFrom(final Card card, final String color) { final ArrayList onlyColors = new ArrayList(MagicColor.Constant.ONLY_COLORS); diff --git a/forge-game/src/main/java/forge/ai/ability/PumpAi.java b/forge-game/src/main/java/forge/ai/ability/PumpAi.java index 1b7e49e85b6..751850e4328 100644 --- a/forge-game/src/main/java/forge/ai/ability/PumpAi.java +++ b/forge-game/src/main/java/forge/ai/ability/PumpAi.java @@ -1,14 +1,6 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCard; -import forge.ai.ComputerUtilCost; -import forge.ai.ComputerUtilMana; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.card.Card; @@ -26,6 +18,10 @@ import forge.game.spellability.SpellAbilityRestriction; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class PumpAi extends PumpAiBase { private static boolean hasTapCost(final Cost cost, final Card source) { diff --git a/forge-game/src/main/java/forge/ai/ability/PumpAiBase.java b/forge-game/src/main/java/forge/ai/ability/PumpAiBase.java index bb58f852b94..f891bfac6bf 100644 --- a/forge-game/src/main/java/forge/ai/ability/PumpAiBase.java +++ b/forge-game/src/main/java/forge/ai/ability/PumpAiBase.java @@ -1,12 +1,8 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCombat; @@ -25,6 +21,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public abstract class PumpAiBase extends SpellAbilityAi { public boolean containsUsefulKeyword(final Player ai, final List keywords, final Card card, final SpellAbility sa, final int attack) { diff --git a/forge-game/src/main/java/forge/ai/ability/PumpAllAi.java b/forge-game/src/main/java/forge/ai/ability/PumpAllAi.java index 51de40ab410..0037eba544d 100644 --- a/forge-game/src/main/java/forge/ai/ability/PumpAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/PumpAllAi.java @@ -1,11 +1,6 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import com.google.common.base.Predicate; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCombat; @@ -21,6 +16,10 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class PumpAllAi extends PumpAiBase { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/RegenerateAi.java b/forge-game/src/main/java/forge/ai/ability/RegenerateAi.java index aad710b6365..49fc6054db4 100644 --- a/forge-game/src/main/java/forge/ai/ability/RegenerateAi.java +++ b/forge-game/src/main/java/forge/ai/ability/RegenerateAi.java @@ -17,14 +17,7 @@ */ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; - -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCard; -import forge.ai.ComputerUtilCombat; -import forge.ai.ComputerUtilCost; -import forge.ai.SpellAbilityAi; +import forge.ai.*; import forge.game.Game; import forge.game.GameObject; import forge.game.ability.AbilityUtils; @@ -39,6 +32,9 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** *

* AbilityFactory_Regenerate class. diff --git a/forge-game/src/main/java/forge/ai/ability/RegenerateAllAi.java b/forge-game/src/main/java/forge/ai/ability/RegenerateAllAi.java index f960d0f302c..c71d77fdfac 100644 --- a/forge-game/src/main/java/forge/ai/ability/RegenerateAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/RegenerateAllAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCombat; import forge.ai.ComputerUtilCost; @@ -18,6 +16,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + public class RegenerateAllAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/RepeatEachAi.java b/forge-game/src/main/java/forge/ai/ability/RepeatEachAi.java index 1c8fbfa4d51..bf29e252ee4 100644 --- a/forge-game/src/main/java/forge/ai/ability/RepeatEachAi.java +++ b/forge-game/src/main/java/forge/ai/ability/RepeatEachAi.java @@ -1,19 +1,18 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicate; - import forge.ai.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; -import forge.game.card.CounterType; import forge.game.card.CardPredicates.Presets; +import forge.game.card.CounterType; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/ai/ability/RevealAi.java b/forge-game/src/main/java/forge/ai/ability/RevealAi.java index 762f3494665..01d009d5f9b 100644 --- a/forge-game/src/main/java/forge/ai/ability/RevealAi.java +++ b/forge-game/src/main/java/forge/ai/ability/RevealAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.Random; - import forge.ai.ComputerUtilCost; import forge.ai.SpellAbilityAi; import forge.game.card.Card; @@ -10,6 +8,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.MyRandom; +import java.util.Random; + public class RevealAi extends RevealAiBase { @Override protected boolean canPlayAI(Player ai, SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/ai/ability/RevealHandAi.java b/forge-game/src/main/java/forge/ai/ability/RevealHandAi.java index fa80ddf7ea9..643f0e0ebc0 100644 --- a/forge-game/src/main/java/forge/ai/ability/RevealHandAi.java +++ b/forge-game/src/main/java/forge/ai/ability/RevealHandAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.Random; - import forge.ai.ComputerUtilCost; import forge.ai.SpellAbilityAi; import forge.game.card.Card; @@ -10,6 +8,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.MyRandom; +import java.util.Random; + public class RevealHandAi extends RevealAiBase { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/SacrificeAi.java b/forge-game/src/main/java/forge/ai/ability/SacrificeAi.java index d7fed184420..1ced5c99529 100644 --- a/forge-game/src/main/java/forge/ai/ability/SacrificeAi.java +++ b/forge-game/src/main/java/forge/ai/ability/SacrificeAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilMana; import forge.ai.SpellAbilityAi; @@ -14,6 +12,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.List; + public class SacrificeAi extends SpellAbilityAi { // ************************************************************** // *************************** Sacrifice *********************** diff --git a/forge-game/src/main/java/forge/ai/ability/SacrificeAllAi.java b/forge-game/src/main/java/forge/ai/ability/SacrificeAllAi.java index 4c6b45c98d6..7a61a849cdc 100644 --- a/forge-game/src/main/java/forge/ai/ability/SacrificeAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/SacrificeAllAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCost; import forge.ai.ComputerUtilMana; @@ -15,6 +12,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class SacrificeAllAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/ScryAi.java b/forge-game/src/main/java/forge/ai/ability/ScryAi.java index c26609075f1..5ba7d8964a4 100644 --- a/forge-game/src/main/java/forge/ai/ability/ScryAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ScryAi.java @@ -1,13 +1,13 @@ package forge.ai.ability; -import java.util.Random; - import forge.ai.SpellAbilityAi; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; +import java.util.Random; + public class ScryAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/StoreSVarAi.java b/forge-game/src/main/java/forge/ai/ability/StoreSVarAi.java index 2d8d8a8e38a..0e48a61ee3b 100644 --- a/forge-game/src/main/java/forge/ai/ability/StoreSVarAi.java +++ b/forge-game/src/main/java/forge/ai/ability/StoreSVarAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCombat; import forge.ai.ComputerUtilMana; @@ -18,6 +15,9 @@ import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.List; + public class StoreSVarAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/TapAi.java b/forge-game/src/main/java/forge/ai/ability/TapAi.java index 3d9c800e86a..7fc91bf47d6 100644 --- a/forge-game/src/main/java/forge/ai/ability/TapAi.java +++ b/forge-game/src/main/java/forge/ai/ability/TapAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.ComputerUtil; import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityUtils; @@ -12,6 +10,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.List; + public class TapAi extends TapAiBase { @Override protected boolean canPlayAI(Player ai, SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/ai/ability/TapAiBase.java b/forge-game/src/main/java/forge/ai/ability/TapAiBase.java index 97f243bf287..a4b72e9641c 100644 --- a/forge-game/src/main/java/forge/ai/ability/TapAiBase.java +++ b/forge-game/src/main/java/forge/ai/ability/TapAiBase.java @@ -1,10 +1,7 @@ package forge.ai.ability; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; @@ -21,6 +18,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.List; + public abstract class TapAiBase extends SpellAbilityAi { /** diff --git a/forge-game/src/main/java/forge/ai/ability/TapAllAi.java b/forge-game/src/main/java/forge/ai/ability/TapAllAi.java index f46fb74612f..af42592b336 100644 --- a/forge-game/src/main/java/forge/ai/ability/TapAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/TapAllAi.java @@ -1,11 +1,7 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; - import forge.ai.SpellAbilityAi; import forge.game.Game; import forge.game.card.Card; @@ -19,6 +15,9 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class TapAllAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/TapOrUntapAi.java b/forge-game/src/main/java/forge/ai/ability/TapOrUntapAi.java index 7fe5ae78d06..7a49251ed63 100644 --- a/forge-game/src/main/java/forge/ai/ability/TapOrUntapAi.java +++ b/forge-game/src/main/java/forge/ai/ability/TapOrUntapAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.List; -import java.util.Random; - import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.player.Player; @@ -10,6 +7,9 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; +import java.util.List; +import java.util.Random; + public class TapOrUntapAi extends TapAiBase { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/TokenAi.java b/forge-game/src/main/java/forge/ai/ability/TokenAi.java index 5eb1047460d..0ee3c4a951f 100644 --- a/forge-game/src/main/java/forge/ai/ability/TokenAi.java +++ b/forge-game/src/main/java/forge/ai/ability/TokenAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.Random; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCost; import forge.ai.ComputerUtilMana; @@ -19,6 +17,8 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.Random; + /** *

* AbilityFactory_Token class. diff --git a/forge-game/src/main/java/forge/ai/ability/TwoPilesAi.java b/forge-game/src/main/java/forge/ai/ability/TwoPilesAi.java index a90dff24ad1..e905d682654 100644 --- a/forge-game/src/main/java/forge/ai/ability/TwoPilesAi.java +++ b/forge-game/src/main/java/forge/ai/ability/TwoPilesAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; - import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityUtils; import forge.game.card.Card; @@ -12,6 +9,9 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class TwoPilesAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/UnattachAllAi.java b/forge-game/src/main/java/forge/ai/ability/UnattachAllAi.java index 0d9d606eab7..fe1daf2d5c0 100644 --- a/forge-game/src/main/java/forge/ai/ability/UnattachAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/UnattachAllAi.java @@ -1,9 +1,5 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilMana; import forge.ai.SpellAbilityAi; @@ -17,6 +13,10 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + public class UnattachAllAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/UntapAi.java b/forge-game/src/main/java/forge/ai/ability/UntapAi.java index 6aaba8291c9..e998d9436be 100644 --- a/forge-game/src/main/java/forge/ai/ability/UntapAi.java +++ b/forge-game/src/main/java/forge/ai/ability/UntapAi.java @@ -1,9 +1,5 @@ package forge.ai.ability; -import java.util.Collection; -import java.util.List; -import java.util.Random; - import forge.ai.ComputerUtilCard; import forge.ai.ComputerUtilCost; import forge.ai.SpellAbilityAi; @@ -18,6 +14,10 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.Collection; +import java.util.List; +import java.util.Random; + public class UntapAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/ai/ability/UntapAllAi.java b/forge-game/src/main/java/forge/ai/ability/UntapAllAi.java index 199838237af..11873ed00c4 100644 --- a/forge-game/src/main/java/forge/ai/ability/UntapAllAi.java +++ b/forge-game/src/main/java/forge/ai/ability/UntapAllAi.java @@ -1,7 +1,5 @@ package forge.ai.ability; -import java.util.List; - import forge.ai.SpellAbilityAi; import forge.game.card.Card; import forge.game.card.CardLists; @@ -10,6 +8,8 @@ import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + public class UntapAllAi extends SpellAbilityAi { @Override diff --git a/forge-game/src/main/java/forge/ai/ability/ZoneExchangeAi.java b/forge-game/src/main/java/forge/ai/ability/ZoneExchangeAi.java index bc26f082455..7d051cc1159 100644 --- a/forge-game/src/main/java/forge/ai/ability/ZoneExchangeAi.java +++ b/forge-game/src/main/java/forge/ai/ability/ZoneExchangeAi.java @@ -1,8 +1,5 @@ package forge.ai.ability; -import java.util.ArrayList; -import java.util.List; - import forge.ai.ComputerUtilCard; import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityUtils; @@ -13,6 +10,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.ArrayList; +import java.util.List; + public class ZoneExchangeAi extends SpellAbilityAi { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java index 965f3247a11..8a540c31641 100644 --- a/forge-game/src/main/java/forge/game/Game.java +++ b/forge-game/src/main/java/forge/game/Game.java @@ -17,31 +17,19 @@ */ package forge.game; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; import com.google.common.eventbus.EventBus; - import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.combat.Combat; import forge.game.event.GameEvent; import forge.game.event.GameEventGameOutcome; -import forge.game.phase.EndOfTurn; -import forge.game.phase.Phase; -import forge.game.phase.PhaseHandler; -import forge.game.phase.PhaseType; -import forge.game.phase.Untap; -import forge.game.phase.Upkeep; +import forge.game.phase.*; import forge.game.player.Player; import forge.game.player.RegisteredPlayer; import forge.game.replacement.ReplacementHandler; @@ -53,6 +41,8 @@ import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.util.Aggregates; +import java.util.*; + /** * Represents the state of a single game, a new instance is created for each game. */ diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index a84b1f68c6f..f123ed7fd4c 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -17,21 +17,10 @@ */ package forge.game; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; - import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; - import forge.Command; import forge.card.CardCharacteristicName; import forge.card.CardType; @@ -39,20 +28,8 @@ import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; import forge.game.ability.effects.AttachEffect; -import forge.game.card.Card; -import forge.game.card.CardFactory; -import forge.game.card.CardFactoryUtil; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; -import forge.game.card.CardUtil; -import forge.game.card.CounterType; -import forge.game.event.GameEventCardChangeZone; -import forge.game.event.GameEventCardDestroyed; -import forge.game.event.GameEventCardRegenerated; -import forge.game.event.GameEventCardSacrificed; -import forge.game.event.GameEventCardStatsChanged; -import forge.game.event.GameEventFlipCoin; -import forge.game.event.GameEventGameStarted; +import forge.game.card.*; +import forge.game.event.*; import forge.game.player.GameLossReason; import forge.game.player.Player; import forge.game.replacement.ReplacementResult; @@ -75,6 +52,9 @@ import forge.util.ThreadUtil; import forge.util.maps.HashMapOfLists; import forge.util.maps.MapOfLists; +import java.util.*; +import java.util.Map.Entry; + /** * Methods for common actions performed during a game. * diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java index 2fc23885285..e9c90a0a08e 100644 --- a/forge-game/src/main/java/forge/game/GameActionUtil.java +++ b/forge-game/src/main/java/forge/game/GameActionUtil.java @@ -17,34 +17,27 @@ */ package forge.game; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.card.MagicColor; import forge.game.ability.AbilityFactory; +import forge.game.ability.AbilityFactory.AbilityRecordType; import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; -import forge.game.ability.AbilityFactory.AbilityRecordType; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.cost.Cost; import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; -import forge.game.spellability.AbilityActivated; -import forge.game.spellability.AbilityManaPart; -import forge.game.spellability.AbilitySub; -import forge.game.spellability.OptionalCost; -import forge.game.spellability.SpellAbility; -import forge.game.spellability.SpellAbilityRestriction; +import forge.game.spellability.*; import forge.game.zone.ZoneType; import forge.util.TextUtil; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** diff --git a/forge-game/src/main/java/forge/game/GameEntity.java b/forge-game/src/main/java/forge/game/GameEntity.java index b7a9a0ddaa5..c9e231a8686 100644 --- a/forge-game/src/main/java/forge/game/GameEntity.java +++ b/forge-game/src/main/java/forge/game/GameEntity.java @@ -17,14 +17,14 @@ */ package forge.game; -import java.util.ArrayList; -import java.util.Map; -import java.util.TreeMap; - import forge.game.card.Card; import forge.game.event.GameEventCardAttachment; import forge.game.event.GameEventCardAttachment.AttachMethod; +import java.util.ArrayList; +import java.util.Map; +import java.util.TreeMap; + /** *

* Abstract Player class. diff --git a/forge-game/src/main/java/forge/game/GameFormat.java b/forge-game/src/main/java/forge/game/GameFormat.java index f557e4af20c..add3ba9e660 100644 --- a/forge-game/src/main/java/forge/game/GameFormat.java +++ b/forge-game/src/main/java/forge/game/GameFormat.java @@ -17,6 +17,20 @@ */ package forge.game; +import com.google.common.base.Function; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.Lists; +import forge.StaticData; +import forge.card.CardEdition; +import forge.deck.CardPool; +import forge.deck.Deck; +import forge.item.IPaperCard; +import forge.item.PaperCard; +import forge.util.FileSection; +import forge.util.storage.StorageBase; +import forge.util.storage.StorageReaderFileSections; + import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -24,21 +38,6 @@ import java.util.Collections; import java.util.List; import java.util.Map.Entry; -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.Lists; - -import forge.StaticData; -import forge.card.CardEdition; -import forge.deck.CardPool; -import forge.deck.Deck; -import forge.item.PaperCard; -import forge.item.IPaperCard; -import forge.util.FileSection; -import forge.util.storage.StorageBase; -import forge.util.storage.StorageReaderFileSections; - /** * TODO: Write javadoc for this type. diff --git a/forge-game/src/main/java/forge/game/GameLog.java b/forge-game/src/main/java/forge/game/GameLog.java index 5d06d58373c..b7b9b9a2911 100644 --- a/forge-game/src/main/java/forge/game/GameLog.java +++ b/forge-game/src/main/java/forge/game/GameLog.java @@ -18,14 +18,13 @@ package forge.game; +import forge.game.event.IGameEventVisitor; +import org.apache.commons.lang3.StringUtils; + import java.util.ArrayList; import java.util.List; import java.util.Observable; -import org.apache.commons.lang3.StringUtils; - -import forge.game.event.IGameEventVisitor; - /** *

diff --git a/forge-game/src/main/java/forge/game/GameLogFormatter.java b/forge-game/src/main/java/forge/game/GameLogFormatter.java index 15b911ccfd9..56f7b52af9d 100644 --- a/forge-game/src/main/java/forge/game/GameLogFormatter.java +++ b/forge-game/src/main/java/forge/game/GameLogFormatter.java @@ -1,28 +1,9 @@ package forge.game; -import java.util.Collection; -import java.util.List; -import java.util.Map.Entry; - import com.google.common.eventbus.Subscribe; - import forge.game.card.Card; -import forge.game.event.GameEvent; -import forge.game.event.GameEventAttackersDeclared; -import forge.game.event.GameEventBlockersDeclared; -import forge.game.event.GameEventCardDamaged; +import forge.game.event.*; import forge.game.event.GameEventCardDamaged.DamageType; -import forge.game.event.GameEventGameOutcome; -import forge.game.event.GameEventLandPlayed; -import forge.game.event.GameEventMulligan; -import forge.game.event.GameEventPlayerControl; -import forge.game.event.GameEventPlayerDamaged; -import forge.game.event.GameEventPlayerPoisoned; -import forge.game.event.GameEventSpellAbilityCast; -import forge.game.event.GameEventSpellResolved; -import forge.game.event.GameEventTurnBegan; -import forge.game.event.GameEventTurnPhase; -import forge.game.event.IGameEventVisitor; import forge.game.player.LobbyPlayer; import forge.game.player.Player; import forge.game.spellability.TargetChoices; @@ -30,6 +11,10 @@ import forge.game.zone.ZoneType; import forge.util.Lang; import forge.util.maps.MapOfLists; +import java.util.Collection; +import java.util.List; +import java.util.Map.Entry; + public class GameLogFormatter extends IGameEventVisitor.Base { private final GameLog log; diff --git a/forge-game/src/main/java/forge/game/GameOutcome.java b/forge-game/src/main/java/forge/game/GameOutcome.java index 69e4716d8ce..9a2821c32d6 100644 --- a/forge-game/src/main/java/forge/game/GameOutcome.java +++ b/forge-game/src/main/java/forge/game/GameOutcome.java @@ -17,20 +17,15 @@ */ package forge.game; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.TreeMap; - -import org.apache.commons.lang3.tuple.Pair; - import forge.game.player.LobbyPlayer; import forge.game.player.Player; import forge.game.player.PlayerOutcome; import forge.game.player.PlayerStatistics; import forge.item.PaperCard; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.*; +import java.util.Map.Entry; /** *

diff --git a/forge-game/src/main/java/forge/game/Match.java b/forge-game/src/main/java/forge/game/Match.java index 000113cf9b6..980f2ce1917 100644 --- a/forge-game/src/main/java/forge/game/Match.java +++ b/forge-game/src/main/java/forge/game/Match.java @@ -1,19 +1,6 @@ package forge.game; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Random; -import java.util.Set; -import java.util.Map.Entry; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; - +import com.google.common.collect.*; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; @@ -29,6 +16,9 @@ import forge.game.zone.ZoneType; import forge.item.PaperCard; import forge.util.MyRandom; +import java.util.*; +import java.util.Map.Entry; + public class Match { private final List players; private final GameRules rules; diff --git a/forge-game/src/main/java/forge/game/PlanarDice.java b/forge-game/src/main/java/forge/game/PlanarDice.java index 42fd4a0c43a..a951a97f7f2 100644 --- a/forge-game/src/main/java/forge/game/PlanarDice.java +++ b/forge-game/src/main/java/forge/game/PlanarDice.java @@ -1,10 +1,10 @@ package forge.game; -import java.util.HashMap; - import forge.game.player.Player; import forge.game.trigger.TriggerType; +import java.util.HashMap; + /** * Represents the planar dice for Planechase games. * diff --git a/forge-game/src/main/java/forge/game/StaticEffect.java b/forge-game/src/main/java/forge/game/StaticEffect.java index 786ce288e1b..d329d6ff5db 100644 --- a/forge-game/src/main/java/forge/game/StaticEffect.java +++ b/forge-game/src/main/java/forge/game/StaticEffect.java @@ -17,14 +17,14 @@ */ package forge.game; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + /** *

* StaticEffect class. diff --git a/forge-game/src/main/java/forge/game/StaticEffects.java b/forge-game/src/main/java/forge/game/StaticEffects.java index ed333a8ed23..6700b94a83a 100644 --- a/forge-game/src/main/java/forge/game/StaticEffects.java +++ b/forge-game/src/main/java/forge/game/StaticEffects.java @@ -17,20 +17,14 @@ */ package forge.game; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.staticability.StaticAbility; +import java.util.*; + /** *

* StaticEffects class. diff --git a/forge-game/src/main/java/forge/game/TriggerReplacementBase.java b/forge-game/src/main/java/forge/game/TriggerReplacementBase.java index 38d074b01d8..88f25a5da00 100644 --- a/forge-game/src/main/java/forge/game/TriggerReplacementBase.java +++ b/forge-game/src/main/java/forge/game/TriggerReplacementBase.java @@ -1,10 +1,5 @@ package forge.game; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; - import forge.card.MagicColor; import forge.game.ability.AbilityUtils; import forge.game.card.Card; @@ -17,6 +12,8 @@ import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.util.Expressions; +import java.util.*; + /** * Base class for Triggers and ReplacementEffects. * Provides the matchesValid function to both classes. @@ -24,9 +21,58 @@ import forge.util.Expressions; */ public abstract class TriggerReplacementBase { + /** The temporary. */ + private boolean temporary = false; + + /** + * Sets the temporary. + * + * @param temp + * the new temporary + */ + public final void setTemporary(final boolean temp) { + this.temporary = temp; + } + + /** + * Checks if is temporary. + * + * @return true, if is temporary + */ + public final boolean isTemporary() { + return this.temporary; + } + + /** The map params. */ + protected final Map mapParams = new HashMap(); + + /** + *

+ * Getter for the field mapParams. + *

+ * + * @return a {@link java.util.HashMap} object. + */ + public final Map getMapParams() { + return this.mapParams; + } + + /** + * Checks if is intrinsic. + * + * @return the isIntrinsic + */ + public boolean isIntrinsic() { + return this.intrinsic; + } + /** The host card. */ protected Card hostCard; + + /** The is intrinsic. */ + protected boolean intrinsic; + /** *

* Getter for the field hostCard. diff --git a/forge-game/src/main/java/forge/game/ability/AbilityApiBased.java b/forge-game/src/main/java/forge/game/ability/AbilityApiBased.java index df1d35b253f..d9b39859109 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityApiBased.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityApiBased.java @@ -1,7 +1,5 @@ package forge.game.ability; -import java.util.Map; - import forge.ai.SpellAbilityAi; import forge.game.ability.effects.ChangeZoneAllEffect; import forge.game.ability.effects.ChangeZoneEffect; @@ -15,6 +13,8 @@ import forge.game.spellability.AbilityActivated; import forge.game.spellability.AbilityManaPart; import forge.game.spellability.TargetRestrictions; +import java.util.Map; + public class AbilityApiBased extends AbilityActivated { private final SpellAbilityEffect effect; private final SpellAbilityAi ai; diff --git a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java index 85bf819b0fd..669c411f011 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java @@ -17,21 +17,17 @@ */ package forge.game.ability; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import forge.card.CardCharacteristicName; import forge.game.card.Card; import forge.game.cost.Cost; -import forge.game.spellability.AbilitySub; -import forge.game.spellability.SpellAbility; -import forge.game.spellability.SpellAbilityCondition; -import forge.game.spellability.SpellAbilityRestriction; -import forge.game.spellability.TargetRestrictions; +import forge.game.spellability.*; import forge.game.zone.ZoneType; import forge.util.FileSection; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** *

* AbilityFactory class. diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index d3544ff94a2..542b8bc11d5 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -1,23 +1,12 @@ package forge.game.ability; -import java.util.ArrayList; -import java.util.List; - +import com.google.common.collect.Iterables; import forge.card.MagicColor; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; - -import org.apache.commons.lang3.StringUtils; - -import com.google.common.collect.Iterables; - import forge.game.Game; import forge.game.GameObject; -import forge.game.card.Card; -import forge.game.card.CardFactoryUtil; -import forge.game.card.CardLists; -import forge.game.card.CardUtil; -import forge.game.card.CounterType; +import forge.game.card.*; import forge.game.cost.Cost; import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; @@ -26,6 +15,10 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityStackInstance; import forge.game.zone.ZoneType; import forge.util.Expressions; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; /** * TODO: Write javadoc for this type. diff --git a/forge-game/src/main/java/forge/game/ability/ApiType.java b/forge-game/src/main/java/forge/game/ability/ApiType.java index fd01fce00b3..f8f86378496 100644 --- a/forge-game/src/main/java/forge/game/ability/ApiType.java +++ b/forge-game/src/main/java/forge/game/ability/ApiType.java @@ -1,14 +1,14 @@ package forge.game.ability; -import java.util.Map; -import java.util.TreeMap; - import forge.ai.SpellAbilityAi; import forge.ai.ability.*; import forge.game.ability.effects.*; import forge.util.ReflectionUtil; +import java.util.Map; +import java.util.TreeMap; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/ability/SaTargetRoutines.java b/forge-game/src/main/java/forge/game/ability/SaTargetRoutines.java index 3723e6987d5..7baf477ecd5 100644 --- a/forge-game/src/main/java/forge/game/ability/SaTargetRoutines.java +++ b/forge-game/src/main/java/forge/game/ability/SaTargetRoutines.java @@ -1,14 +1,13 @@ package forge.game.ability; -import java.util.List; - import com.google.common.collect.Lists; - import forge.game.GameObject; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + // Class contains all that methods that are used by both effects and AI to fetch their targets. // {SA}Effect and {SA}Ai now inherit from this class to use these routines, though they should not. diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java index 3785575ec04..baf6c19a6ca 100644 --- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java +++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java @@ -1,15 +1,13 @@ package forge.game.ability; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; - -import org.apache.commons.lang3.StringUtils; - - import forge.game.card.CardFactoryUtil; import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; /** *

diff --git a/forge-game/src/main/java/forge/game/ability/SpellApiBased.java b/forge-game/src/main/java/forge/game/ability/SpellApiBased.java index c5296b152c7..f9c0d8dde57 100644 --- a/forge-game/src/main/java/forge/game/ability/SpellApiBased.java +++ b/forge-game/src/main/java/forge/game/ability/SpellApiBased.java @@ -1,7 +1,5 @@ package forge.game.ability; -import java.util.Map; - import forge.ai.SpellAbilityAi; import forge.game.ability.effects.ChangeZoneAllEffect; import forge.game.ability.effects.ChangeZoneEffect; @@ -14,6 +12,8 @@ import forge.game.spellability.AbilityManaPart; import forge.game.spellability.Spell; import forge.game.spellability.TargetRestrictions; +import java.util.Map; + public class SpellApiBased extends Spell { private static final long serialVersionUID = -6741797239508483250L; private final SpellAbilityEffect effect; diff --git a/forge-game/src/main/java/forge/game/ability/StaticAbilityApiBased.java b/forge-game/src/main/java/forge/game/ability/StaticAbilityApiBased.java index 16d86b83859..513d577cccd 100644 --- a/forge-game/src/main/java/forge/game/ability/StaticAbilityApiBased.java +++ b/forge-game/src/main/java/forge/game/ability/StaticAbilityApiBased.java @@ -1,7 +1,5 @@ package forge.game.ability; -import java.util.Map; - import forge.ai.SpellAbilityAi; import forge.game.ability.effects.ChangeZoneAllEffect; import forge.game.ability.effects.ChangeZoneEffect; @@ -11,6 +9,8 @@ import forge.game.player.Player; import forge.game.spellability.AbilityStatic; import forge.game.spellability.TargetRestrictions; +import java.util.Map; + public class StaticAbilityApiBased extends AbilityStatic { private final SpellAbilityEffect effect; diff --git a/forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java index 485a42b9a5f..8794eb10f82 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AddTurnEffect.java @@ -1,13 +1,13 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.phase.ExtraTurn; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + public class AddTurnEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java index 421d5c0717b..77a42413b61 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateAllEffect.java @@ -1,10 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - import forge.Command; import forge.game.Game; import forge.game.TriggerReplacementBase; @@ -22,6 +17,11 @@ import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + public class AnimateAllEffect extends AnimateEffectBase { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java index 743df9e7b88..2fa439ac3db 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java @@ -1,10 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - import forge.Command; import forge.game.Game; import forge.game.TriggerReplacementBase; @@ -20,6 +15,11 @@ import forge.game.staticability.StaticAbility; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + public class AnimateEffect extends AnimateEffectBase { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java index f4918d69c48..253c2a90143 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AnimateEffectBase.java @@ -17,8 +17,6 @@ */ package forge.game.ability.effects; -import java.util.ArrayList; - import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.replacement.ReplacementEffect; @@ -26,6 +24,8 @@ import forge.game.spellability.SpellAbility; import forge.game.staticability.StaticAbility; import forge.game.trigger.Trigger; +import java.util.ArrayList; + public abstract class AnimateEffectBase extends SpellAbilityEffect { /** diff --git a/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java index 22050d40d4e..d1d8336d289 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/AttachEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.Command; import forge.game.Game; import forge.game.GameEntity; @@ -18,6 +15,9 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Lang; +import java.util.ArrayList; +import java.util.List; + public class AttachEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java index 5e068eeb0d8..618f539ffc6 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/BalanceEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -11,6 +8,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java index 77f20dbe6d4..9340bd9836c 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/BecomesBlockedEffect.java @@ -1,11 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.Game; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -13,6 +7,11 @@ import forge.game.card.CardFactoryUtil; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.trigger.TriggerType; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; public class BecomesBlockedEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/BondEffect.java b/forge-game/src/main/java/forge/game/ability/effects/BondEffect.java index 18eec7d9d77..dd21e8a952e 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/BondEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/BondEffect.java @@ -1,13 +1,13 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + public class BondEffect extends SpellAbilityEffect { @Override public void resolve(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java index d1755901f21..c82cecf9103 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeTargetsEffect.java @@ -1,13 +1,6 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.collect.Iterables; - import forge.game.GameObject; import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; @@ -16,6 +9,11 @@ import forge.game.spellability.SpellAbilityStackInstance; import forge.game.spellability.TargetChoices; import forge.game.zone.MagicStack; import forge.util.Aggregates; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.List; /** * TODO: Write javadoc for this type. diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java index 4567fd39c2f..44503904228 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneAllEffect.java @@ -1,9 +1,6 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; import com.google.common.collect.Iterables; - import forge.card.CardCharacteristicName; import forge.game.Game; import forge.game.ability.AbilityUtils; @@ -15,6 +12,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class ChangeZoneAllEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java index 954248b3562..096f6ad29d0 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChangeZoneEffect.java @@ -1,24 +1,15 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.ai.ability.ChangeZoneAi; import forge.card.CardCharacteristicName; import forge.game.Game; import forge.game.GameEntity; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; -import forge.game.card.Card; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; -import forge.game.card.CardUtil; -import forge.game.card.CounterType; +import forge.game.card.*; import forge.game.combat.Combat; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; @@ -32,6 +23,10 @@ import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.Lang; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + public class ChangeZoneEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java index 82c6519d92f..0db674ccf9c 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CharmEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.ability.AbilityFactory; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -10,6 +7,9 @@ import forge.game.player.Player; import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.List; + public class CharmEffect extends SpellAbilityEffect { public static List makePossibleOptions(final SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java index be263850143..720b9b7a043 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardEffect.java @@ -1,10 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.card.CardType; import forge.game.Game; import forge.game.ability.SpellAbilityEffect; @@ -17,6 +12,10 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; public class ChooseCardEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java index c6bbc321802..2076e679361 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseCardNameEffect.java @@ -1,14 +1,9 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.StaticData; import forge.card.CardRules; import forge.card.CardRulesPredicates; @@ -21,6 +16,9 @@ import forge.game.spellability.TargetRestrictions; import forge.item.PaperCard; import forge.util.Aggregates; import forge.util.ComparableOp; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class ChooseCardNameEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java index 0284621d660..ff047b6f1a4 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseColorEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import forge.card.MagicColor; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -12,6 +8,10 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.Lang; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class ChooseColorEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java index 8cf208e7e0a..67a5deb96e7 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseGenericEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -12,6 +10,9 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.MyRandom; +import java.util.ArrayList; +import java.util.List; + public class ChooseGenericEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java index 2e55288ba9b..f9a55166561 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java @@ -1,16 +1,15 @@ package forge.game.ability.effects; -import java.util.List; -import java.util.Random; - -import org.apache.commons.lang3.StringUtils; - import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardFactoryUtil; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; +import java.util.Random; public class ChooseNumberEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java index 57b08c4d5fb..63cbbf0c0cc 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChoosePlayerEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -10,6 +8,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.Aggregates; +import java.util.List; + public class ChoosePlayerEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java index 21930ada526..281a6f8ffee 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseSourceEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; -import org.apache.commons.lang3.StringUtils; - import forge.game.Game; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -14,6 +10,10 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityStackInstance; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; public class ChooseSourceEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java index 99fae9dbdb6..48c4ef848e1 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ChooseTypeEffect.java @@ -1,10 +1,5 @@ package forge.game.ability.effects; -import java.security.InvalidParameterException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import forge.card.CardType; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -12,6 +7,11 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.security.InvalidParameterException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class ChooseTypeEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java index 539526eba2c..9a2a6f0b32b 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ClashEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.HashMap; - import forge.game.GameAction; import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; @@ -14,6 +12,8 @@ import forge.game.trigger.TriggerType; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; +import java.util.HashMap; + public class ClashEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java index cea20b280af..1cdb63a1dbc 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CloneEffect.java @@ -1,10 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - import forge.Command; import forge.card.CardCharacteristicName; import forge.game.Game; @@ -19,6 +14,11 @@ import forge.game.spellability.TargetRestrictions; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + public class CloneEffect extends SpellAbilityEffect { // TODO update this method diff --git a/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java index 626260c8cd5..36ef7541324 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ControlExchangeEffect.java @@ -1,10 +1,6 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.Lists; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -12,6 +8,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.ArrayList; +import java.util.List; + public class ControlExchangeEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java index 6a9bf664b7e..13fd93fd37f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ControlGainEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.Arrays; -import java.util.List; - import forge.Command; import forge.card.mana.ManaCost; import forge.game.Game; @@ -15,6 +12,9 @@ import forge.game.spellability.Ability; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.Arrays; +import java.util.List; + public class ControlGainEffect extends SpellAbilityEffect { /* (non-Javadoc) * @see forge.card.abilityfactory.SpellEffect#getStackDescription(java.util.Map, forge.card.spellability.SpellAbility) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java index 7aa061a1a4f..45e68b03b98 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ControlPlayerEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.Command; import forge.game.Game; import forge.game.ability.SpellAbilityEffect; @@ -9,6 +7,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.Lang; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java index c5254557807..a8d8780c49f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CopyPermanentEffect.java @@ -1,16 +1,9 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.Command; import forge.StaticData; import forge.card.CardCharacteristicName; @@ -32,6 +25,11 @@ import forge.game.zone.ZoneType; import forge.item.PaperCard; import forge.util.Aggregates; import forge.util.PredicateString.StringOp; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class CopyPermanentEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java index aedc7c29fe0..099fa87a60f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CopySpellAbilityEffect.java @@ -1,11 +1,6 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import com.google.common.collect.Iterables; - import forge.game.GameObject; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -16,6 +11,10 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.Lang; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + public class CopySpellAbilityEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java index 500aa5540af..2642f2f8741 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CounterEffect.java @@ -1,10 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - import forge.game.Game; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -15,6 +10,11 @@ import forge.game.spellability.SpellAbilityStackInstance; import forge.game.spellability.SpellPermanent; import forge.game.trigger.TriggerType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; + public class CounterEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersMoveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersMoveEffect.java index 242d83b2352..0095247b14c 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersMoveEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersMoveEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -10,6 +7,10 @@ import forge.game.card.CounterType; import forge.game.player.PlayerController; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public class CountersMoveEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java index 90f6f586b88..5eb949b9ad3 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersProliferateEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.Map; -import java.util.Map.Entry; - import forge.game.GameEntity; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -10,6 +7,9 @@ import forge.game.card.CounterType; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.Map; +import java.util.Map.Entry; + public class CountersProliferateEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java index 5cfac3f7466..74be7bbc2d4 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutAllEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -13,6 +11,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.List; + public class CountersPutAllEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java index 05e28686555..6775f039693 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -15,6 +11,10 @@ import forge.game.trigger.TriggerType; import forge.game.zone.Zone; import forge.game.zone.ZoneType; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; + public class CountersPutEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java index 6f29fbb00df..f0ba905477e 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutOrRemoveEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.tuple.Pair; - import forge.game.GameObject; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -14,6 +10,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.util.Lang; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.List; /** * API for adding to or subtracting from existing counters on a target. diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java index 17e1075181d..f051c49f92f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveAllEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.List; -import java.util.Set; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -13,6 +10,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; +import java.util.Set; + public class CountersRemoveAllEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java index 2b528586627..df8fa30e4e7 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.Map; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -13,6 +11,8 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.Zone; import forge.game.zone.ZoneType; +import java.util.Map; + public class CountersRemoveEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java index 913ee9a0d1f..eced38633ad 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -12,6 +9,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class DamageAllEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java index c41903d4f03..52777525566 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamageDealEffect.java @@ -1,11 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import forge.game.GameObject; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -15,6 +9,12 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.Lang; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + public class DamageDealEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageEachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageEachEffect.java index 18b5ca87e61..df72a0c2007 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamageEachEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamageEachEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.GameObject; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -12,6 +10,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + public class DamageEachEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java index 42c3165ecc4..ba6c7b61773 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventAllEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -11,6 +8,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class DamagePreventAllEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java index beef30fabfd..ce31f59aae2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamagePreventEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; -import java.util.TreeMap; - import forge.game.GameObject; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -12,6 +8,10 @@ import forge.game.card.CardUtil; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.List; +import java.util.TreeMap; + public class DamagePreventEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/DebuffAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DebuffAllEffect.java index 9594ccc0111..1dd2f0c06eb 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DebuffAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DebuffAllEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import forge.Command; import forge.game.Game; import forge.game.ability.SpellAbilityEffect; @@ -12,6 +8,10 @@ import forge.game.card.CardLists; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class DebuffAllEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java index cabf4c9810c..8a962472576 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DebuffEffect.java @@ -1,16 +1,16 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - import forge.Command; import forge.game.Game; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + public class DebuffEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java index 53b232b3fac..bff022c4644 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DeclareCombatantsEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.Command; import forge.game.ability.SpellAbilityEffect; import forge.game.phase.PhaseHandler; @@ -9,6 +7,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.Lang; +import java.util.List; + public class DeclareCombatantsEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java index f1d6b82efda..e8a942bfdb2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DelayedTriggerEffect.java @@ -1,14 +1,14 @@ package forge.game.ability.effects; -import java.util.HashMap; -import java.util.Map; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.spellability.SpellAbility; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; +import java.util.HashMap; +import java.util.Map; + public class DelayedTriggerEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java index a441f65a4b0..a2cb25c6112 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DestroyAllEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -12,6 +10,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + public class DestroyAllEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java index f3eb80d64eb..49bebe817da 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - import forge.game.Game; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -11,6 +7,10 @@ import forge.game.card.CardUtil; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + public class DestroyEffect extends SpellAbilityEffect { /* (non-Javadoc) * @see forge.card.abilityfactory.SpellEffect#getStackDescription(java.util.Map, forge.card.spellability.SpellAbility) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java index 61b506fceab..f5038ac010a 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DigEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import forge.card.CardCharacteristicName; import forge.game.Game; import forge.game.ability.AbilityUtils; @@ -17,6 +13,11 @@ import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.util.Lang; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + public class DigEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java index 9ed8ddd3776..4318b57d260 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DigUntilEffect.java @@ -1,11 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Random; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -17,6 +11,8 @@ import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; import forge.util.MyRandom; +import java.util.*; + public class DigUntilEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java index 187376df712..d92b4ded842 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java @@ -1,12 +1,6 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.Lists; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -19,6 +13,10 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; public class DiscardEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java index b42d14e4e7d..5dd9f7a42cd 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DrainManaEffect.java @@ -1,13 +1,12 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class DrainManaEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java index b01ff459345..32648f20bff 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DrawEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -10,6 +8,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.Lang; +import java.util.List; + public class DrawEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java index 9529e6c07bf..dbf87abcccf 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.Command; import forge.ImageKeys; import forge.game.Game; @@ -18,6 +16,8 @@ import forge.game.trigger.TriggerHandler; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; +import java.util.List; + public class EffectEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java index 29903a3511b..54e41e79717 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/EncodeEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.Game; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -12,6 +10,8 @@ import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.game.zone.ZoneType; +import java.util.List; + public class EncodeEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java index 72c83ac8907..995a8e5f57e 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/FightEffect.java @@ -1,16 +1,15 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.Lists; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.ArrayList; +import java.util.List; + public class FightEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java index dc06f1b3750..f5c1a59dd23 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.HashMap; -import java.util.List; - import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -15,6 +12,9 @@ import forge.game.spellability.SpellAbility; import forge.game.trigger.TriggerType; import forge.util.MyRandom; +import java.util.HashMap; +import java.util.List; + public class FlipCoinEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/GameLossEffect.java b/forge-game/src/main/java/forge/game/ability/effects/GameLossEffect.java index 5acc2a1295c..c6f6ec169b0 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/GameLossEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/GameLossEffect.java @@ -1,13 +1,13 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.GameLossReason; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + public class GameLossEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java index 6827211e7b7..647773f8470 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/LifeExchangeEffect.java @@ -1,12 +1,12 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + public class LifeExchangeEffect extends SpellAbilityEffect { // ************************************************************************* diff --git a/forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java index 01d68a55e67..32c1355f671 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/LifeGainEffect.java @@ -1,14 +1,14 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.List; + public class LifeGainEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java b/forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java index fd6e587e9a6..4f5190505a5 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/LifeSetEffect.java @@ -1,14 +1,14 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.ArrayList; +import java.util.List; + public class LifeSetEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java index 4a3b5be630b..ab464e07d42 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java @@ -1,14 +1,10 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.card.ColorSet; import forge.card.MagicColor; import forge.card.mana.ManaCostShard; -import forge.game.GameActionUtil; import forge.game.Game; +import forge.game.GameActionUtil; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -17,6 +13,9 @@ import forge.game.player.Player; import forge.game.spellability.AbilityManaPart; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class ManaEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java index 4e72e9c6560..39c40ca9897 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.Collection; -import java.util.List; - import forge.card.ColorSet; import forge.card.MagicColor; import forge.game.ability.AbilityUtils; @@ -12,6 +9,9 @@ import forge.game.player.Player; import forge.game.spellability.AbilityManaPart; import forge.game.spellability.SpellAbility; +import java.util.Collection; +import java.util.List; + public class ManaReflectedEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/MillEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MillEffect.java index fa5dd020a07..c41574de6a3 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MillEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/MillEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.card.CardCharacteristicName; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -11,6 +9,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.List; + public class MillEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java index 985f13f6e92..69ee667ae52 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/MultiplePilesEffect.java @@ -1,13 +1,6 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.google.common.collect.Iterables; - import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -20,6 +13,12 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + public class MultiplePilesEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java index 3963e17ce22..4f6c7802bd7 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/MustAttackEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.GameEntity; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -9,6 +7,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.List; + public class MustAttackEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java b/forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java index 0d86b555c79..9ffbd57943b 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/MustBlockEffect.java @@ -1,14 +1,14 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.ArrayList; +import java.util.List; + public class MustBlockEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/OwnershipGainEffect.java b/forge-game/src/main/java/forge/game/ability/effects/OwnershipGainEffect.java index c14e49ba061..20e3cf28a02 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/OwnershipGainEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/OwnershipGainEffect.java @@ -1,12 +1,12 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + public class OwnershipGainEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java index b5e002cd493..7c64ab1ea25 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PeekAndRevealEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -13,6 +10,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** * PeeakAndReveal is a simplified why of handling something that could * be done with dig and NoMove$ . All of the Kinship cards are going to use this diff --git a/forge-game/src/main/java/forge/game/ability/effects/PhasesEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PhasesEffect.java index 65a08924e48..a048d6738cb 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PhasesEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PhasesEffect.java @@ -1,16 +1,15 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; public class PhasesEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java index bace410b362..bd3f69c6dfe 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PlaneswalkEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -9,6 +7,8 @@ import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java index d781051839d..1ab6ab959e5 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java @@ -1,15 +1,9 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.StaticData; import forge.card.CardCharacteristicName; import forge.card.CardRulesPredicates; @@ -27,6 +21,10 @@ import forge.game.zone.ZoneType; import forge.item.PaperCard; import forge.util.Aggregates; import forge.util.Lang; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; public class PlayEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/PoisonEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PoisonEffect.java index 6a4a4dbdd1c..94c3cc8bf84 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PoisonEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PoisonEffect.java @@ -1,14 +1,13 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; /** * TODO: Write javadoc for this type. diff --git a/forge-game/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java index 34f66cf1166..53abad6149d 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PowerExchangeEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.Command; import forge.game.Game; import forge.game.ability.SpellAbilityEffect; @@ -9,6 +7,8 @@ import forge.game.card.Card; import forge.game.event.GameEventCardStatsChanged; import forge.game.spellability.SpellAbility; +import java.util.List; + public class PowerExchangeEffect extends SpellAbilityEffect { /* (non-Javadoc) * @see forge.card.abilityfactory.AbilityFactoryAlterLife.SpellEffect#getStackDescription(java.util.Map, forge.card.spellability.SpellAbility) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java index 177bdeb0509..2a4bda65be8 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ProtectAllEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.Command; import forge.card.ColorSet; import forge.card.MagicColor; @@ -17,6 +14,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.Lang; +import java.util.ArrayList; +import java.util.List; + public class ProtectAllEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java index bf1879ceb09..2c3b6c3e359 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ProtectEffect.java @@ -1,10 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - import forge.Command; import forge.card.MagicColor; import forge.game.Game; @@ -16,6 +11,11 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.util.Lang; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; + public class ProtectEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java index 436f43f53fd..b59f50075c2 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PumpAllEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import forge.Command; import forge.game.Game; import forge.game.ability.AbilityUtils; @@ -15,6 +11,10 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class PumpAllEffect extends SpellAbilityEffect { private void applyPumpAll(final SpellAbility sa, final List list, final int a, final int d, final List keywords, final ArrayList affectedZones) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java b/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java index 02ab7fdddaf..2aa39bb730b 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/PumpEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import forge.Command; import forge.card.CardType; import forge.game.Game; @@ -21,6 +17,10 @@ import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.Lang; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class PumpEffect extends SpellAbilityEffect { private void applyPump(final SpellAbility sa, final Card applyTo, final int a, final int d, final List keywords) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java index 479cfe93a2e..0559fdf93ca 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RearrangeTopOfLibraryEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -12,6 +9,9 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class RearrangeTopOfLibraryEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java index c9d60beb673..f787adca218 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RegenerateAllEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.Command; import forge.game.Game; import forge.game.ability.SpellAbilityEffect; @@ -11,6 +9,8 @@ import forge.game.card.CardShields; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + public class RegenerateAllEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/RegenerateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RegenerateEffect.java index 40846bd1344..5a1c118ab2f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RegenerateEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RegenerateEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.Iterator; -import java.util.List; - import forge.Command; import forge.game.Game; import forge.game.ability.AbilityFactory; @@ -14,6 +11,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.Iterator; +import java.util.List; + public class RegenerateEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java index 95934663c5b..d4e0223b447 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RemoveFromCombatEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.Game; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -11,6 +7,9 @@ import forge.game.combat.Combat; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class RemoveFromCombatEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java index 3d26be91745..ba0f4441b4e 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ReorderZoneEffect.java @@ -1,11 +1,6 @@ package forge.game.ability.effects; -import java.util.Collections; -import java.util.List; -import java.util.Random; - import com.google.common.collect.Lists; - import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; @@ -15,6 +10,10 @@ import forge.game.zone.ZoneType; import forge.util.Lang; import forge.util.MyRandom; +import java.util.Collections; +import java.util.List; +import java.util.Random; + public class ReorderZoneEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java index 67df91533d7..a6ceb688fa7 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java @@ -1,16 +1,7 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.game.Game; import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; @@ -24,6 +15,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.Aggregates; +import java.util.*; +import java.util.Map.Entry; + public class RepeatEachEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java index 2789d18f214..190dc692368 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; @@ -16,6 +13,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.Expressions; +import java.util.ArrayList; +import java.util.List; + public class RepeatEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java index 95039d68a4c..3f6c9bd62a5 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RestartGameEffect.java @@ -1,14 +1,8 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import forge.game.Game; import forge.game.GameAction; import forge.game.GameStage; -import forge.game.Game; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; @@ -20,6 +14,8 @@ import forge.game.trigger.TriggerHandler; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; +import java.util.*; + public class RestartGameEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/RevealEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RevealEffect.java index 10590f11b07..dcc681ac8c5 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RevealEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RevealEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -14,6 +11,9 @@ import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.util.Aggregates; +import java.util.ArrayList; +import java.util.List; + public class RevealEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java index 6a83f495c2b..cc8394ebe60 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RevealHandEffect.java @@ -1,7 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.Player; @@ -9,6 +7,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.List; + public class RevealHandEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java index ca163ea2b19..415db40cc93 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RunSVarAbilityEffect.java @@ -1,12 +1,13 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; import forge.game.ability.AbilityFactory; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.List; + public class RunSVarAbilityEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java index f107c115bdf..aac8bbe1812 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -11,6 +8,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class SacrificeAllEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java index 92f80e6e5ac..ea1f8c89c23 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/SacrificeEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.HashMap; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -16,6 +13,9 @@ import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; import forge.util.Aggregates; +import java.util.HashMap; +import java.util.List; + public class SacrificeEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java index 8e710568e21..9e8eb12aee8 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java @@ -1,12 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - -import org.apache.commons.lang3.tuple.ImmutablePair; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -16,6 +9,12 @@ import forge.game.spellability.TargetRestrictions; import forge.game.trigger.TriggerType; import forge.game.zone.PlayerZone; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.tuple.ImmutablePair; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; public class ScryEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java index f4b817897ef..0a7b22ea2aa 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.Iterator; -import java.util.List; - import forge.card.CardCharacteristicName; import forge.game.Game; import forge.game.ability.SpellAbilityEffect; @@ -10,6 +7,9 @@ import forge.game.card.Card; import forge.game.event.GameEventCardStatsChanged; import forge.game.spellability.SpellAbility; +import java.util.Iterator; +import java.util.List; + public class SetStateEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java index 0e53c287a39..f5f08a988f7 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ShuffleEffect.java @@ -1,13 +1,13 @@ package forge.game.ability.effects; -import java.util.Iterator; -import java.util.List; - import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import java.util.Iterator; +import java.util.List; + public class ShuffleEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java index 27e416ff651..316de997140 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/SkipTurnEffect.java @@ -1,12 +1,12 @@ package forge.game.ability.effects; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + public class SkipTurnEffect extends SpellAbilityEffect { @Override diff --git a/forge-game/src/main/java/forge/game/ability/effects/TapAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TapAllEffect.java index 20d1cece6e8..525c7c3edac 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TapAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TapAllEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -12,6 +9,9 @@ import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class TapAllEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/TapEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TapEffect.java index 99d2f0756fd..9850cd6c858 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TapEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TapEffect.java @@ -1,13 +1,12 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class TapEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java index 58d0ab2163d..a7215041f30 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapAllEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -13,6 +9,9 @@ import forge.game.player.Player; import forge.game.player.PlayerController; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; /** * TODO: Write javadoc for this type. diff --git a/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java index 1851f7769f9..5e8153dfc44 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TapOrUntapEffect.java @@ -1,14 +1,13 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.player.PlayerController; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class TapOrUntapEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java index 0f1615de089..88d2e29d7bd 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TokenEffect.java @@ -17,12 +17,7 @@ */ package forge.game.ability.effects; -import java.util.Arrays; -import java.util.List; - import com.google.common.collect.Iterables; - - import forge.game.Game; import forge.game.GameEntity; import forge.game.ability.AbilityFactory; @@ -38,6 +33,9 @@ import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.item.PaperToken; +import java.util.Arrays; +import java.util.List; + public class TokenEffect extends SpellAbilityEffect { private String tokenOwner; diff --git a/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java index aa7ac770dc3..712bd9bd5bb 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java @@ -1,11 +1,7 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -17,6 +13,9 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class TwoPilesEffect extends SpellAbilityEffect { // ************************************************************************* diff --git a/forge-game/src/main/java/forge/game/ability/effects/UnattachAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/UnattachAllEffect.java index a515fd0bad2..3a5130d1461 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/UnattachAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/UnattachAllEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.Game; import forge.game.GameEntity; import forge.game.GameObject; @@ -13,6 +9,9 @@ import forge.game.card.CardLists; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class UnattachAllEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java index dad907bc02e..fb2c6af9a3f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/UntapAllEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; import forge.game.card.CardLists; @@ -11,6 +8,9 @@ import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class UntapAllEffect extends SpellAbilityEffect { /* (non-Javadoc) diff --git a/forge-game/src/main/java/forge/game/ability/effects/UntapEffect.java b/forge-game/src/main/java/forge/game/ability/effects/UntapEffect.java index 334401fcd79..9e1a0083c90 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/UntapEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/UntapEffect.java @@ -1,9 +1,5 @@ package forge.game.ability.effects; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; import forge.game.card.Card; @@ -13,6 +9,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.StringUtils; + +import java.util.List; public class UntapEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java index 7233dcba9e5..2ff633d3352 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ZoneExchangeEffect.java @@ -1,8 +1,5 @@ package forge.game.ability.effects; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; @@ -12,6 +9,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + public class ZoneExchangeEffect extends SpellAbilityEffect { diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index a170824c889..788d89f5b75 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -17,46 +17,17 @@ */ package forge.game.card; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumMap; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; -import java.util.concurrent.ConcurrentSkipListMap; -import java.util.concurrent.CopyOnWriteArrayList; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; - import com.esotericsoftware.minlog.Log; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; - import forge.Command; import forge.StaticData; -import forge.card.CardCharacteristicName; -import forge.card.CardEdition; -import forge.card.CardRarity; -import forge.card.CardRules; -import forge.card.ColorSet; -import forge.card.MagicColor; +import forge.card.*; import forge.card.CardDb.SetPreference; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostParser; -import forge.game.Game; -import forge.game.GameActionUtil; -import forge.game.GameEntity; -import forge.game.GameLogEntryType; -import forge.game.GlobalRuleChange; +import forge.game.*; import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; @@ -64,24 +35,14 @@ import forge.game.card.CardPredicates.Presets; import forge.game.combat.AttackingBand; import forge.game.combat.Combat; import forge.game.cost.Cost; -import forge.game.event.GameEventCardDamaged; +import forge.game.event.*; import forge.game.event.GameEventCardAttachment.AttachMethod; import forge.game.event.GameEventCardDamaged.DamageType; -import forge.game.event.GameEventCardAttachment; -import forge.game.event.GameEventCardCounters; -import forge.game.event.GameEventCardPhased; -import forge.game.event.GameEventCardStatsChanged; -import forge.game.event.GameEventCardTapped; import forge.game.player.Player; import forge.game.replacement.ReplaceMoved; import forge.game.replacement.ReplacementEffect; import forge.game.replacement.ReplacementResult; -import forge.game.spellability.Ability; -import forge.game.spellability.AbilityTriggered; -import forge.game.spellability.OptionalCost; -import forge.game.spellability.SpellAbility; -import forge.game.spellability.SpellPermanent; -import forge.game.spellability.TargetRestrictions; +import forge.game.spellability.*; import forge.game.staticability.StaticAbility; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerType; @@ -94,6 +55,13 @@ import forge.util.Expressions; import forge.util.Lang; import forge.util.MyRandom; import forge.util.TextUtil; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.*; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.CopyOnWriteArrayList; /** *

@@ -8470,7 +8438,7 @@ public class Card extends GameEntity implements Comparable { */ public boolean hasETBTrigger() { for (final Trigger tr : this.getTriggers()) { - final HashMap params = tr.getMapParams(); + final Map params = tr.getMapParams(); if (tr.getMode() != TriggerType.ChangesZone) { continue; } diff --git a/forge-game/src/main/java/forge/game/card/CardCharacteristics.java b/forge-game/src/main/java/forge/game/card/CardCharacteristics.java index 27ac7d802ce..a0d5d5f3d90 100644 --- a/forge-game/src/main/java/forge/game/card/CardCharacteristics.java +++ b/forge-game/src/main/java/forge/game/card/CardCharacteristics.java @@ -17,14 +17,7 @@ */ package forge.game.card; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.concurrent.CopyOnWriteArrayList; - import com.google.common.collect.Lists; - import forge.card.CardEdition; import forge.card.CardRarity; import forge.card.mana.ManaCost; @@ -33,6 +26,12 @@ import forge.game.spellability.SpellAbility; import forge.game.staticability.StaticAbility; import forge.game.trigger.Trigger; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.concurrent.CopyOnWriteArrayList; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/card/CardDamageHistory.java b/forge-game/src/main/java/forge/game/card/CardDamageHistory.java index c318902b07f..0fef46221c6 100644 --- a/forge-game/src/main/java/forge/game/card/CardDamageHistory.java +++ b/forge-game/src/main/java/forge/game/card/CardDamageHistory.java @@ -1,10 +1,10 @@ package forge.game.card; +import forge.game.player.Player; + import java.util.ArrayList; import java.util.List; -import forge.game.player.Player; - /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java index a9d93c6a645..e9fb7f80d71 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactory.java +++ b/forge-game/src/main/java/forge/game/card/CardFactory.java @@ -17,11 +17,6 @@ */ package forge.game.card; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map.Entry; - import forge.ImageKeys; import forge.card.CardCharacteristicName; import forge.card.CardRules; @@ -35,17 +30,17 @@ import forge.game.ability.effects.CharmEffect; import forge.game.cost.Cost; import forge.game.player.Player; import forge.game.replacement.ReplacementHandler; -import forge.game.spellability.AbilityActivated; -import forge.game.spellability.AbilitySub; -import forge.game.spellability.OptionalCost; -import forge.game.spellability.SpellAbility; -import forge.game.spellability.SpellPermanent; -import forge.game.spellability.TargetRestrictions; +import forge.game.spellability.*; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.game.trigger.WrappedAbility; -import forge.item.PaperCard; import forge.item.IPaperCard; +import forge.item.PaperCard; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map.Entry; /** *

diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index d48565d5762..78013e67327 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -17,14 +17,8 @@ */ package forge.game.card; -import java.util.*; -import java.util.Map.Entry; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; import com.google.common.collect.Lists; - import forge.Command; import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCost; @@ -50,22 +44,17 @@ import forge.game.player.Player; import forge.game.replacement.ReplacementEffect; import forge.game.replacement.ReplacementHandler; import forge.game.replacement.ReplacementLayer; -import forge.game.spellability.Ability; -import forge.game.spellability.AbilityActivated; -import forge.game.spellability.AbilityStatic; -import forge.game.spellability.AbilitySub; -import forge.game.spellability.OptionalCost; -import forge.game.spellability.Spell; -import forge.game.spellability.SpellAbility; -import forge.game.spellability.SpellAbilityRestriction; -import forge.game.spellability.SpellPermanent; -import forge.game.spellability.TargetRestrictions; +import forge.game.spellability.*; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.util.Aggregates; import forge.util.Lang; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; +import java.util.Map.Entry; /** *

diff --git a/forge-game/src/main/java/forge/game/card/CardKeywords.java b/forge-game/src/main/java/forge/game/card/CardKeywords.java index 17fb70219ba..cc69fa3c574 100644 --- a/forge-game/src/main/java/forge/game/card/CardKeywords.java +++ b/forge-game/src/main/java/forge/game/card/CardKeywords.java @@ -17,8 +17,8 @@ */ package forge.game.card; -import java.util.List; import java.util.ArrayList; +import java.util.List; /** *

diff --git a/forge-game/src/main/java/forge/game/card/CardLists.java b/forge-game/src/main/java/forge/game/card/CardLists.java index ed1e82d3b19..2f697b40af7 100644 --- a/forge-game/src/main/java/forge/game/card/CardLists.java +++ b/forge-game/src/main/java/forge/game/card/CardLists.java @@ -17,22 +17,21 @@ */ package forge.game.card; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.ai.ComputerUtilCard; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.MyRandom; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + /** *

diff --git a/forge-game/src/main/java/forge/game/card/CardPredicates.java b/forge-game/src/main/java/forge/game/card/CardPredicates.java index e745e13e3dd..ee424f091b7 100644 --- a/forge-game/src/main/java/forge/game/card/CardPredicates.java +++ b/forge-game/src/main/java/forge/game/card/CardPredicates.java @@ -17,17 +17,16 @@ */ package forge.game.card; -import java.util.List; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; - import forge.game.combat.CombatUtil; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.PredicateString; +import java.util.List; + /** *

diff --git a/forge-game/src/main/java/forge/game/card/CardUtil.java b/forge-game/src/main/java/forge/game/card/CardUtil.java index 518ba0cc09c..4e9c39eaff8 100644 --- a/forge-game/src/main/java/forge/game/card/CardUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardUtil.java @@ -17,11 +17,6 @@ */ package forge.game.card; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import forge.Constant; import forge.ImageKeys; import forge.card.CardCharacteristicName; @@ -36,6 +31,11 @@ import forge.game.spellability.AbilitySub; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + public final class CardUtil { // disable instantiation private CardUtil() { } diff --git a/forge-game/src/main/java/forge/game/combat/AttackingBand.java b/forge-game/src/main/java/forge/game/combat/AttackingBand.java index 714fd27018c..89dc8d792a6 100644 --- a/forge-game/src/main/java/forge/game/combat/AttackingBand.java +++ b/forge-game/src/main/java/forge/game/combat/AttackingBand.java @@ -1,12 +1,12 @@ package forge.game.combat; -import java.util.ArrayList; -import java.util.List; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CardLists; +import java.util.ArrayList; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/combat/Combat.java b/forge-game/src/main/java/forge/game/combat/Combat.java index f874491411b..6d367d056bf 100644 --- a/forge-game/src/main/java/forge/game/combat/Combat.java +++ b/forge-game/src/main/java/forge/game/combat/Combat.java @@ -17,20 +17,10 @@ */ package forge.game.combat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CardLists; @@ -38,6 +28,10 @@ import forge.game.card.CardPredicates; import forge.game.player.Player; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.*; +import java.util.Map.Entry; /** *

diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java index 2e04470a1d3..3b07aa6bbf4 100644 --- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java +++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java @@ -17,16 +17,9 @@ */ package forge.game.combat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.card.CardType; import forge.card.MagicColor; import forge.card.mana.ManaCost; @@ -51,6 +44,11 @@ import forge.game.zone.ZoneType; import forge.util.Expressions; import forge.util.Lang; import forge.util.TextUtil; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; /** diff --git a/forge-game/src/main/java/forge/game/cost/Cost.java b/forge-game/src/main/java/forge/game/cost/Cost.java index 43ad3c78951..2ba8c82ac56 100644 --- a/forge-game/src/main/java/forge/game/cost/Cost.java +++ b/forge-game/src/main/java/forge/game/cost/Cost.java @@ -17,10 +17,6 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Pattern; - import forge.card.mana.ManaCost; import forge.card.mana.ManaCostParser; import forge.game.card.Card; @@ -29,6 +25,10 @@ import forge.game.mana.ManaCostBeingPaid; import forge.game.zone.ZoneType; import forge.util.TextUtil; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Pattern; + /** *

* Cost class. diff --git a/forge-game/src/main/java/forge/game/cost/CostAddMana.java b/forge-game/src/main/java/forge/game/cost/CostAddMana.java index 1abf765019a..4a473096f13 100644 --- a/forge-game/src/main/java/forge/game/cost/CostAddMana.java +++ b/forge-game/src/main/java/forge/game/cost/CostAddMana.java @@ -17,9 +17,6 @@ */ package forge.game.cost; -import java.util.ArrayList; -import org.apache.commons.lang3.StringUtils; - import forge.card.ColorSet; import forge.card.MagicColor; import forge.game.GameType; @@ -27,6 +24,9 @@ import forge.game.card.Card; import forge.game.mana.Mana; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; /** * The Class CostAddMana. diff --git a/forge-game/src/main/java/forge/game/cost/CostDiscard.java b/forge-game/src/main/java/forge/game/cost/CostDiscard.java index 05ed0fff88c..75c79a6ce4d 100644 --- a/forge-game/src/main/java/forge/game/cost/CostDiscard.java +++ b/forge-game/src/main/java/forge/game/cost/CostDiscard.java @@ -17,8 +17,6 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; @@ -26,6 +24,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** * The Class CostDiscard. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostDraw.java b/forge-game/src/main/java/forge/game/cost/CostDraw.java index a1b4d7002e5..390630cdea3 100644 --- a/forge-game/src/main/java/forge/game/cost/CostDraw.java +++ b/forge-game/src/main/java/forge/game/cost/CostDraw.java @@ -17,13 +17,13 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.List; + /** * The Class CostPayLife. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostExile.java b/forge-game/src/main/java/forge/game/cost/CostExile.java index c36cfb6d43e..56cd5499235 100644 --- a/forge-game/src/main/java/forge/game/cost/CostExile.java +++ b/forge-game/src/main/java/forge/game/cost/CostExile.java @@ -17,9 +17,6 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.card.Card; import forge.game.card.CardLists; @@ -29,6 +26,9 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityStackInstance; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** * The Class CostExile. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java b/forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java index f27cc75cab9..b10cc2f6468 100644 --- a/forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java +++ b/forge-game/src/main/java/forge/game/cost/CostExiledMoveToGrave.java @@ -17,8 +17,6 @@ */ package forge.game.cost; -import java.util.List; - import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; @@ -26,6 +24,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + /** * This is for the "ExiledMoveToGrave" Cost. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostGainControl.java b/forge-game/src/main/java/forge/game/cost/CostGainControl.java index 701beabc7bb..ef5936fe256 100644 --- a/forge-game/src/main/java/forge/game/cost/CostGainControl.java +++ b/forge-game/src/main/java/forge/game/cost/CostGainControl.java @@ -17,8 +17,6 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; @@ -26,6 +24,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** * The Class CostReturn. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostGainLife.java b/forge-game/src/main/java/forge/game/cost/CostGainLife.java index b3519bafe72..34fe5c8478a 100644 --- a/forge-game/src/main/java/forge/game/cost/CostGainLife.java +++ b/forge-game/src/main/java/forge/game/cost/CostGainLife.java @@ -17,13 +17,13 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.List; + /** * The Class CostGainLife. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostPart.java b/forge-game/src/main/java/forge/game/cost/CostPart.java index 49b11dddd57..ddf47f0e4a7 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPart.java +++ b/forge-game/src/main/java/forge/game/cost/CostPart.java @@ -18,11 +18,10 @@ package forge.game.cost; -import org.apache.commons.lang3.StringUtils; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import org.apache.commons.lang3.StringUtils; /** * The Class CostPart. diff --git a/forge-game/src/main/java/forge/game/cost/CostPartWithList.java b/forge-game/src/main/java/forge/game/cost/CostPartWithList.java index eb32b96a465..42d160432e8 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPartWithList.java +++ b/forge-game/src/main/java/forge/game/cost/CostPartWithList.java @@ -17,14 +17,15 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** * The Class CostPartWithList. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostPayment.java b/forge-game/src/main/java/forge/game/cost/CostPayment.java index b02aa4433f4..b52e60fc2d2 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPayment.java +++ b/forge-game/src/main/java/forge/game/cost/CostPayment.java @@ -17,15 +17,14 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - - import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + /** *

* Cost_Payment class. diff --git a/forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java b/forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java index c71b5872040..71dcff8ffc3 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java +++ b/forge-game/src/main/java/forge/game/cost/CostPutCardToLib.java @@ -17,9 +17,6 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.card.Card; @@ -29,6 +26,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** * This is for the "PutCardToLib" Cost. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostPutCounter.java b/forge-game/src/main/java/forge/game/cost/CostPutCounter.java index 0bbad3b281a..9976b081bdd 100644 --- a/forge-game/src/main/java/forge/game/cost/CostPutCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostPutCounter.java @@ -17,7 +17,6 @@ */ package forge.game.cost; -import java.util.List; import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; @@ -26,6 +25,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + /** * The Class CostPutCounter. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java b/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java index eba4aac891c..24e18153f48 100644 --- a/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostRemoveAnyCounter.java @@ -17,10 +17,6 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import com.google.common.base.Predicate; import forge.ai.ComputerUtil; import forge.game.ability.AbilityUtils; @@ -31,6 +27,10 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** * The Class CostRemoveAnyCounter. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java b/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java index 8f6c84accf4..d6eb1a1d939 100644 --- a/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java +++ b/forge-game/src/main/java/forge/game/cost/CostRemoveCounter.java @@ -17,9 +17,7 @@ */ package forge.game.cost; -import java.util.List; import com.google.common.collect.Lists; - import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CounterType; @@ -27,6 +25,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + /** * The Class CostRemoveCounter. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostReturn.java b/forge-game/src/main/java/forge/game/cost/CostReturn.java index 0b379ae46c7..9ee275aeb05 100644 --- a/forge-game/src/main/java/forge/game/cost/CostReturn.java +++ b/forge-game/src/main/java/forge/game/cost/CostReturn.java @@ -17,15 +17,15 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; - import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** * The Class CostReturn. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostReveal.java b/forge-game/src/main/java/forge/game/cost/CostReveal.java index d3bc9f62f40..d12913dcdc9 100644 --- a/forge-game/src/main/java/forge/game/cost/CostReveal.java +++ b/forge-game/src/main/java/forge/game/cost/CostReveal.java @@ -17,19 +17,18 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.collect.Lists; - import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** * The Class CostReveal. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostSacrifice.java b/forge-game/src/main/java/forge/game/cost/CostSacrifice.java index 6e300762627..6ac79d8bba7 100644 --- a/forge-game/src/main/java/forge/game/cost/CostSacrifice.java +++ b/forge-game/src/main/java/forge/game/cost/CostSacrifice.java @@ -17,15 +17,15 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; - import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** * The Class CostSacrifice. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostTapType.java b/forge-game/src/main/java/forge/game/cost/CostTapType.java index 2f01378ba36..6d2e08abc4b 100644 --- a/forge-game/src/main/java/forge/game/cost/CostTapType.java +++ b/forge-game/src/main/java/forge/game/cost/CostTapType.java @@ -17,11 +17,7 @@ */ package forge.game.cost; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicate; - import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; @@ -29,6 +25,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** * The Class CostTapType. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostUnattach.java b/forge-game/src/main/java/forge/game/cost/CostUnattach.java index 39e8afe875c..8f0a4ca4d50 100644 --- a/forge-game/src/main/java/forge/game/cost/CostUnattach.java +++ b/forge-game/src/main/java/forge/game/cost/CostUnattach.java @@ -17,13 +17,13 @@ */ package forge.game.cost; -import java.util.List; - import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + /** * The Class CostUnattach. */ diff --git a/forge-game/src/main/java/forge/game/cost/CostUntapType.java b/forge-game/src/main/java/forge/game/cost/CostUntapType.java index 1992bd28194..3c782da5771 100644 --- a/forge-game/src/main/java/forge/game/cost/CostUntapType.java +++ b/forge-game/src/main/java/forge/game/cost/CostUntapType.java @@ -17,7 +17,6 @@ */ package forge.game.cost; -import java.util.List; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates.Presets; @@ -25,6 +24,8 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.List; + /** * The Class CostUntapType. */ diff --git a/forge-game/src/main/java/forge/game/cost/PaymentDecision.java b/forge-game/src/main/java/forge/game/cost/PaymentDecision.java index cae4c5af2c5..868ae5af8a8 100644 --- a/forge-game/src/main/java/forge/game/cost/PaymentDecision.java +++ b/forge-game/src/main/java/forge/game/cost/PaymentDecision.java @@ -1,14 +1,14 @@ package forge.game.cost; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import forge.game.card.Card; import forge.game.card.CounterType; import forge.game.mana.Mana; import forge.game.player.Player; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java b/forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java index 0a978077f83..80d14665895 100644 --- a/forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java +++ b/forge-game/src/main/java/forge/game/event/GameEventAnteCardsSelected.java @@ -1,7 +1,6 @@ package forge.game.event; import com.google.common.collect.Multimap; - import forge.game.card.Card; import forge.game.player.Player; diff --git a/forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java b/forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java index d1c82f7490a..11e7fbe958c 100644 --- a/forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java +++ b/forge-game/src/main/java/forge/game/event/GameEventAttackersDeclared.java @@ -1,7 +1,6 @@ package forge.game.event; import com.google.common.collect.Multimap; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.player.Player; diff --git a/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java b/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java index b1b15d83283..ee6425f1f69 100644 --- a/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java +++ b/forge-game/src/main/java/forge/game/event/GameEventBlockersDeclared.java @@ -1,16 +1,16 @@ package forge.game.event; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.player.Player; import forge.util.Lang; import forge.util.maps.MapOfLists; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java b/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java index 2dd40b652d6..b3244fdb244 100644 --- a/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java +++ b/forge-game/src/main/java/forge/game/event/GameEventCardStatsChanged.java @@ -1,12 +1,11 @@ package forge.game.event; +import com.google.common.collect.Iterables; +import forge.game.card.Card; +import org.apache.commons.lang3.StringUtils; + import java.util.Arrays; import java.util.Collection; -import org.apache.commons.lang3.StringUtils; - -import com.google.common.collect.Iterables; - -import forge.game.card.Card; /** * This means card's characteristics have changed on server, clients must re-request them diff --git a/forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java b/forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java index 0e3bea536b6..ddc5376e8eb 100644 --- a/forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java +++ b/forge-game/src/main/java/forge/game/event/GameEventCombatEnded.java @@ -1,9 +1,9 @@ package forge.game.event; -import java.util.List; - import forge.game.card.Card; +import java.util.List; + public class GameEventCombatEnded extends GameEvent { public final List attackers; diff --git a/forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java b/forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java index 412a5fff470..01089945cd2 100644 --- a/forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java +++ b/forge-game/src/main/java/forge/game/event/GameEventGameOutcome.java @@ -1,9 +1,9 @@ package forge.game.event; -import java.util.List; - import forge.game.GameOutcome; +import java.util.List; + public class GameEventGameOutcome extends GameEvent { public final GameOutcome result; public final List history; diff --git a/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java b/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java index d53a9db2f29..810b06cf394 100644 --- a/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java +++ b/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java @@ -17,18 +17,9 @@ */ package forge.game.mana; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.card.ColorSet; import forge.card.MagicColor; import forge.card.mana.IParserManaCost; @@ -45,6 +36,9 @@ import forge.game.zone.ZoneType; import forge.util.maps.EnumMapToAmount; import forge.util.maps.MapToAmount; +import java.util.*; +import java.util.Map.Entry; + /** *

* ManaCostBeingPaid class. diff --git a/forge-game/src/main/java/forge/game/mana/ManaPool.java b/forge-game/src/main/java/forge/game/mana/ManaPool.java index eb1b26a0e12..88cdfcd290d 100644 --- a/forge-game/src/main/java/forge/game/mana/ManaPool.java +++ b/forge-game/src/main/java/forge/game/mana/ManaPool.java @@ -17,14 +17,6 @@ */ package forge.game.mana; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; @@ -39,6 +31,13 @@ import forge.game.player.Player; import forge.game.spellability.AbilityManaPart; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; /** *

diff --git a/forge-game/src/main/java/forge/game/phase/Phase.java b/forge-game/src/main/java/forge/game/phase/Phase.java index eb49a90c41f..92bdaccaf4a 100644 --- a/forge-game/src/main/java/forge/game/phase/Phase.java +++ b/forge-game/src/main/java/forge/game/phase/Phase.java @@ -17,15 +17,14 @@ */ package forge.game.phase; +import com.google.common.collect.Lists; +import forge.Command; +import forge.game.player.Player; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import com.google.common.collect.Lists; - -import forge.Command; -import forge.game.player.Player; - /** *

diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java index d139d964c6c..6394cdb7710 100644 --- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java +++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java @@ -17,23 +17,10 @@ */ package forge.game.phase; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Stack; - -import org.apache.commons.lang3.time.StopWatch; - import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; - import forge.card.mana.ManaCost; -import forge.game.GameEntity; -import forge.game.GameStage; -import forge.game.Game; -import forge.game.GameType; -import forge.game.GlobalRuleChange; +import forge.game.*; import forge.game.ability.AbilityFactory; import forge.game.card.Card; import forge.game.card.CardFactoryUtil; @@ -42,15 +29,7 @@ import forge.game.card.CardPredicates.Presets; import forge.game.combat.Combat; import forge.game.combat.CombatUtil; import forge.game.cost.Cost; -import forge.game.event.GameEventAttackersDeclared; -import forge.game.event.GameEventBlockersDeclared; -import forge.game.event.GameEventCombatEnded; -import forge.game.event.GameEventPlayerPriority; -import forge.game.event.GameEventTurnBegan; -import forge.game.event.GameEventTurnEnded; -import forge.game.event.GameEventGameRestarted; -import forge.game.event.GameEventManaBurn; -import forge.game.event.GameEventTurnPhase; +import forge.game.event.*; import forge.game.player.Player; import forge.game.player.PlayerController.BinaryChoiceType; import forge.game.player.PlayerController.ManaPaymentPurpose; @@ -61,6 +40,9 @@ import forge.game.zone.ZoneType; import forge.util.CollectionSuppliers; import forge.util.maps.HashMapOfLists; import forge.util.maps.MapOfLists; +import org.apache.commons.lang3.time.StopWatch; + +import java.util.*; /** diff --git a/forge-game/src/main/java/forge/game/phase/PhaseType.java b/forge-game/src/main/java/forge/game/phase/PhaseType.java index bad75fca00c..aa7dad6e5ad 100644 --- a/forge-game/src/main/java/forge/game/phase/PhaseType.java +++ b/forge-game/src/main/java/forge/game/phase/PhaseType.java @@ -1,12 +1,12 @@ package forge.game.phase; +import org.apache.commons.lang3.StringUtils; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.apache.commons.lang3.StringUtils; - public enum PhaseType { UNTAP("Untap"), diff --git a/forge-game/src/main/java/forge/game/phase/Untap.java b/forge-game/src/main/java/forge/game/phase/Untap.java index ca629182571..93e20250ab0 100644 --- a/forge-game/src/main/java/forge/game/phase/Untap.java +++ b/forge-game/src/main/java/forge/game/phase/Untap.java @@ -17,16 +17,8 @@ */ package forge.game.phase; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardType.Constant; import forge.game.Game; import forge.game.GameEntity; @@ -40,6 +32,9 @@ import forge.game.player.PlayerController.BinaryChoiceType; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.*; +import java.util.Map.Entry; + /** *

* Untap class. diff --git a/forge-game/src/main/java/forge/game/phase/Upkeep.java b/forge-game/src/main/java/forge/game/phase/Upkeep.java index dee83d99cc5..ce1fe429783 100644 --- a/forge-game/src/main/java/forge/game/phase/Upkeep.java +++ b/forge-game/src/main/java/forge/game/phase/Upkeep.java @@ -17,10 +17,7 @@ */ package forge.game.phase; -import java.util.HashMap; -import java.util.List; import com.google.common.base.Predicate; - import forge.card.mana.ManaCost; import forge.game.Game; import forge.game.ability.AbilityFactory; @@ -36,6 +33,9 @@ import forge.game.spellability.SpellAbility; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; +import java.util.HashMap; +import java.util.List; + /** *

* The Upkeep class handles ending effects with "until your next upkeep" and diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index e4d24b363ab..8f46a0bd1a4 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -17,29 +17,13 @@ */ package forge.game.player; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.TreeMap; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.card.MagicColor; import forge.card.mana.ManaCost; -import forge.game.Game; -import forge.game.GameActionUtil; -import forge.game.GameEntity; -import forge.game.GameStage; -import forge.game.GameType; -import forge.game.GlobalRuleChange; +import forge.game.*; import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; @@ -47,13 +31,7 @@ import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CardPredicates.Presets; -import forge.game.event.GameEventLandPlayed; -import forge.game.event.GameEventMulligan; -import forge.game.event.GameEventPlayerControl; -import forge.game.event.GameEventPlayerDamaged; -import forge.game.event.GameEventPlayerLivesChanged; -import forge.game.event.GameEventPlayerPoisoned; -import forge.game.event.GameEventShuffle; +import forge.game.event.*; import forge.game.mana.ManaPool; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; @@ -74,6 +52,8 @@ import forge.item.IPaperCard; import forge.util.Lang; import forge.util.MyRandom; +import java.util.*; + /** *

* Abstract Player class. diff --git a/forge-game/src/main/java/forge/game/player/PlayerController.java b/forge-game/src/main/java/forge/game/player/PlayerController.java index 68a5ac786a0..08d8d366247 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerController.java +++ b/forge-game/src/main/java/forge/game/player/PlayerController.java @@ -1,17 +1,7 @@ package forge.game.player; -import java.awt.event.MouseEvent; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Predicate; import com.google.common.collect.Multimap; - import forge.card.ColorSet; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; @@ -39,6 +29,14 @@ import forge.game.trigger.Trigger; import forge.game.trigger.WrappedAbility; import forge.game.zone.ZoneType; import forge.item.PaperCard; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.awt.event.MouseEvent; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** diff --git a/forge-game/src/main/java/forge/game/player/PlayerControllerAi.java b/forge-game/src/main/java/forge/game/player/PlayerControllerAi.java index 2cbaa8329d3..5db010fe5a9 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerControllerAi.java +++ b/forge-game/src/main/java/forge/game/player/PlayerControllerAi.java @@ -1,32 +1,12 @@ package forge.game.player; -import java.awt.event.MouseEvent; -import java.security.InvalidParameterException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - import com.esotericsoftware.minlog.Log; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; - -import forge.ai.AiBlockController; -import forge.ai.AiController; -import forge.ai.ComputerUtil; -import forge.ai.ComputerUtilCard; -import forge.ai.ComputerUtilCombat; -import forge.ai.ComputerUtilCost; -import forge.ai.ComputerUtilMana; +import forge.ai.*; import forge.ai.ability.CharmAi; import forge.card.ColorSet; import forge.card.MagicColor; @@ -39,12 +19,7 @@ import forge.game.GameObject; import forge.game.GameType; import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; -import forge.ai.AiProps; -import forge.game.card.Card; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; -import forge.game.card.CardShields; -import forge.game.card.CounterType; +import forge.game.card.*; import forge.game.card.CardPredicates.Presets; import forge.game.combat.Combat; import forge.game.cost.Cost; @@ -53,19 +28,20 @@ import forge.game.cost.CostPartMana; import forge.game.cost.PaymentDecision; import forge.game.mana.Mana; import forge.game.replacement.ReplacementEffect; -import forge.game.spellability.Ability; -import forge.game.spellability.AbilityStatic; -import forge.game.spellability.AbilitySub; -import forge.game.spellability.Spell; -import forge.game.spellability.SpellAbility; -import forge.game.spellability.SpellAbilityStackInstance; -import forge.game.spellability.TargetChoices; +import forge.game.spellability.*; import forge.game.trigger.Trigger; import forge.game.trigger.WrappedAbility; import forge.game.zone.ZoneType; import forge.item.PaperCard; import forge.util.Aggregates; import forge.util.MyRandom; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.awt.event.MouseEvent; +import java.security.InvalidParameterException; +import java.util.*; /** diff --git a/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java b/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java index b5ec6260aa4..e987494ae92 100644 --- a/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java +++ b/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java @@ -1,14 +1,14 @@ package forge.game.player; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import forge.deck.Deck; import forge.deck.DeckSection; import forge.game.GameType; -import forge.item.PaperCard; import forge.item.IPaperCard; +import forge.item.PaperCard; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; public class RegisteredPlayer { diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java index 0e7e4cbf9f6..e4de75b07b5 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceAddCounter.java @@ -1,11 +1,11 @@ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.card.CounterType; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java b/forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java index 38bec2de35c..de466ddb128 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceCounter.java @@ -17,11 +17,11 @@ */ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java b/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java index 90d452eb3e7..2ba06da3814 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceDamage.java @@ -17,13 +17,13 @@ */ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.card.CardFactoryUtil; import forge.game.spellability.SpellAbility; import forge.util.Expressions; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceDestroy.java b/forge-game/src/main/java/forge/game/replacement/ReplaceDestroy.java index a2ce166d3bc..a98bfa32839 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceDestroy.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceDestroy.java @@ -17,11 +17,11 @@ */ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java b/forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java index 34ef3d0d7fd..c71cb521b93 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceDiscard.java @@ -17,11 +17,11 @@ */ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java b/forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java index ed462672ae2..f71b63414fc 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceDraw.java @@ -17,13 +17,13 @@ */ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java b/forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java index 5c40c99fe64..d8c3ebe305e 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceGainLife.java @@ -17,11 +17,11 @@ */ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java b/forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java index 654f9494b71..dc53545d65a 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceGameLoss.java @@ -1,8 +1,8 @@ package forge.game.replacement; -import java.util.Map; + import forge.game.card.Card; -import forge.game.card.Card; + import java.util.Map; /** * TODO: Write javadoc for this type. diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java b/forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java index 1844f0eb236..c2dc9c5f836 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceMoved.java @@ -1,11 +1,11 @@ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java b/forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java index 065d9cba7a2..85e64038127 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceProduceMana.java @@ -1,10 +1,10 @@ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java b/forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java index 7c47a05a075..4afba8bd50e 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceSetInMotion.java @@ -17,10 +17,10 @@ */ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java b/forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java index 420bc267b99..933cd7b4b09 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceTurnFaceUp.java @@ -1,10 +1,10 @@ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java b/forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java index 6257e590fa2..c5732ddde3b 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplaceUntap.java @@ -17,12 +17,12 @@ */ package forge.game.replacement; -import java.util.Map; - import forge.game.card.Card; import forge.game.phase.PhaseType; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java index 2161fffe923..20dac254949 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java @@ -17,9 +17,6 @@ */ package forge.game.replacement; -import java.util.List; -import java.util.Map; - import forge.game.Game; import forge.game.TriggerReplacementBase; import forge.game.ability.AbilityUtils; @@ -31,6 +28,9 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.Expressions; +import java.util.List; +import java.util.Map; + /** * TODO: Write javadoc for this type. * @@ -42,9 +42,6 @@ public abstract class ReplacementEffect extends TriggerReplacementBase { /** The has run. */ private boolean hasRun = false; - /** The is intrinsic. */ - private final boolean intrinsic; - /** * Checks for run. * @@ -53,9 +50,6 @@ public abstract class ReplacementEffect extends TriggerReplacementBase { public final boolean hasRun() { return this.hasRun; } - - /** The map params, denoting what to replace. */ - protected final Map mapParams; /** * Instantiates a new replacement effect. @@ -66,20 +60,20 @@ public abstract class ReplacementEffect extends TriggerReplacementBase { * the host */ public ReplacementEffect(final Map map, final Card host, final boolean intrinsic) { - mapParams = map; - this.setHostCard(host); this.intrinsic = intrinsic; + mapParams.putAll(map); + this.setHostCard(host); } /** * Checks if is secondary. * * @return true, if is secondary - */ + */ public final boolean isSecondary() { return this.getMapParams().containsKey("Secondary"); } - + /** * Ai should run. * @@ -102,7 +96,7 @@ public abstract class ReplacementEffect extends TriggerReplacementBase { compareTo = Integer.parseInt(strCmpTo); } catch (final Exception ignored) { if (sa == null) { - compareTo = CardFactoryUtil.xCount(effect.hostCard, effect.hostCard.getSVar(strCmpTo)); + compareTo = CardFactoryUtil.xCount(effect.hostCard, effect.hostCard.getSVar(strCmpTo)); } else { compareTo = AbilityUtils.calculateAmount(effect.hostCard, effect.hostCard.getSVar(strCmpTo), sa); } @@ -111,8 +105,8 @@ public abstract class ReplacementEffect extends TriggerReplacementBase { int left = 0; - if (sa == null) { - left = CardFactoryUtil.xCount(effect.hostCard, effect.hostCard.getSVar(svarToCheck)); + if (sa == null) { + left = CardFactoryUtil.xCount(effect.hostCard, effect.hostCard.getSVar(svarToCheck)); } else { left = AbilityUtils.calculateAmount(effect.hostCard, svarToCheck, sa); } @@ -139,18 +133,7 @@ public abstract class ReplacementEffect extends TriggerReplacementBase { this.hasRun = hasRun; } - /** - *

- * Getter for the field mapParams. - *

- * - * @return a {@link java.util.HashMap} object. - */ - public final Map getMapParams() { - return this.mapParams; - } - - /** + /** * Can replace. * * @param runParams @@ -257,33 +240,5 @@ public abstract class ReplacementEffect extends TriggerReplacementBase { } - /** The temporary. */ - private boolean temporary = false; - /** - * Sets the temporary. - * - * @param temp - * the new temporary - */ - public final void setTemporary(final boolean temp) { - this.temporary = temp; - } - - /** - * Checks if is temporary. - * - * @return true, if is temporary - */ - public final boolean isTemporary() { - return this.temporary; - } - /** - * Checks if is intrinsic. - * - * @return the isIntrinsic - */ - public boolean isIntrinsic() { - return this.intrinsic; - } } diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java index bce091669ad..e5dd2d76fd5 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java @@ -17,14 +17,6 @@ */ package forge.game.replacement; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; - import forge.card.MagicColor; import forge.game.Game; import forge.game.GameLogEntryType; @@ -35,6 +27,9 @@ import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.FileSection; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; /** * TODO: Write javadoc for this type. @@ -139,7 +134,7 @@ public class ReplacementHandler { possibleReplacers.remove(chosenRE); chosenRE.setHasRun(true); - ReplacementResult res = this.executeReplacement(runParams, chosenRE, decider, game); + ReplacementResult res = this.executeReplacement(runParams, chosenRE, decider, game); if (res == ReplacementResult.NotReplaced) { if (!possibleReplacers.isEmpty()) { res = run(runParams); @@ -149,7 +144,7 @@ public class ReplacementHandler { } chosenRE.setHasRun(false); String message = chosenRE.toString(); - if ( !StringUtils.isEmpty(message)) + if ( !StringUtils.isEmpty(message)) game.getGameLog().add(GameLogEntryType.EFFECT_REPLACED, chosenRE.toString()); return res; } @@ -165,7 +160,7 @@ public class ReplacementHandler { final ReplacementEffect replacementEffect, final Player decider, final Game game) { final Map mapParams = replacementEffect.getMapParams(); - SpellAbility effectSA = null; + SpellAbility effectSA = null; if (mapParams.containsKey("ReplaceWith")) { final String effectSVar = mapParams.get("ReplaceWith"); @@ -189,14 +184,14 @@ public class ReplacementHandler { tailend = tailend.getSubAbility(); } while(tailend != null); } - + // Decider gets to choose whether or not to apply the replacement. if (replacementEffect.getMapParams().containsKey("Optional")) { Player optDecider = decider; if (mapParams.containsKey("OptionalDecider") && (effectSA != null)) { effectSA.setActivatingPlayer(replacementEffect.getHostCard().getController()); optDecider = AbilityUtils.getDefinedPlayers(replacementEffect.getHostCard(), - mapParams.get("OptionalDecider"), effectSA).get(0); + mapParams.get("OptionalDecider"), effectSA).get(0); } String effectDesc = replacementEffect.toString().replace("CARDNAME", replacementEffect.getHostCard().getName()); diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementType.java b/forge-game/src/main/java/forge/game/replacement/ReplacementType.java index 7bb7a79de3e..6f83148cc28 100644 --- a/forge-game/src/main/java/forge/game/replacement/ReplacementType.java +++ b/forge-game/src/main/java/forge/game/replacement/ReplacementType.java @@ -1,11 +1,11 @@ package forge.game.replacement; +import forge.game.card.Card; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Map; -import forge.game.card.Card; - /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/spellability/Ability.java b/forge-game/src/main/java/forge/game/spellability/Ability.java index f1920cd82c0..f92850cb355 100644 --- a/forge-game/src/main/java/forge/game/spellability/Ability.java +++ b/forge-game/src/main/java/forge/game/spellability/Ability.java @@ -18,7 +18,6 @@ package forge.game.spellability; import com.esotericsoftware.minlog.Log; - import forge.card.mana.ManaCost; import forge.game.Game; import forge.game.card.Card; diff --git a/forge-game/src/main/java/forge/game/spellability/AbilityActivated.java b/forge-game/src/main/java/forge/game/spellability/AbilityActivated.java index 8d8c33373c1..c23f81d6b4b 100644 --- a/forge-game/src/main/java/forge/game/spellability/AbilityActivated.java +++ b/forge-game/src/main/java/forge/game/spellability/AbilityActivated.java @@ -17,8 +17,6 @@ */ package forge.game.spellability; -import java.util.ArrayList; - import forge.game.Game; import forge.game.GlobalRuleChange; import forge.game.card.Card; @@ -28,6 +26,8 @@ import forge.game.player.Player; import forge.game.staticability.StaticAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; + /** *

* Abstract Ability_Activated class. diff --git a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java index 0ffdc7ae759..7de406e8bc8 100644 --- a/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java +++ b/forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java @@ -17,15 +17,6 @@ */ package forge.game.spellability; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.lang3.StringUtils; - import forge.card.ColorSet; import forge.card.MagicColor; import forge.game.GameType; @@ -38,6 +29,14 @@ import forge.game.replacement.ReplacementHandler; import forge.game.replacement.ReplacementLayer; import forge.game.replacement.ReplacementResult; import forge.game.trigger.TriggerType; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** *

diff --git a/forge-game/src/main/java/forge/game/spellability/AbilitySub.java b/forge-game/src/main/java/forge/game/spellability/AbilitySub.java index 935c1db5828..0f67691f82c 100644 --- a/forge-game/src/main/java/forge/game/spellability/AbilitySub.java +++ b/forge-game/src/main/java/forge/game/spellability/AbilitySub.java @@ -17,8 +17,6 @@ */ package forge.game.spellability; -import java.util.Map; - import forge.ai.SpellAbilityAi; import forge.game.ability.AbilityFactory; import forge.game.ability.ApiType; @@ -32,6 +30,8 @@ import forge.game.card.CardFactory; import forge.game.cost.Cost; import forge.game.player.Player; +import java.util.Map; + /** *

* Abstract Ability_Sub class. diff --git a/forge-game/src/main/java/forge/game/spellability/AbilityTriggered.java b/forge-game/src/main/java/forge/game/spellability/AbilityTriggered.java index 7ea96defdaf..be4791c7bd9 100644 --- a/forge-game/src/main/java/forge/game/spellability/AbilityTriggered.java +++ b/forge-game/src/main/java/forge/game/spellability/AbilityTriggered.java @@ -17,8 +17,6 @@ */ package forge.game.spellability; -import java.util.Arrays; - import forge.Command; import forge.card.CardCharacteristicName; import forge.card.mana.ManaCost; @@ -26,6 +24,8 @@ import forge.game.card.Card; import forge.game.card.CardCharacteristics; import forge.game.trigger.ZCTrigger; +import java.util.Arrays; + /** *

* Ability_Triggered class. diff --git a/forge-game/src/main/java/forge/game/spellability/Spell.java b/forge-game/src/main/java/forge/game/spellability/Spell.java index 7312685f09e..07eccbbaaab 100644 --- a/forge-game/src/main/java/forge/game/spellability/Spell.java +++ b/forge-game/src/main/java/forge/game/spellability/Spell.java @@ -17,10 +17,6 @@ */ package forge.game.spellability; -import java.util.ArrayList; -import java.util.List; - - import forge.game.Game; import forge.game.card.Card; import forge.game.card.CardFactoryUtil; @@ -32,6 +28,9 @@ import forge.game.staticability.StaticAbility; import forge.game.zone.ZoneType; import forge.util.Expressions; +import java.util.ArrayList; +import java.util.List; + /** *

* Abstract Spell class. diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index f918a56de6c..69e592feb88 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -17,19 +17,9 @@ */ package forge.game.spellability; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.card.mana.ManaCost; import forge.game.Game; import forge.game.GameEntity; @@ -42,6 +32,9 @@ import forge.game.cost.CostPartMana; import forge.game.mana.Mana; import forge.game.player.Player; import forge.util.TextUtil; +import org.apache.commons.lang3.StringUtils; + +import java.util.*; //only SpellAbility can go on the stack //override any methods as needed diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java index 2ea76961eb3..72f51d79bfd 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityCondition.java @@ -17,12 +17,6 @@ */ package forge.game.spellability; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; - import forge.card.MagicColor; import forge.game.Game; import forge.game.GameObject; @@ -34,6 +28,11 @@ import forge.game.phase.PhaseType; import forge.game.player.Player; import forge.game.zone.ZoneType; import forge.util.Expressions; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** *

diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java index 26ec65dff4a..9659649aca7 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java @@ -17,10 +17,6 @@ */ package forge.game.spellability; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import forge.game.Game; import forge.game.ability.AbilityUtils; import forge.game.card.Card; @@ -32,6 +28,10 @@ import forge.game.zone.Zone; import forge.game.zone.ZoneType; import forge.util.Expressions; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + /** *

* SpellAbilityRestriction class. diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java index ea4589387d8..b77e7f325ff 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java @@ -17,14 +17,14 @@ */ package forge.game.spellability; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.trigger.TriggerType; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; + /** *

* SpellAbility_StackInstance class. diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbilityVariables.java b/forge-game/src/main/java/forge/game/spellability/SpellAbilityVariables.java index d530e2f1dd7..efc1b7e2bb4 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbilityVariables.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbilityVariables.java @@ -17,12 +17,12 @@ */ package forge.game.spellability; -import java.util.ArrayList; -import java.util.List; - import forge.game.phase.PhaseType; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.List; + /** *

* SpellAbilityVariables class. diff --git a/forge-game/src/main/java/forge/game/spellability/SpellPermanent.java b/forge-game/src/main/java/forge/game/spellability/SpellPermanent.java index 8f578094199..3507c1ba13e 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellPermanent.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellPermanent.java @@ -17,15 +17,7 @@ */ package forge.game.spellability; -import java.security.InvalidParameterException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.Iterables; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilCost; import forge.ai.ComputerUtilMana; @@ -45,6 +37,11 @@ import forge.game.replacement.ReplacementEffect; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.StringUtils; + +import java.security.InvalidParameterException; +import java.util.List; +import java.util.Map; /** *

@@ -227,7 +224,7 @@ public class SpellPermanent extends Spell { for (final Trigger tr : card.getTriggers()) { // These triggers all care for ETB effects - final HashMap params = tr.getMapParams(); + final Map params = tr.getMapParams(); if (tr.getMode() != TriggerType.ChangesZone) { continue; } diff --git a/forge-game/src/main/java/forge/game/spellability/TargetChoices.java b/forge-game/src/main/java/forge/game/spellability/TargetChoices.java index 642f85a44c1..92ebe6a1479 100644 --- a/forge-game/src/main/java/forge/game/spellability/TargetChoices.java +++ b/forge-game/src/main/java/forge/game/spellability/TargetChoices.java @@ -17,15 +17,14 @@ */ package forge.game.spellability; -import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.Iterables; - import forge.game.GameObject; import forge.game.card.Card; import forge.game.player.Player; +import java.util.ArrayList; +import java.util.List; + /** *

* Target_Choices class. diff --git a/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java b/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java index 0d1842cb55e..28c2dc8807a 100644 --- a/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java +++ b/forge-game/src/main/java/forge/game/spellability/TargetRestrictions.java @@ -17,13 +17,6 @@ */ package forge.game.spellability; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.card.CardType; import forge.game.Game; import forge.game.GameObject; @@ -31,6 +24,12 @@ import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.player.Player; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; /** *

diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java index 22fcfe2c276..9849c3a5610 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java @@ -17,10 +17,6 @@ */ package forge.game.staticability; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import forge.card.MagicColor; import forge.game.GameEntity; import forge.game.ability.AbilityUtils; @@ -33,6 +29,10 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.util.Expressions; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * The Class StaticAbility. */ diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java index 90ba0fdfdc9..72d10285124 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantAttackBlock.java @@ -17,13 +17,13 @@ */ package forge.game.staticability; -import java.util.HashMap; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CardFactoryUtil; import forge.game.cost.Cost; +import java.util.HashMap; + /** * The Class StaticAbility_CantBeCast. */ diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java index d36ff9fdc72..b0d73b8784a 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java @@ -17,14 +17,14 @@ */ package forge.game.staticability; -import java.util.HashMap; -import java.util.List; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.HashMap; +import java.util.List; + /** * The Class StaticAbility_CantBeCast. */ diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java index 575b6541377..5a9c75e7b0e 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantTarget.java @@ -17,13 +17,13 @@ */ package forge.game.staticability; -import java.util.HashMap; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.HashMap; + /** * The Class StaticAbilityCantTarget. */ diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java index f5ae654be8e..7bc6142930f 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java @@ -17,25 +17,12 @@ */ package forge.game.staticability; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.text.WordUtils; - import com.google.common.collect.Lists; - import forge.card.CardType; import forge.card.ColorSet; import forge.card.MagicColor; import forge.card.mana.ManaCostShard; -import forge.game.Game; -import forge.game.GlobalRuleChange; -import forge.game.StaticEffect; -import forge.game.StaticEffects; -import forge.game.TriggerReplacementBase; +import forge.game.*; import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityUtils; import forge.game.card.Card; @@ -51,6 +38,13 @@ import forge.game.spellability.SpellAbility; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerHandler; import forge.game.zone.ZoneType; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.text.WordUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; /** * The Class StaticAbility_Continuous. diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCostChange.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCostChange.java index 406ae3898a4..9e7ee4f67d5 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCostChange.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCostChange.java @@ -17,9 +17,6 @@ */ package forge.game.staticability; -import java.util.HashMap; -import java.util.List; - import forge.card.mana.ManaCostShard; import forge.game.card.Card; import forge.game.card.CardFactoryUtil; @@ -31,6 +28,9 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.HashMap; +import java.util.List; + /** * The Class StaticAbility_CantBeCast. */ diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java index 230abd3165e..9b7b25671ef 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityETBTapped.java @@ -17,10 +17,10 @@ */ package forge.game.staticability; -import java.util.HashMap; - import forge.game.card.Card; +import java.util.HashMap; + /** * The Class StaticAbility_CantBeCast. */ diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java index f5400eb1007..fb6322dc02f 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityMayLookAt.java @@ -17,12 +17,12 @@ */ package forge.game.staticability; -import java.util.HashMap; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.zone.ZoneType; +import java.util.HashMap; + /** * The Class StaticAbility_CantBeCast. */ diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java index 6ee428cff60..9a35872d38e 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityPreventDamage.java @@ -17,12 +17,12 @@ */ package forge.game.staticability; -import java.util.HashMap; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CardFactoryUtil; +import java.util.HashMap; + /** * The Class StaticAbility_PreventDamage. */ diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java index 6180270ee6a..6aa2d799933 100644 --- a/forge-game/src/main/java/forge/game/trigger/Trigger.java +++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java @@ -17,11 +17,6 @@ */ package forge.game.trigger; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import forge.game.Game; import forge.game.TriggerReplacementBase; import forge.game.card.Card; @@ -33,6 +28,11 @@ import forge.game.spellability.OptionalCost; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** *

* Abstract Trigger class. Constructed by reflection only @@ -70,20 +70,6 @@ public abstract class Trigger extends TriggerReplacementBase { this.id = id; } - /** The map params. */ - protected final HashMap mapParams = new HashMap(); - - /** - *

- * Getter for the field mapParams. - *

- * - * @return a {@link java.util.HashMap} object. - */ - public final HashMap getMapParams() { - return this.mapParams; - } - /** The run params. */ private Map runParams; @@ -116,8 +102,6 @@ public abstract class Trigger extends TriggerReplacementBase { return this.storedTriggeredObjects; } - /** The is intrinsic. */ - private final boolean intrinsic; private List validPhases; @@ -134,11 +118,11 @@ public abstract class Trigger extends TriggerReplacementBase { * the intrinsic */ public Trigger(final Map params, final Card host, final boolean intrinsic) { + this.intrinsic = intrinsic; + this.setRunParams(new HashMap()); this.mapParams.putAll(params); this.setHostCard(host); - - this.intrinsic = intrinsic; } /** @@ -216,7 +200,7 @@ public abstract class Trigger extends TriggerReplacementBase { *

* @param game * - * @param runParams2 + * @param runParams * a {@link java.util.HashMap} object. * @return a boolean. */ @@ -353,38 +337,6 @@ public abstract class Trigger extends TriggerReplacementBase { */ public abstract void setTriggeringObjects(SpellAbility sa); - /** The temporary. */ - private boolean temporary = false; - - /** - * Sets the temporary. - * - * @param temp - * the new temporary - */ - public final void setTemporary(final boolean temp) { - this.temporary = temp; - } - - /** - * Checks if is temporary. - * - * @return true, if is temporary - */ - public final boolean isTemporary() { - return this.temporary; - } - - /** - * Checks if is intrinsic. - * - * @return the isIntrinsic - */ - public boolean isIntrinsic() { - return this.intrinsic; - } - - /** * Gets the run params. * diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAlways.java b/forge-game/src/main/java/forge/game/trigger/TriggerAlways.java index abafcdbd36e..ada1d11b2f4 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAlways.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAlways.java @@ -17,11 +17,11 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** *

* Trigger_Always class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java index 748874a253d..519e76a2179 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java @@ -17,12 +17,12 @@ */ package forge.game.trigger; -import java.util.List; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.List; +import java.util.Map; + /** *

* Trigger_AttackerBlocked class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java index b5f52b5d7c6..60346862054 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java @@ -17,11 +17,11 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** *

* Trigger_AttackerUnblocked class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java index a3988de5e50..891c847bf0d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java @@ -17,13 +17,13 @@ */ package forge.game.trigger; -import java.util.List; -import java.util.Map; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.List; +import java.util.Map; + /** * TODO Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java index f0a7cccb556..c8eba13fe3e 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java @@ -17,14 +17,14 @@ */ package forge.game.trigger; -import java.util.List; -import java.util.Map; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; +import java.util.Map; + /** *

* Trigger_Attacks class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java index 193c89f0fb7..d1f590d264b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java @@ -17,11 +17,11 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** *

* Trigger_BecomesTarget class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java b/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java index 23d9ed07878..feb124a6cf8 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java @@ -17,11 +17,11 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java b/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java index 8adc657f6fd..742fb228de7 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java @@ -17,11 +17,11 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** *

* Trigger_Blocks class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java index f108767f865..f369f9c4933 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java @@ -17,14 +17,14 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardFactoryUtil; import forge.game.spellability.SpellAbility; import forge.util.Expressions; +import java.util.Map; + /** *

* Trigger_ChangesZone class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerClashed.java b/forge-game/src/main/java/forge/game/trigger/TriggerClashed.java index d92ba147a68..5a407a60837 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerClashed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerClashed.java @@ -17,11 +17,11 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** *

* Trigger_Clashed class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java index 77aa1c393f8..51b99b81974 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java @@ -17,12 +17,12 @@ */ package forge.game.trigger; -import java.util.List; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.List; + /** *

* Trigger_DamageDone class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java index 7f9988193e8..2b73e16a253 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java @@ -17,12 +17,6 @@ */ package forge.game.trigger; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import forge.card.mana.ManaCost; import forge.game.Game; import forge.game.GlobalRuleChange; @@ -38,6 +32,8 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; +import java.util.*; + public class TriggerHandler { private final ArrayList suppressedModes = new ArrayList(); @@ -327,8 +323,8 @@ public class TriggerHandler { // runs it if so. // Return true if the trigger went off, false otherwise. private void runSingleTrigger(final Trigger regtrig, final Map runParams) { - final Map triggerParams = regtrig.mapParams; - + final Map triggerParams = regtrig.getMapParams(); + // Any trigger should cause the phase not to skip for (Player p : game.getPlayers()) { p.getController().autoPassCancel(); diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java b/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java index 236a93c7cb2..74a4eaf6715 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java @@ -17,11 +17,11 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** *

* Trigger_LandPlayed class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java index 23adfb0bc69..8949faa552e 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java @@ -1,11 +1,11 @@ package forge.game.trigger; -import java.util.Map; - import forge.game.PlanarDice; import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java index 2f25e241af5..33ebb3ca95b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java @@ -1,10 +1,10 @@ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java index 3a84e1d9b85..c193abc4acd 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java @@ -1,10 +1,10 @@ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java b/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java index e19b2dff6bf..3af6dea412a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java @@ -17,11 +17,11 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** *

* Trigger_Taps class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java index a1760dc6965..74b597becca 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java @@ -17,13 +17,13 @@ */ package forge.game.trigger; -import java.util.List; - import forge.card.MagicColor; import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.util.List; + /** *

* Trigger_TapsForMana class. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java b/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java index 9e96d807d13..501f9d9b5f0 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java @@ -17,11 +17,11 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerType.java b/forge-game/src/main/java/forge/game/trigger/TriggerType.java index 4688292cc04..23dbe8b0785 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerType.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerType.java @@ -1,11 +1,11 @@ package forge.game.trigger; +import forge.game.card.Card; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Map; -import forge.game.card.Card; - /** * TODO: Write javadoc for this type. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java b/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java index adce6994c58..f67aa18392d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java @@ -17,11 +17,11 @@ */ package forge.game.trigger; -import java.util.Map; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; +import java.util.Map; + /** *

* Trigger_Untaps class. diff --git a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java index a05957a03d0..102831dfd6b 100644 --- a/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java +++ b/forge-game/src/main/java/forge/game/trigger/WrappedAbility.java @@ -1,9 +1,5 @@ package forge.game.trigger; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import forge.card.mana.ManaCost; import forge.game.Game; import forge.game.GameObject; @@ -11,13 +7,11 @@ import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.cost.Cost; import forge.game.player.Player; -import forge.game.spellability.Ability; -import forge.game.spellability.AbilitySub; -import forge.game.spellability.ISpellAbility; -import forge.game.spellability.SpellAbility; -import forge.game.spellability.SpellAbilityRestriction; -import forge.game.spellability.TargetChoices; -import forge.game.spellability.TargetRestrictions; +import forge.game.spellability.*; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; // Wrapper ability that checks the requirements again just before // resolving, for intervening if clauses. diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java index 6e5754596f2..e7608e0709e 100644 --- a/forge-game/src/main/java/forge/game/zone/MagicStack.java +++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java @@ -17,15 +17,6 @@ */ package forge.game.zone; -import java.util.ArrayList; -import java.util.Deque; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Stack; -import java.util.concurrent.LinkedBlockingDeque; - import com.esotericsoftware.minlog.Log; import com.google.common.collect.Iterables; import forge.card.mana.ManaCost; @@ -50,18 +41,13 @@ import forge.game.player.PlayerController.ManaPaymentPurpose; import forge.game.replacement.ReplacementEffect; import forge.game.replacement.ReplacementHandler; import forge.game.replacement.ReplacementLayer; -import forge.game.spellability.Ability; -import forge.game.spellability.AbilityStatic; -import forge.game.spellability.AbilityTriggered; -import forge.game.spellability.OptionalCost; -import forge.game.spellability.Spell; -import forge.game.spellability.SpellAbility; -import forge.game.spellability.SpellAbilityStackInstance; -import forge.game.spellability.TargetChoices; -import forge.game.spellability.TargetRestrictions; +import forge.game.spellability.*; import forge.game.trigger.Trigger; import forge.game.trigger.TriggerType; +import java.util.*; +import java.util.concurrent.LinkedBlockingDeque; + /** *

diff --git a/forge-game/src/main/java/forge/game/zone/PlayerZone.java b/forge-game/src/main/java/forge/game/zone/PlayerZone.java index 66637130c6d..16782847bf3 100644 --- a/forge-game/src/main/java/forge/game/zone/PlayerZone.java +++ b/forge-game/src/main/java/forge/game/zone/PlayerZone.java @@ -17,17 +17,16 @@ */ package forge.game.zone; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.util.Lang; +import java.util.List; + /** *

* DefaultPlayerZone class. diff --git a/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java b/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java index 6f236fa5001..eb73c652034 100644 --- a/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java +++ b/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java @@ -17,17 +17,16 @@ */ package forge.game.zone; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.staticability.StaticAbility; import forge.game.trigger.ZCTrigger; +import java.util.List; + /** *

* PlayerZoneComesIntoPlay class. diff --git a/forge-game/src/main/java/forge/game/zone/Zone.java b/forge-game/src/main/java/forge/game/zone/Zone.java index 41a8d574ac4..ed0275727ba 100644 --- a/forge-game/src/main/java/forge/game/zone/Zone.java +++ b/forge-game/src/main/java/forge/game/zone/Zone.java @@ -17,18 +17,9 @@ */ package forge.game.zone; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map.Entry; -import java.util.concurrent.CopyOnWriteArrayList; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.game.Game; import forge.game.card.Card; import forge.game.event.EventValueChangeType; @@ -38,6 +29,10 @@ import forge.util.CollectionSuppliers; import forge.util.maps.EnumMapOfLists; import forge.util.maps.MapOfLists; +import java.util.*; +import java.util.Map.Entry; +import java.util.concurrent.CopyOnWriteArrayList; + /** *

* DefaultPlayerZone class. diff --git a/forge-gui/src/main/java/forge/FThreads.java b/forge-gui/src/main/java/forge/FThreads.java index 25e82f3c24a..4b068be4392 100644 --- a/forge-gui/src/main/java/forge/FThreads.java +++ b/forge-gui/src/main/java/forge/FThreads.java @@ -1,12 +1,11 @@ package forge; +import forge.util.ThreadUtil; + +import javax.swing.*; import java.io.PrintStream; import java.lang.reflect.InvocationTargetException; -import javax.swing.SwingUtilities; - -import forge.util.ThreadUtil; - /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/ImageCache.java b/forge-gui/src/main/java/forge/ImageCache.java index fcf2d7b5340..bd0324b55e4 100644 --- a/forge-gui/src/main/java/forge/ImageCache.java +++ b/forge-gui/src/main/java/forge/ImageCache.java @@ -17,21 +17,10 @@ */ package forge; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.InputStream; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.ExecutionException; - -import javax.imageio.ImageIO; -import org.apache.commons.lang3.StringUtils; - import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader.InvalidCacheLoadException; import com.google.common.cache.LoadingCache; import com.mortennobel.imagescaling.ResampleOp; - import forge.card.CardDb; import forge.card.CardRules; import forge.card.CardSplitType; @@ -39,11 +28,20 @@ import forge.game.card.Card; import forge.game.player.IHasIcon; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinIcon; -import forge.item.PaperCard; import forge.item.InventoryItem; +import forge.item.PaperCard; import forge.properties.ForgePreferences.FPref; import forge.properties.NewConstants; import forge.util.Base64Coder; +import org.apache.commons.lang3.StringUtils; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.InputStream; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.ExecutionException; /** * This class stores ALL card images in a cache with soft values. this means diff --git a/forge-gui/src/main/java/forge/ImageLoader.java b/forge-gui/src/main/java/forge/ImageLoader.java index feb489b072a..a956733e32b 100644 --- a/forge-gui/src/main/java/forge/ImageLoader.java +++ b/forge-gui/src/main/java/forge/ImageLoader.java @@ -1,18 +1,15 @@ package forge; +import com.google.common.cache.CacheLoader; +import forge.error.BugReporter; +import forge.properties.NewConstants; +import org.apache.commons.lang3.StringUtils; + +import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.File; import java.io.IOException; -import javax.imageio.ImageIO; - -import org.apache.commons.lang3.StringUtils; - -import com.google.common.cache.CacheLoader; - -import forge.error.BugReporter; -import forge.properties.NewConstants; - final class ImageLoader extends CacheLoader { // image file extensions for various formats in order of likelihood // the last, empty, string is for keys that come in with an extension already in place diff --git a/forge-gui/src/main/java/forge/control/FControl.java b/forge-gui/src/main/java/forge/control/FControl.java index 6b7d1aa2fc8..d447cedf632 100644 --- a/forge-gui/src/main/java/forge/control/FControl.java +++ b/forge-gui/src/main/java/forge/control/FControl.java @@ -17,25 +17,6 @@ */ package forge.control; -import java.awt.Component; -import java.awt.KeyEventDispatcher; -import java.awt.KeyboardFocusManager; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; -import java.awt.event.KeyEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.ImageIcon; -import javax.swing.JLayeredPane; -import javax.swing.SwingUtilities; -import javax.swing.WindowConstants; - -import org.apache.commons.lang3.StringUtils; - import forge.Constant.Preferences; import forge.FThreads; import forge.ImageCache; @@ -48,19 +29,12 @@ import forge.game.Match; import forge.game.card.Card; import forge.game.player.LobbyPlayer; import forge.game.player.LobbyPlayerAi; -import forge.gui.player.LobbyPlayerHuman; import forge.game.player.Player; import forge.game.player.RegisteredPlayer; import forge.gui.GuiDialog; import forge.gui.SOverlayUtils; import forge.gui.deckeditor.CDeckEditorUI; -import forge.gui.framework.EDocID; -import forge.gui.framework.FScreen; -import forge.gui.framework.InvalidLayoutFileException; -import forge.gui.framework.SDisplayUtil; -import forge.gui.framework.SLayoutIO; -import forge.gui.framework.SOverflowUtil; -import forge.gui.framework.SResizingUtil; +import forge.gui.framework.*; import forge.gui.home.settings.GamePlayerUtil; import forge.gui.match.CMatchUI; import forge.gui.match.VMatchUI; @@ -71,6 +45,7 @@ import forge.gui.match.controllers.CStack; import forge.gui.match.views.VAntes; import forge.gui.match.views.VField; import forge.gui.menus.ForgeMenu; +import forge.gui.player.LobbyPlayerHuman; import forge.gui.toolbox.FOptionPane; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.itemmanager.SItemManagerIO; @@ -84,6 +59,14 @@ import forge.quest.io.QuestDataIO; import forge.sound.SoundSystem; import forge.view.FFrame; import forge.view.FView; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; +import java.io.File; +import java.util.ArrayList; +import java.util.List; /** *

diff --git a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java index 403159694f4..bcdaa715516 100644 --- a/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java +++ b/forge-gui/src/main/java/forge/control/FControlGameEventHandler.java @@ -1,46 +1,10 @@ package forge.control; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; -import java.util.Vector; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.eventbus.Subscribe; - import forge.FThreads; import forge.game.Game; import forge.game.card.Card; -import forge.game.event.GameEvent; -import forge.game.event.GameEventAnteCardsSelected; -import forge.game.event.GameEventAttackersDeclared; -import forge.game.event.GameEventBlockersDeclared; -import forge.game.event.GameEventCardAttachment; -import forge.game.event.GameEventCardCounters; -import forge.game.event.GameEventCardDamaged; -import forge.game.event.GameEventCardPhased; -import forge.game.event.GameEventCardStatsChanged; -import forge.game.event.GameEventCardTapped; -import forge.game.event.GameEventCombatEnded; -import forge.game.event.GameEventGameFinished; -import forge.game.event.GameEventGameOutcome; -import forge.game.event.GameEventManaPool; -import forge.game.event.GameEventPlayerControl; -import forge.game.event.GameEventPlayerLivesChanged; -import forge.game.event.GameEventPlayerPoisoned; -import forge.game.event.GameEventPlayerPriority; -import forge.game.event.GameEventSpellAbilityCast; -import forge.game.event.GameEventSpellRemovedFromStack; -import forge.game.event.GameEventSpellResolved; -import forge.game.event.GameEventTurnBegan; -import forge.game.event.GameEventTurnPhase; -import forge.game.event.GameEventZone; -import forge.game.event.IGameEventVisitor; +import forge.game.event.*; import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseType; import forge.game.player.Player; @@ -62,6 +26,11 @@ import forge.gui.toolbox.special.PhaseLabel; import forge.net.FServer; import forge.util.Lang; import forge.util.maps.MapOfLists; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.*; +import java.util.Map.Entry; +import java.util.concurrent.atomic.AtomicBoolean; public class FControlGameEventHandler extends IGameEventVisitor.Base { private final FControl fc; diff --git a/forge-gui/src/main/java/forge/control/FControlGamePlayback.java b/forge-gui/src/main/java/forge/control/FControlGamePlayback.java index d51be15436e..b514fb97c8e 100644 --- a/forge-gui/src/main/java/forge/control/FControlGamePlayback.java +++ b/forge-gui/src/main/java/forge/control/FControlGamePlayback.java @@ -1,25 +1,15 @@ package forge.control; +import com.google.common.eventbus.Subscribe; +import forge.FThreads; +import forge.game.event.*; +import forge.gui.input.InputPlaybackControl; +import forge.gui.match.CMatchUI; + import java.util.concurrent.BrokenBarrierException; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.atomic.AtomicBoolean; -import com.google.common.eventbus.Subscribe; - -import forge.FThreads; -import forge.game.event.GameEvent; -import forge.game.event.GameEventBlockersDeclared; -import forge.game.event.GameEventGameFinished; -import forge.game.event.GameEventGameStarted; -import forge.game.event.GameEventLandPlayed; -import forge.game.event.GameEventPlayerPriority; -import forge.game.event.GameEventSpellAbilityCast; -import forge.game.event.GameEventSpellResolved; -import forge.game.event.GameEventTurnPhase; -import forge.game.event.IGameEventVisitor; -import forge.gui.input.InputPlaybackControl; -import forge.gui.match.CMatchUI; - public class FControlGamePlayback extends IGameEventVisitor.Base { private final FControl fc; diff --git a/forge-gui/src/main/java/forge/control/InputQueue.java b/forge-gui/src/main/java/forge/control/InputQueue.java index 110b830ed0b..c4b2fa05d3d 100644 --- a/forge-gui/src/main/java/forge/control/InputQueue.java +++ b/forge-gui/src/main/java/forge/control/InputQueue.java @@ -17,15 +17,15 @@ */ package forge.control; -import java.util.Observable; -import java.util.concurrent.BlockingDeque; -import java.util.concurrent.LinkedBlockingDeque; - import forge.game.Game; import forge.gui.input.Input; import forge.gui.input.InputLockUI; import forge.gui.input.InputSynchronized; +import java.util.Observable; +import java.util.concurrent.BlockingDeque; +import java.util.concurrent.LinkedBlockingDeque; + /** *

* InputControl class. diff --git a/forge-gui/src/main/java/forge/control/KeyboardShortcuts.java b/forge-gui/src/main/java/forge/control/KeyboardShortcuts.java index c13f0179c40..1e057326c28 100644 --- a/forge-gui/src/main/java/forge/control/KeyboardShortcuts.java +++ b/forge-gui/src/main/java/forge/control/KeyboardShortcuts.java @@ -1,21 +1,5 @@ package forge.control; -import java.awt.event.ActionEvent; -import java.awt.event.InputEvent; -import java.awt.event.KeyEvent; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.ActionMap; -import javax.swing.InputMap; -import javax.swing.JComponent; -import javax.swing.KeyStroke; - -import org.apache.commons.lang3.StringUtils; - import forge.Singletons; import forge.gui.framework.EDocID; import forge.gui.framework.FScreen; @@ -24,6 +8,15 @@ import forge.gui.home.settings.VSubmenuPreferences.KeyboardShortcutField; import forge.gui.match.CMatchUI; import forge.gui.match.controllers.CDock; import forge.properties.ForgePreferences.FPref; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; /** * Consolidates keyboard shortcut assembly into one location diff --git a/forge-gui/src/main/java/forge/control/RestartUtil.java b/forge-gui/src/main/java/forge/control/RestartUtil.java index 410ad901515..d72903aeb18 100644 --- a/forge-gui/src/main/java/forge/control/RestartUtil.java +++ b/forge-gui/src/main/java/forge/control/RestartUtil.java @@ -1,12 +1,12 @@ package forge.control; +import forge.Singletons; + import java.io.File; import java.io.IOException; import java.lang.management.ManagementFactory; import java.util.List; -import forge.Singletons; - /** * Restarts a java app. * Credit: http://leolewis.website.org/wordpress/2011/07/06/programmatically-restart-a-java-application/ diff --git a/forge-gui/src/main/java/forge/deck/io/DeckGroupSerializer.java b/forge-gui/src/main/java/forge/deck/io/DeckGroupSerializer.java index b2c0d21eec8..61c81498e1b 100644 --- a/forge-gui/src/main/java/forge/deck/io/DeckGroupSerializer.java +++ b/forge-gui/src/main/java/forge/deck/io/DeckGroupSerializer.java @@ -17,18 +17,16 @@ */ package forge.deck.io; -import java.io.File; -import java.io.FilenameFilter; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.ImmutableList; - import forge.deck.Deck; import forge.deck.DeckGroup; import forge.util.IItemSerializer; import forge.util.storage.StorageReaderFolder; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.List; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java b/forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java index 2624ac60b13..72135aadd8a 100644 --- a/forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java +++ b/forge-gui/src/main/java/forge/deck/io/DeckHtmlSerializer.java @@ -1,16 +1,5 @@ package forge.deck.io; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.Map.Entry; - import forge.ImageCache; import forge.deck.Deck; import forge.item.PaperCard; @@ -20,6 +9,13 @@ import freemarker.template.DefaultObjectWrapper; import freemarker.template.Template; import freemarker.template.TemplateException; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.util.*; +import java.util.Map.Entry; + public class DeckHtmlSerializer { public static void writeDeckHtml(final Deck d, final File f) { try { diff --git a/forge-gui/src/main/java/forge/deck/io/OldDeckParser.java b/forge-gui/src/main/java/forge/deck/io/OldDeckParser.java index e0d4e0e65ce..4dee8514343 100644 --- a/forge-gui/src/main/java/forge/deck/io/OldDeckParser.java +++ b/forge-gui/src/main/java/forge/deck/io/OldDeckParser.java @@ -17,17 +17,6 @@ */ package forge.deck.io; -import java.io.File; -import java.io.FilenameFilter; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.TreeMap; - -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.MutablePair; -import org.apache.commons.lang3.tuple.Pair; - import forge.deck.Deck; import forge.deck.DeckGroup; import forge.gui.toolbox.FOptionPane; @@ -35,6 +24,16 @@ import forge.properties.NewConstants; import forge.util.FileSection; import forge.util.FileUtil; import forge.util.storage.IStorage; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.MutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.io.File; +import java.io.FilenameFilter; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.TreeMap; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/error/BugReporter.java b/forge-gui/src/main/java/forge/error/BugReporter.java index ac5fff873ac..291ceff127d 100644 --- a/forge-gui/src/main/java/forge/error/BugReporter.java +++ b/forge-gui/src/main/java/forge/error/BugReporter.java @@ -17,45 +17,25 @@ */ package forge.error; -import java.awt.Desktop; -import java.awt.FlowLayout; -import java.awt.Font; -import java.awt.Toolkit; -import java.awt.datatransfer.StringSelection; -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.net.URI; -import java.util.ArrayList; -import java.util.Map; -import java.util.Map.Entry; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JFileChooser; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.KeyStroke; - -import net.miginfocom.swing.MigLayout; - -import org.apache.commons.lang3.StringUtils; - import forge.FThreads; import forge.gui.WrapLayout; import forge.gui.toolbox.FHyperlink; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FOptionPane; import forge.util.BuildInfo; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.awt.*; +import java.awt.datatransfer.StringSelection; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.io.*; +import java.net.URI; +import java.util.ArrayList; +import java.util.Map; +import java.util.Map.Entry; /** * The class ErrorViewer. Enables showing and saving error messages that diff --git a/forge-gui/src/main/java/forge/error/ExceptionHandler.java b/forge-gui/src/main/java/forge/error/ExceptionHandler.java index c497360e78d..2a1eff11db3 100644 --- a/forge-gui/src/main/java/forge/error/ExceptionHandler.java +++ b/forge-gui/src/main/java/forge/error/ExceptionHandler.java @@ -18,10 +18,10 @@ package forge.error; -import java.lang.Thread.UncaughtExceptionHandler; - import com.esotericsoftware.minlog.Log; +import java.lang.Thread.UncaughtExceptionHandler; + /** * This class handles all exceptions that weren't caught by showing the error to * the user. diff --git a/forge-gui/src/main/java/forge/gauntlet/GauntletData.java b/forge-gui/src/main/java/forge/gauntlet/GauntletData.java index b7d4f282887..4eaa6b3295f 100644 --- a/forge-gui/src/main/java/forge/gauntlet/GauntletData.java +++ b/forge-gui/src/main/java/forge/gauntlet/GauntletData.java @@ -1,15 +1,14 @@ package forge.gauntlet; +import com.thoughtworks.xstream.annotations.XStreamOmitField; +import forge.deck.Deck; + import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.thoughtworks.xstream.annotations.XStreamOmitField; - -import forge.deck.Deck; - /** * Handles layout saving and loading. diff --git a/forge-gui/src/main/java/forge/gauntlet/GauntletIO.java b/forge-gui/src/main/java/forge/gauntlet/GauntletIO.java index b4dad2501fc..41146efd0ed 100644 --- a/forge-gui/src/main/java/forge/gauntlet/GauntletIO.java +++ b/forge-gui/src/main/java/forge/gauntlet/GauntletIO.java @@ -1,31 +1,23 @@ package forge.gauntlet; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FilenameFilter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.Map.Entry; -import java.util.zip.GZIPInputStream; -import java.util.zip.GZIPOutputStream; - -import org.apache.commons.lang3.StringUtils; - import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.Converter; import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.UnmarshallingContext; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; - import forge.Singletons; import forge.deck.CardPool; import forge.error.BugReporter; import forge.item.PaperCard; import forge.properties.NewConstants; import forge.util.IgnoringXStream; +import org.apache.commons.lang3.StringUtils; + +import java.io.*; +import java.util.Map.Entry; +import java.util.zip.GZIPInputStream; +import java.util.zip.GZIPOutputStream; public class GauntletIO { /** Prompt in text field for new (unsaved) built gauntlets. */ diff --git a/forge-gui/src/main/java/forge/gui/CardDetailPanel.java b/forge-gui/src/main/java/forge/gui/CardDetailPanel.java index 82f83c899eb..40f4bd7751b 100644 --- a/forge-gui/src/main/java/forge/gui/CardDetailPanel.java +++ b/forge-gui/src/main/java/forge/gui/CardDetailPanel.java @@ -18,23 +18,6 @@ package forge.gui; -import java.awt.Color; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.awt.GridLayout; -import java.util.ArrayList; -import java.util.Iterator; - -import javax.swing.BorderFactory; -import javax.swing.JLabel; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import javax.swing.border.Border; -import javax.swing.border.EmptyBorder; -import javax.swing.border.EtchedBorder; - -import org.apache.commons.lang3.StringUtils; - import forge.Singletons; import forge.card.CardCharacteristicName; import forge.card.CardEdition; @@ -46,17 +29,22 @@ import forge.game.card.CardUtil; import forge.game.card.CounterType; import forge.game.player.Player; import forge.game.zone.ZoneType; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FPanel; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FHtmlViewer; +import forge.gui.toolbox.*; import forge.gui.toolbox.FSkin.SkinnedPanel; import forge.item.IPaperCard; import forge.item.InventoryItemFromSet; -import forge.item.SealedProduct; import forge.item.PreconDeck; +import forge.item.SealedProduct; import forge.util.Lang; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; +import javax.swing.border.EtchedBorder; +import java.awt.*; +import java.util.ArrayList; +import java.util.Iterator; /** * The class CardDetailPanel. Shows the details of a card. diff --git a/forge-gui/src/main/java/forge/gui/CardListViewer.java b/forge-gui/src/main/java/forge/gui/CardListViewer.java index b69bc3be055..dffa1d69132 100644 --- a/forge-gui/src/main/java/forge/gui/CardListViewer.java +++ b/forge-gui/src/main/java/forge/gui/CardListViewer.java @@ -18,19 +18,6 @@ package forge.gui; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowEvent; -import java.awt.event.WindowFocusListener; -import java.util.Collections; -import java.util.List; - -import javax.swing.AbstractListModel; -import javax.swing.Icon; -import javax.swing.JList; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - import forge.game.card.Card; import forge.gui.toolbox.FButton; import forge.gui.toolbox.FLabel; @@ -38,6 +25,16 @@ import forge.gui.toolbox.FScrollPane; import forge.item.PaperCard; import forge.view.FDialog; +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowEvent; +import java.awt.event.WindowFocusListener; +import java.util.Collections; +import java.util.List; + /** * A simple class that shows a list of cards in a dialog with preview in its * right part. diff --git a/forge-gui/src/main/java/forge/gui/CardPicturePanel.java b/forge-gui/src/main/java/forge/gui/CardPicturePanel.java index b76397af61d..10758bbf207 100644 --- a/forge-gui/src/main/java/forge/gui/CardPicturePanel.java +++ b/forge-gui/src/main/java/forge/gui/CardPicturePanel.java @@ -18,11 +18,6 @@ package forge.gui; -import java.awt.BorderLayout; -import java.awt.image.BufferedImage; - -import javax.swing.JPanel; - import forge.ImageCache; import forge.ImageKeys; import forge.Singletons; @@ -34,6 +29,10 @@ import forge.gui.toolbox.imaging.FImageUtil; import forge.item.InventoryItem; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import java.awt.*; +import java.awt.image.BufferedImage; + /** * Displays image associated with a card or inventory item. * diff --git a/forge-gui/src/main/java/forge/gui/CardPreferences.java b/forge-gui/src/main/java/forge/gui/CardPreferences.java index 89cdbfe8d4a..575ef112189 100644 --- a/forge-gui/src/main/java/forge/gui/CardPreferences.java +++ b/forge-gui/src/main/java/forge/gui/CardPreferences.java @@ -1,20 +1,15 @@ package forge.gui; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.util.Iterator; -import java.util.Map; -import java.util.HashMap; - -import javax.xml.stream.XMLEventFactory; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLEventWriter; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.*; import javax.xml.stream.events.Attribute; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; /** * Preferences associated with individual cards diff --git a/forge-gui/src/main/java/forge/gui/DualListBox.java b/forge-gui/src/main/java/forge/gui/DualListBox.java index 3a107dd2c52..b9200bacba6 100644 --- a/forge-gui/src/main/java/forge/gui/DualListBox.java +++ b/forge-gui/src/main/java/forge/gui/DualListBox.java @@ -1,38 +1,23 @@ package forge.gui; -import java.awt.BorderLayout; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JPanel; -import javax.swing.ListModel; -import javax.swing.SwingUtilities; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - import forge.game.card.Card; import forge.game.spellability.SpellAbility; import forge.gui.match.CMatchUI; -import forge.gui.toolbox.FButton; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FList; -import forge.gui.toolbox.FPanel; -import forge.gui.toolbox.FScrollPane; -import forge.item.PaperCard; +import forge.gui.toolbox.*; import forge.item.IPaperCard; +import forge.item.PaperCard; import forge.view.FDialog; +import javax.swing.*; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.*; +import java.awt.event.*; +import java.util.ArrayList; +import java.util.List; + // An input box for handling the order of choices. // Left box has the original choices // Right box has the final order diff --git a/forge-gui/src/main/java/forge/gui/FNetOverlay.java b/forge-gui/src/main/java/forge/gui/FNetOverlay.java index d03b1447db5..3df009a0422 100644 --- a/forge-gui/src/main/java/forge/gui/FNetOverlay.java +++ b/forge-gui/src/main/java/forge/gui/FNetOverlay.java @@ -1,27 +1,20 @@ package forge.gui; -import java.awt.Graphics; -import java.awt.Rectangle; +import forge.control.ChatArea; +import forge.gui.toolbox.*; +import forge.gui.toolbox.FSkin.SkinnedPanel; +import forge.net.FServer; +import forge.net.Lobby; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.text.SimpleDateFormat; import java.util.Date; -import javax.swing.ScrollPaneConstants; -import org.apache.commons.lang3.StringUtils; - -import net.miginfocom.swing.MigLayout; -import forge.control.ChatArea; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FSkin.SkinnedPanel; -import forge.gui.toolbox.FTextArea; -import forge.gui.toolbox.FTextField; -import forge.gui.toolbox.SmartScroller; -import forge.net.FServer; -import forge.net.Lobby; - /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/ForgeAction.java b/forge-gui/src/main/java/forge/gui/ForgeAction.java index 5a91253866b..71281626f26 100644 --- a/forge-gui/src/main/java/forge/gui/ForgeAction.java +++ b/forge-gui/src/main/java/forge/gui/ForgeAction.java @@ -17,9 +17,7 @@ */ package forge.gui; -import javax.swing.AbstractAction; -import javax.swing.AbstractButton; -import javax.swing.JMenuItem; +import javax.swing.*; @SuppressWarnings("serial") public abstract class ForgeAction extends AbstractAction { diff --git a/forge-gui/src/main/java/forge/gui/GuiChoose.java b/forge-gui/src/main/java/forge/gui/GuiChoose.java index 10f75dc9dbb..9f503562558 100644 --- a/forge-gui/src/main/java/forge/gui/GuiChoose.java +++ b/forge-gui/src/main/java/forge/gui/GuiChoose.java @@ -1,30 +1,21 @@ package forge.gui; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.FutureTask; - -import javax.swing.JList; -import javax.swing.WindowConstants; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Function; import com.google.common.collect.Iterables; - import forge.FThreads; import forge.Singletons; import forge.game.card.Card; import forge.gui.match.CMatchUI; import forge.gui.toolbox.FOptionPane; import forge.item.InventoryItem; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.util.*; +import java.util.concurrent.Callable; +import java.util.concurrent.FutureTask; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/gui/GuiDialog.java b/forge-gui/src/main/java/forge/gui/GuiDialog.java index 1ff2aa176d7..399de840dd6 100644 --- a/forge-gui/src/main/java/forge/gui/GuiDialog.java +++ b/forge-gui/src/main/java/forge/gui/GuiDialog.java @@ -1,16 +1,14 @@ package forge.gui; -import java.util.concurrent.Callable; -import java.util.concurrent.FutureTask; - -import javax.swing.UIManager; - -import org.apache.commons.lang3.StringUtils; - import forge.FThreads; import forge.game.card.Card; import forge.gui.match.CMatchUI; import forge.gui.toolbox.FOptionPane; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.util.concurrent.Callable; +import java.util.concurrent.FutureTask; /** * Holds player interactions using standard windows diff --git a/forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java b/forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java index 3bb3c812a35..bb4bd87ec03 100644 --- a/forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java +++ b/forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java @@ -17,23 +17,8 @@ */ package forge.gui; -import java.io.BufferedReader; -import java.io.DataInputStream; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.swing.JFileChooser; import com.google.common.base.Predicates; import com.google.common.collect.Lists; - import forge.Singletons; import forge.card.CardCharacteristicName; import forge.game.Game; @@ -44,18 +29,23 @@ import forge.game.card.CardLists; import forge.game.card.CardPredicates; import forge.game.card.CounterType; import forge.game.phase.PhaseType; -import forge.gui.player.HumanPlay; -import forge.gui.toolbox.FOptionPane; import forge.game.player.Player; import forge.game.spellability.AbilityManaPart; import forge.game.spellability.SpellAbility; import forge.game.trigger.TriggerType; import forge.game.zone.ZoneType; import forge.gui.input.InputSelectCardsFromList; +import forge.gui.player.HumanPlay; +import forge.gui.toolbox.FOptionPane; import forge.item.IPaperCard; import forge.item.PaperCard; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import java.io.*; +import java.util.*; +import java.util.Map.Entry; + public final class GuiDisplayUtil { private GuiDisplayUtil() { throw new AssertionError(); diff --git a/forge-gui/src/main/java/forge/gui/GuiProgressBarWindow.java b/forge-gui/src/main/java/forge/gui/GuiProgressBarWindow.java index 0bef33d054e..8ccba44ad83 100644 --- a/forge-gui/src/main/java/forge/gui/GuiProgressBarWindow.java +++ b/forge-gui/src/main/java/forge/gui/GuiProgressBarWindow.java @@ -17,14 +17,12 @@ */ package forge.gui; -import java.awt.Dimension; - -import javax.swing.JPanel; -import javax.swing.JProgressBar; -import javax.swing.border.EmptyBorder; - import forge.view.FDialog; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; + /** *

* Gui_ProgressBarWindow class. diff --git a/forge-gui/src/main/java/forge/gui/GuiUtils.java b/forge-gui/src/main/java/forge/gui/GuiUtils.java index 1f378814528..8aa43ff7cad 100644 --- a/forge-gui/src/main/java/forge/gui/GuiUtils.java +++ b/forge-gui/src/main/java/forge/gui/GuiUtils.java @@ -17,26 +17,19 @@ */ package forge.gui; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontFormatException; +import forge.game.card.Card; +import forge.gui.match.VMatchUI; +import forge.gui.match.views.VField; +import forge.view.arcane.CardPanel; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; import java.io.IOException; import java.util.List; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.JPopupMenu; -import javax.swing.JSeparator; -import javax.swing.KeyStroke; - -import forge.game.card.Card; -import forge.gui.match.VMatchUI; -import forge.gui.match.views.VField; -import forge.view.arcane.CardPanel; - /** *

* GuiUtils class. diff --git a/forge-gui/src/main/java/forge/gui/ImportDialog.java b/forge-gui/src/main/java/forge/gui/ImportDialog.java index b82b47e530a..f7cfe5bbd39 100644 --- a/forge-gui/src/main/java/forge/gui/ImportDialog.java +++ b/forge-gui/src/main/java/forge/gui/ImportDialog.java @@ -17,7 +17,22 @@ */ package forge.gui; -import java.awt.Font; +import forge.Command; +import forge.error.BugReporter; +import forge.gui.ImportSourceAnalyzer.OpType; +import forge.gui.toolbox.*; +import forge.properties.NewConstants; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; + +import javax.swing.*; +import javax.swing.Timer; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -25,52 +40,10 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.nio.channels.FileChannel; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; +import java.util.*; import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; import java.util.concurrent.ConcurrentSkipListMap; -import javax.swing.JFileChooser; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JProgressBar; -import javax.swing.JScrollBar; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingUtilities; -import javax.swing.SwingWorker; -import javax.swing.Timer; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; - -import net.miginfocom.swing.MigLayout; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; - -import forge.Command; -import forge.error.BugReporter; -import forge.gui.ImportSourceAnalyzer.OpType; -import forge.gui.toolbox.FButton; -import forge.gui.toolbox.FCheckBox; -import forge.gui.toolbox.FComboBoxWrapper; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FOptionPane; -import forge.gui.toolbox.FOverlay; -import forge.gui.toolbox.FPanel; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FTextField; -import forge.gui.toolbox.SmartScroller; -import forge.properties.NewConstants; - /** * This class implements an overlay-based dialog that imports data from a user-selected directory * into the correct locations in the user and cache directories. There is a lot of I/O and data diff --git a/forge-gui/src/main/java/forge/gui/ImportSourceAnalyzer.java b/forge-gui/src/main/java/forge/gui/ImportSourceAnalyzer.java index 7ac17463e0d..d464c00eda1 100644 --- a/forge-gui/src/main/java/forge/gui/ImportSourceAnalyzer.java +++ b/forge-gui/src/main/java/forge/gui/ImportSourceAnalyzer.java @@ -17,25 +17,24 @@ */ package forge.gui; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import forge.ImageCache; +import forge.Singletons; +import forge.card.CardEdition; +import forge.card.CardRules; +import forge.item.IPaperCard; +import forge.item.PaperCard; +import forge.properties.NewConstants; +import forge.util.FileUtil; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; + import java.io.File; import java.util.HashMap; import java.util.Locale; import java.util.Map; import java.util.TreeMap; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; - -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; - -import forge.ImageCache; -import forge.Singletons; -import forge.card.CardEdition; -import forge.card.CardRules; -import forge.item.PaperCard; -import forge.item.IPaperCard; -import forge.properties.NewConstants; -import forge.util.FileUtil; public class ImportSourceAnalyzer { public static enum OpType { diff --git a/forge-gui/src/main/java/forge/gui/InputProxy.java b/forge-gui/src/main/java/forge/gui/InputProxy.java index dabead2b7d0..5087b9500a5 100644 --- a/forge-gui/src/main/java/forge/gui/InputProxy.java +++ b/forge-gui/src/main/java/forge/gui/InputProxy.java @@ -17,11 +17,6 @@ */ package forge.gui; -import java.awt.event.MouseEvent; -import java.util.Observable; -import java.util.Observer; -import java.util.concurrent.atomic.AtomicReference; - import forge.FThreads; import forge.Singletons; import forge.game.Game; @@ -32,6 +27,11 @@ import forge.gui.input.Input; import forge.gui.input.InputPassPriority; import forge.gui.toolbox.FOptionPane; +import java.awt.event.MouseEvent; +import java.util.Observable; +import java.util.Observer; +import java.util.concurrent.atomic.AtomicReference; + /** *

* GuiInput class. diff --git a/forge-gui/src/main/java/forge/gui/ListChooser.java b/forge-gui/src/main/java/forge/gui/ListChooser.java index a6ac55cce5e..74a64532c4e 100644 --- a/forge-gui/src/main/java/forge/gui/ListChooser.java +++ b/forge-gui/src/main/java/forge/gui/ListChooser.java @@ -18,32 +18,24 @@ package forge.gui; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; -import java.util.Collection; -import java.util.List; - -import javax.swing.AbstractListModel; -import javax.swing.DefaultListCellRenderer; -import javax.swing.JList; -import javax.swing.ListCellRenderer; -import javax.swing.ListSelectionModel; -import javax.swing.WindowConstants; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - import com.google.common.base.Function; import com.google.common.collect.Lists; - import forge.FThreads; import forge.gui.toolbox.FList; import forge.gui.toolbox.FMouseAdapter; import forge.gui.toolbox.FOptionPane; import forge.gui.toolbox.FScrollPane; +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.*; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.util.Collection; +import java.util.List; + /** * A simple class that shows a list of choices in a dialog. Two properties * influence the behavior of a list chooser: minSelection and maxSelection. diff --git a/forge-gui/src/main/java/forge/gui/MouseUtil.java b/forge-gui/src/main/java/forge/gui/MouseUtil.java index b399f7a155e..c31d3db789e 100644 --- a/forge-gui/src/main/java/forge/gui/MouseUtil.java +++ b/forge-gui/src/main/java/forge/gui/MouseUtil.java @@ -1,9 +1,9 @@ package forge.gui; -import java.awt.Cursor; - import forge.view.FView; +import java.awt.*; + public final class MouseUtil { private MouseUtil() { } diff --git a/forge-gui/src/main/java/forge/gui/MultiLineLabel.java b/forge-gui/src/main/java/forge/gui/MultiLineLabel.java index 3347d84a569..30131e06a9f 100644 --- a/forge-gui/src/main/java/forge/gui/MultiLineLabel.java +++ b/forge-gui/src/main/java/forge/gui/MultiLineLabel.java @@ -17,10 +17,8 @@ */ package forge.gui; -import java.awt.Rectangle; - -import javax.swing.JLabel; -import javax.swing.SwingConstants; +import javax.swing.*; +import java.awt.*; /** * A {@link JLabel} with support for multi-line text that wraps when the line diff --git a/forge-gui/src/main/java/forge/gui/MultiLineLabelUI.java b/forge-gui/src/main/java/forge/gui/MultiLineLabelUI.java index 5cdc8b72018..9120b1ff1c7 100644 --- a/forge-gui/src/main/java/forge/gui/MultiLineLabelUI.java +++ b/forge-gui/src/main/java/forge/gui/MultiLineLabelUI.java @@ -17,11 +17,12 @@ */ package forge.gui; -import java.awt.Dimension; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Insets; -import java.awt.Rectangle; +import javax.swing.*; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.LabelUI; +import javax.swing.plaf.basic.BasicLabelUI; +import javax.swing.text.*; +import java.awt.*; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; import java.beans.PropertyChangeEvent; @@ -29,21 +30,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.swing.Icon; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.SwingConstants; -import javax.swing.plaf.ComponentUI; -import javax.swing.plaf.LabelUI; -import javax.swing.plaf.basic.BasicLabelUI; -import javax.swing.text.BadLocationException; -import javax.swing.text.Document; -import javax.swing.text.Element; -import javax.swing.text.PlainDocument; -import javax.swing.text.Segment; -import javax.swing.text.Utilities; -import javax.swing.text.View; - /** * Label UI delegate that supports multiple lines and line wrapping. Hard line * breaks (\n) are preserved. If the dimensions of the label is too diff --git a/forge-gui/src/main/java/forge/gui/SOverlayUtils.java b/forge-gui/src/main/java/forge/gui/SOverlayUtils.java index 427174bf962..a23111f65c2 100644 --- a/forge-gui/src/main/java/forge/gui/SOverlayUtils.java +++ b/forge-gui/src/main/java/forge/gui/SOverlayUtils.java @@ -1,17 +1,5 @@ package forge.gui; -import java.awt.Color; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Rectangle; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.FocusManager; -import javax.swing.JPanel; -import javax.swing.Timer; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.gui.match.TargetingOverlay; import forge.gui.toolbox.FLabel; @@ -20,6 +8,13 @@ import forge.gui.toolbox.FPanel; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedButton; import forge.gui.toolbox.FSkin.SkinnedLabel; +import net.miginfocom.swing.MigLayout; + +import javax.swing.FocusManager; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; /** * All overlay interaction is handled here. diff --git a/forge-gui/src/main/java/forge/gui/UnsortedListModel.java b/forge-gui/src/main/java/forge/gui/UnsortedListModel.java index abe158b9f04..a78e2bcd10e 100644 --- a/forge-gui/src/main/java/forge/gui/UnsortedListModel.java +++ b/forge-gui/src/main/java/forge/gui/UnsortedListModel.java @@ -1,13 +1,11 @@ package forge.gui; +import javax.swing.*; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import javax.swing.AbstractListModel; -import javax.swing.ListModel; - @SuppressWarnings("serial") public class UnsortedListModel extends AbstractListModel { diff --git a/forge-gui/src/main/java/forge/gui/WrapLayout.java b/forge-gui/src/main/java/forge/gui/WrapLayout.java index 6a0df6900ad..04cbee63d73 100644 --- a/forge-gui/src/main/java/forge/gui/WrapLayout.java +++ b/forge-gui/src/main/java/forge/gui/WrapLayout.java @@ -1,13 +1,7 @@ package forge.gui; -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; +import javax.swing.*; +import java.awt.*; /** * FlowLayout subclass that fully supports wrapping of components. diff --git a/forge-gui/src/main/java/forge/gui/bazaar/CBazaarUI.java b/forge-gui/src/main/java/forge/gui/bazaar/CBazaarUI.java index fd35b3157e6..bd51cbc5051 100644 --- a/forge-gui/src/main/java/forge/gui/bazaar/CBazaarUI.java +++ b/forge-gui/src/main/java/forge/gui/bazaar/CBazaarUI.java @@ -1,14 +1,13 @@ package forge.gui.bazaar; -import javax.swing.SwingUtilities; - import com.google.common.collect.Iterables; - import forge.Command; import forge.gui.framework.ICDoc; import forge.gui.toolbox.FLabel; import forge.quest.bazaar.QuestBazaarManager; +import javax.swing.*; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/bazaar/VBazaarUI.java b/forge-gui/src/main/java/forge/gui/bazaar/VBazaarUI.java index f47b4479705..35478dec08c 100644 --- a/forge-gui/src/main/java/forge/gui/bazaar/VBazaarUI.java +++ b/forge-gui/src/main/java/forge/gui/bazaar/VBazaarUI.java @@ -1,11 +1,5 @@ package forge.gui.bazaar; -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import javax.swing.border.Border; - -import net.miginfocom.swing.MigLayout; import forge.Command; import forge.Singletons; import forge.gui.framework.FScreen; @@ -16,6 +10,10 @@ import forge.gui.toolbox.FSkin; import forge.quest.bazaar.QuestBazaarManager; import forge.quest.gui.ViewStall; import forge.view.FView; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.Border; /** Lays out containers and borders for resizeable layout and diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/DeckgenUtil.java b/forge-gui/src/main/java/forge/gui/deckchooser/DeckgenUtil.java index 8abdfe0cadd..146a9403e2c 100644 --- a/forge-gui/src/main/java/forge/gui/deckchooser/DeckgenUtil.java +++ b/forge-gui/src/main/java/forge/gui/deckchooser/DeckgenUtil.java @@ -1,20 +1,12 @@ package forge.gui.deckchooser; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; - import forge.Singletons; import forge.card.CardDb; import forge.deck.CardPool; import forge.deck.Deck; -import forge.deck.generation.DeckGenerator2Color; -import forge.deck.generation.DeckGenerator3Color; -import forge.deck.generation.DeckGenerator5Color; -import forge.deck.generation.DeckGeneratorBase; -import forge.deck.generation.DeckGeneratorMonoColor; +import forge.deck.generation.*; import forge.gui.toolbox.FOptionPane; import forge.gui.toolbox.itemmanager.DeckManager; import forge.item.PaperCard; @@ -28,6 +20,10 @@ import forge.util.Lang; import forge.util.MyRandom; import forge.util.storage.IStorage; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + /** * Utility collection for various types of decks. * - Builders (builds or retrieves deck based on a selection) diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/DecksComboBox.java b/forge-gui/src/main/java/forge/gui/deckchooser/DecksComboBox.java index 08d0d2bd815..682a3f98180 100644 --- a/forge-gui/src/main/java/forge/gui/deckchooser/DecksComboBox.java +++ b/forge-gui/src/main/java/forge/gui/deckchooser/DecksComboBox.java @@ -1,12 +1,5 @@ package forge.gui.deckchooser; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.DefaultComboBoxModel; - import forge.gui.MouseUtil; import forge.gui.MouseUtil.MouseCursor; import forge.gui.deckchooser.DecksComboBox.DeckType; @@ -14,6 +7,12 @@ import forge.gui.toolbox.FComboBox.TextAlignment; import forge.gui.toolbox.FComboBoxWrapper; import forge.gui.toolbox.FSkin; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; + public class DecksComboBox extends FComboBoxWrapper { public enum DeckType { diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/DecksComboBoxEvent.java b/forge-gui/src/main/java/forge/gui/deckchooser/DecksComboBoxEvent.java index 0bfcb11e8be..b9bca2c143c 100644 --- a/forge-gui/src/main/java/forge/gui/deckchooser/DecksComboBoxEvent.java +++ b/forge-gui/src/main/java/forge/gui/deckchooser/DecksComboBoxEvent.java @@ -1,9 +1,9 @@ package forge.gui.deckchooser; -import java.util.EventObject; - import forge.gui.deckchooser.DecksComboBox.DeckType; +import java.util.EventObject; + @SuppressWarnings("serial") public class DecksComboBoxEvent extends EventObject { diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java index 4f21c127ce4..675b6e28f7a 100644 --- a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java +++ b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckChooser.java @@ -1,15 +1,5 @@ package forge.gui.deckchooser; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import javax.swing.JPanel; - -import net.miginfocom.swing.MigLayout; - -import org.apache.commons.lang3.StringUtils; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -26,6 +16,13 @@ import forge.quest.QuestController; import forge.quest.QuestEvent; import forge.quest.QuestEventChallenge; import forge.quest.QuestUtil; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; @SuppressWarnings("serial") public class FDeckChooser extends JPanel implements IDecksComboBoxListener { diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckViewer.java b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckViewer.java index 62f1d38f609..1177af6bfa8 100644 --- a/forge-gui/src/main/java/forge/gui/deckchooser/FDeckViewer.java +++ b/forge-gui/src/main/java/forge/gui/deckchooser/FDeckViewer.java @@ -1,20 +1,5 @@ package forge.gui.deckchooser; -import java.awt.Dimension; -import java.awt.Toolkit; -import java.awt.datatransfer.StringSelection; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.swing.JPanel; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - -import net.miginfocom.swing.MigLayout; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; @@ -26,13 +11,22 @@ import forge.gui.toolbox.FOptionPane; import forge.gui.toolbox.itemmanager.CardManager; import forge.gui.toolbox.itemmanager.ItemManagerContainer; import forge.gui.toolbox.itemmanager.ItemManagerModel; -import forge.gui.toolbox.itemmanager.views.GroupDef; -import forge.gui.toolbox.itemmanager.views.ImageView; -import forge.gui.toolbox.itemmanager.views.ItemColumn; -import forge.gui.toolbox.itemmanager.views.SColumnUtil; -import forge.gui.toolbox.itemmanager.views.ColumnDef; +import forge.gui.toolbox.itemmanager.views.*; import forge.item.PaperCard; import forge.view.FDialog; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.*; +import java.awt.datatransfer.StringSelection; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; @SuppressWarnings("serial") public class FDeckViewer extends FDialog { diff --git a/forge-gui/src/main/java/forge/gui/deckchooser/GenerateThemeDeck.java b/forge-gui/src/main/java/forge/gui/deckchooser/GenerateThemeDeck.java index b81c02caec1..a7916898215 100644 --- a/forge-gui/src/main/java/forge/gui/deckchooser/GenerateThemeDeck.java +++ b/forge-gui/src/main/java/forge/gui/deckchooser/GenerateThemeDeck.java @@ -17,11 +17,6 @@ */ package forge.gui.deckchooser; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import forge.Singletons; import forge.deck.CardPool; import forge.deck.generation.DeckGeneratorBase; @@ -29,6 +24,11 @@ import forge.error.BugReporter; import forge.util.FileUtil; import forge.util.MyRandom; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + /** *

* GenerateThemeDeck class. diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java b/forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java index ca1e5ac5ff4..c7a71672490 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/CDeckEditorUI.java @@ -17,23 +17,10 @@ */ package forge.gui.deckeditor; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.util.HashMap; -import java.util.Map.Entry; - -import javax.swing.SwingUtilities; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - import forge.Command; import forge.Singletons; import forge.deck.DeckBase; -import forge.gui.deckeditor.controllers.ACEditorBase; -import forge.gui.deckeditor.controllers.CEditorConstructed; -import forge.gui.deckeditor.controllers.CProbabilities; -import forge.gui.deckeditor.controllers.CStatistics; -import forge.gui.deckeditor.controllers.DeckController; +import forge.gui.deckeditor.controllers.*; import forge.gui.deckeditor.views.VCardCatalog; import forge.gui.deckeditor.views.VCurrentDeck; import forge.gui.framework.FScreen; @@ -44,6 +31,14 @@ import forge.gui.toolbox.itemmanager.ItemManager; import forge.item.InventoryItem; import forge.util.ItemPool; +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.util.HashMap; +import java.util.Map.Entry; + /** * Constructs instance of deck editor UI controller, used as a single point of * top-level control for child UIs. Tasks targeting the view of individual diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/DeckImport.java b/forge-gui/src/main/java/forge/gui/deckeditor/DeckImport.java index 9ecdf7a16be..aea59c7a19c 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/DeckImport.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/DeckImport.java @@ -17,23 +17,6 @@ */ package forge.gui.deckeditor; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.WindowEvent; -import java.text.DateFormatSymbols; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import javax.swing.BorderFactory; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; -import javax.swing.text.BadLocationException; -import javax.swing.text.Element; -import javax.swing.text.ElementIterator; - -import org.apache.commons.lang3.StringUtils; - import forge.Singletons; import forge.deck.Deck; import forge.deck.DeckBase; @@ -41,18 +24,25 @@ import forge.deck.DeckRecognizer; import forge.deck.DeckRecognizer.TokenType; import forge.deck.DeckSection; import forge.gui.deckeditor.controllers.ACEditorBase; -import forge.gui.toolbox.FButton; -import forge.gui.toolbox.FCheckBox; -import forge.gui.toolbox.FComboBox; -import forge.gui.toolbox.FHtmlViewer; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FOptionPane; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FTextArea; -import forge.item.PaperCard; +import forge.gui.toolbox.*; import forge.item.InventoryItem; +import forge.item.PaperCard; import forge.view.FDialog; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import javax.swing.text.BadLocationException; +import javax.swing.text.Element; +import javax.swing.text.ElementIterator; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowEvent; +import java.text.DateFormatSymbols; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; /** * diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java b/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java index affbaa2b4f7..9cb171e02c1 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/DeckProxy.java @@ -1,14 +1,7 @@ package forge.gui.deckeditor; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Function; import com.google.common.base.Predicate; - import forge.Singletons; import forge.StaticData; import forge.card.CardEdition; @@ -30,6 +23,11 @@ import forge.quest.QuestEvent; import forge.util.IHasName; import forge.util.storage.IStorage; import forge.util.storage.StorageImmediatelySerialized; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; // Adding a generic to this class creates compile problems in ItemManager (that I can not fix) public class DeckProxy implements InventoryItem { diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/SEditorIO.java b/forge-gui/src/main/java/forge/gui/deckeditor/SEditorIO.java index 4fff2d5d5e5..fc978718ede 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/SEditorIO.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/SEditorIO.java @@ -1,7 +1,5 @@ package forge.gui.deckeditor; -import org.apache.commons.lang3.StringUtils; - import forge.Singletons; import forge.gui.deckeditor.controllers.CAllDecks; import forge.gui.deckeditor.controllers.DeckController; @@ -9,6 +7,7 @@ import forge.gui.deckeditor.views.VAllDecks; import forge.gui.deckeditor.views.VCurrentDeck; import forge.gui.framework.FScreen; import forge.gui.toolbox.FOptionPane; +import org.apache.commons.lang3.StringUtils; /** * Handles editor preferences saving and loading. diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/VDeckEditorUI.java b/forge-gui/src/main/java/forge/gui/deckeditor/VDeckEditorUI.java index 39d3ecee2cc..8087be0d3f5 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/VDeckEditorUI.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/VDeckEditorUI.java @@ -1,12 +1,12 @@ package forge.gui.deckeditor; -import javax.swing.SwingUtilities; - import forge.Singletons; import forge.gui.deckeditor.views.VCardCatalog; import forge.gui.framework.FScreen; import forge.gui.framework.IVTopLevelUI; +import javax.swing.*; + /** /** * Top level view class; instantiates and assembles diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java index d95fdf76d88..88fcda52344 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/ACEditorBase.java @@ -17,17 +17,6 @@ */ package forge.gui.deckeditor.controllers; -import java.awt.Toolkit; -import java.awt.event.KeyEvent; -import java.util.Arrays; -import java.util.List; -import java.util.Map.Entry; - -import javax.swing.JMenu; -import javax.swing.JPopupMenu; -import javax.swing.KeyStroke; -import javax.swing.SwingUtilities; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -37,11 +26,7 @@ import forge.gui.GuiChoose; import forge.gui.GuiUtils; import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.menus.CDeckEditorUIMenus; -import forge.gui.framework.DragCell; -import forge.gui.framework.FScreen; -import forge.gui.framework.ICDoc; -import forge.gui.framework.IVDoc; -import forge.gui.framework.SRearrangingUtil; +import forge.gui.framework.*; import forge.gui.menus.IMenuProvider; import forge.gui.toolbox.ContextMenuBuilder; import forge.gui.toolbox.FLabel; @@ -54,6 +39,13 @@ import forge.properties.ForgePreferences.FPref; import forge.util.ItemPool; import forge.view.FView; +import javax.swing.*; +import java.awt.*; +import java.awt.event.KeyEvent; +import java.util.Arrays; +import java.util.List; +import java.util.Map.Entry; + /** * Maintains a generically typed architecture for various editing * environments. A basic editor instance requires a card catalog, the diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java index c7b31b77358..2c2e4a960a3 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CCurrentDeck.java @@ -1,14 +1,5 @@ package forge.gui.deckeditor.controllers; -import java.awt.Dialog.ModalityType; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.io.File; - -import javax.swing.JFileChooser; -import javax.swing.SwingUtilities; -import javax.swing.filechooser.FileFilter; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -25,6 +16,13 @@ import forge.gui.framework.ICDoc; import forge.item.InventoryItem; import forge.properties.NewConstants; +import javax.swing.*; +import javax.swing.filechooser.FileFilter; +import java.awt.Dialog.ModalityType; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.io.File; + /** * Controls the "current deck" panel in the deck editor UI. * diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java index d1b7093cd24..0bdae032e85 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CDeckgen.java @@ -3,7 +3,6 @@ package forge.gui.deckeditor.controllers; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; - import forge.Command; import forge.Singletons; import forge.card.CardDb; @@ -11,17 +10,13 @@ import forge.card.CardRulesPredicates; import forge.card.MagicColor; import forge.deck.Deck; import forge.deck.DeckBase; -import forge.deck.generation.DeckGenerator2Color; -import forge.deck.generation.DeckGenerator3Color; -import forge.deck.generation.DeckGenerator5Color; -import forge.deck.generation.DeckGeneratorBase; -import forge.deck.generation.DeckGeneratorMonoColor; +import forge.deck.generation.*; import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.SEditorIO; import forge.gui.deckeditor.views.VDeckgen; import forge.gui.framework.ICDoc; -import forge.item.PaperCard; import forge.item.InventoryItem; +import forge.item.PaperCard; import forge.properties.ForgePreferences.FPref; import forge.util.Aggregates; diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java index 1f84910721f..39f79c594fc 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorCommander.java @@ -17,14 +17,8 @@ */ package forge.gui.deckeditor.controllers; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.google.common.base.Predicates; import com.google.common.base.Supplier; - import forge.Command; import forge.Singletons; import forge.card.CardRulesPredicates; @@ -39,11 +33,16 @@ import forge.gui.toolbox.itemmanager.CardManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil; import forge.gui.toolbox.itemmanager.views.ColumnDef; import forge.gui.toolbox.itemmanager.views.GroupDef; -import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.gui.toolbox.itemmanager.views.ItemColumn; +import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.item.PaperCard; import forge.util.ItemPool; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + /** * Child controller for constructed deck editor UI. * This is the least restrictive mode; diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java index 5a4ca98a24d..ce7686eedec 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorConstructed.java @@ -17,14 +17,8 @@ */ package forge.gui.deckeditor.controllers; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.google.common.base.Predicates; import com.google.common.base.Supplier; - import forge.Command; import forge.Singletons; import forge.card.CardRulesPredicates; @@ -36,12 +30,17 @@ import forge.gui.toolbox.itemmanager.CardManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil; import forge.gui.toolbox.itemmanager.views.ColumnDef; import forge.gui.toolbox.itemmanager.views.GroupDef; -import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.gui.toolbox.itemmanager.views.ItemColumn; +import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.item.PaperCard; import forge.properties.ForgePreferences.FPref; import forge.util.ItemPool; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + /** * Child controller for constructed deck editor UI. * This is the least restrictive mode; diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java index db60d0e37ad..ac914d605bd 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java @@ -17,9 +17,6 @@ */ package forge.gui.deckeditor.controllers; -import java.util.Map; -import java.util.Map.Entry; - import forge.Singletons; import forge.card.MagicColor; import forge.deck.Deck; @@ -46,6 +43,9 @@ import forge.properties.ForgePreferences.FPref; import forge.util.ItemPool; import forge.util.MyRandom; +import java.util.Map; +import java.util.Map.Entry; + /** * Updates the deck editor UI as necessary draft selection mode. * diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java index 9cf4af5a098..1d3731cd2c1 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorLimited.java @@ -17,10 +17,7 @@ */ package forge.gui.deckeditor.controllers; -import java.util.Map.Entry; - import com.google.common.base.Supplier; - import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckSection; @@ -40,6 +37,8 @@ import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.item.PaperCard; import forge.util.storage.IStorage; +import java.util.Map.Entry; + /** * Child controller for limited deck editor UI. * diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorPreferences.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorPreferences.java index c463d3b14eb..bb95ad83703 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorPreferences.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorPreferences.java @@ -1,14 +1,13 @@ package forge.gui.deckeditor.controllers; -import java.util.HashMap; - -import javax.swing.JCheckBox; - import forge.Command; import forge.gui.deckeditor.views.VEditorPreferences; import forge.gui.framework.ICDoc; import forge.gui.toolbox.itemmanager.views.ColumnDef; +import javax.swing.*; +import java.util.HashMap; + /** * Controls the "analysis" panel in the deck editor UI. * diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java index 6cff2d4a346..7ca099e968e 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuest.java @@ -18,14 +18,9 @@ package forge.gui.deckeditor.controllers; // import java.awt.Font; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; import com.google.common.base.Function; import com.google.common.base.Supplier; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -41,15 +36,19 @@ import forge.gui.toolbox.itemmanager.CardManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil; import forge.gui.toolbox.itemmanager.views.ColumnDef; import forge.gui.toolbox.itemmanager.views.GroupDef; -import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.gui.toolbox.itemmanager.views.ItemColumn; -import forge.item.PaperCard; +import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.item.InventoryItem; +import forge.item.PaperCard; import forge.properties.ForgePreferences.FPref; import forge.quest.QuestController; import forge.util.ItemPool; import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; //import forge.quest.data.QuestBoosterPack; diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java index 1993a247641..2df8ad6e240 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorQuestCardShop.java @@ -17,19 +17,7 @@ */ package forge.gui.deckeditor.controllers; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.swing.JLabel; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Function; - import forge.Command; import forge.Singletons; import forge.deck.CardPool; @@ -37,33 +25,31 @@ import forge.deck.Deck; import forge.deck.DeckBase; import forge.deck.DeckSection; import forge.gui.CardListViewer; -import forge.gui.deckeditor.views.VAllDecks; -import forge.gui.deckeditor.views.VCardCatalog; -import forge.gui.deckeditor.views.VCurrentDeck; -import forge.gui.deckeditor.views.VDeckgen; -import forge.gui.deckeditor.views.VProbabilities; +import forge.gui.deckeditor.views.*; import forge.gui.framework.DragCell; import forge.gui.framework.FScreen; import forge.gui.home.quest.CSubmenuQuestDecks; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FOptionPane; import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.itemmanager.SpellShopManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil; +import forge.gui.toolbox.itemmanager.SpellShopManager; import forge.gui.toolbox.itemmanager.views.ColumnDef; -import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.gui.toolbox.itemmanager.views.ItemColumn; -import forge.item.BoosterPack; -import forge.item.PaperCard; -import forge.item.FatPack; -import forge.item.IPaperCard; -import forge.item.InventoryItem; -import forge.item.SealedProduct; -import forge.item.PreconDeck; -import forge.item.TournamentPack; +import forge.gui.toolbox.itemmanager.views.SColumnUtil; +import forge.item.*; import forge.quest.QuestController; import forge.quest.io.ReadPriceList; import forge.util.ItemPool; +import org.apache.commons.lang3.tuple.Pair; + +import javax.swing.*; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; /** * Child controller for quest card shop UI. diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorVariant.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorVariant.java index 87496687600..191498fe7a8 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorVariant.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorVariant.java @@ -17,13 +17,9 @@ */ package forge.gui.deckeditor.controllers; -import java.util.Map; -import java.util.Map.Entry; - import com.google.common.base.Predicate; import com.google.common.base.Supplier; import com.google.common.collect.Iterables; - import forge.Singletons; import forge.deck.Deck; import forge.deck.DeckSection; @@ -36,13 +32,16 @@ import forge.gui.toolbox.itemmanager.CardManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil; import forge.gui.toolbox.itemmanager.views.ColumnDef; import forge.gui.toolbox.itemmanager.views.GroupDef; -import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.gui.toolbox.itemmanager.views.ItemColumn; +import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.item.PaperCard; import forge.properties.ForgePreferences.FPref; import forge.util.ItemPool; import forge.util.storage.IStorage; +import java.util.Map; +import java.util.Map.Entry; + /** * Child controller for constructed deck editor UI. * This is the least restrictive mode; diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CProbabilities.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CProbabilities.java index c4ec931d51f..ae4d0ff11cd 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CProbabilities.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CProbabilities.java @@ -1,22 +1,17 @@ package forge.gui.deckeditor.controllers; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import forge.Command; import forge.deck.DeckBase; import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.views.VProbabilities; import forge.gui.framework.ICDoc; -import forge.item.PaperCard; import forge.item.InventoryItem; +import forge.item.PaperCard; import forge.util.ItemPool; import forge.util.MyRandom; +import java.util.*; + /** * Controls the "analysis" panel in the deck editor UI. * diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java index 9e3c9c9058b..3689de32023 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CStatistics.java @@ -1,12 +1,7 @@ package forge.gui.deckeditor.controllers; -import java.util.Map.Entry; - -import javax.swing.JLabel; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.Command; import forge.card.CardRules; import forge.card.CardRulesPredicates; @@ -16,10 +11,13 @@ import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.views.VStatistics; import forge.gui.framework.ICDoc; import forge.gui.toolbox.itemmanager.SItemManagerUtil; -import forge.item.PaperCard; import forge.item.InventoryItem; +import forge.item.PaperCard; import forge.util.ItemPool; +import javax.swing.*; +import java.util.Map.Entry; + /** * Controls the "analysis" panel in the deck editor UI. diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java index f73ea953c85..969178e78e3 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/DeckController.java @@ -17,14 +17,12 @@ */ package forge.gui.deckeditor.controllers; -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Supplier; - import forge.deck.DeckBase; import forge.gui.deckeditor.menus.DeckFileMenu; import forge.gui.deckeditor.views.VCurrentDeck; import forge.util.storage.IStorage; +import org.apache.commons.lang3.StringUtils; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/menus/CDeckEditorUIMenus.java b/forge-gui/src/main/java/forge/gui/deckeditor/menus/CDeckEditorUIMenus.java index e7e3cd3271d..46c2f76a6c6 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/menus/CDeckEditorUIMenus.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/menus/CDeckEditorUIMenus.java @@ -1,10 +1,9 @@ package forge.gui.deckeditor.menus; +import javax.swing.*; import java.util.ArrayList; import java.util.List; -import javax.swing.JMenu; - /** * Gets the menus associated with the Game screen. * diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/menus/DeckFileMenu.java b/forge-gui/src/main/java/forge/gui/deckeditor/menus/DeckFileMenu.java index 3a715e2ce99..e63d58bdef1 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/menus/DeckFileMenu.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/menus/DeckFileMenu.java @@ -1,18 +1,16 @@ package forge.gui.deckeditor.menus; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; - -import javax.swing.JMenu; -import javax.swing.JSeparator; - import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.views.VCurrentDeck; import forge.gui.menus.MenuUtil; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedMenuItem; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; + /** * Returns a JMenu containing options associated with current game. *

diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VAllDecks.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VAllDecks.java index 7685c989979..88a4fdb3de7 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VAllDecks.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VAllDecks.java @@ -1,8 +1,5 @@ package forge.gui.deckeditor.views; -import javax.swing.JPanel; - -import net.miginfocom.swing.MigLayout; import forge.game.GameType; import forge.gui.deckeditor.controllers.CAllDecks; import forge.gui.framework.DragCell; @@ -11,6 +8,9 @@ import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; import forge.gui.toolbox.itemmanager.DeckManager; import forge.gui.toolbox.itemmanager.ItemManagerContainer; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** * Assembles Swing components of all deck viewer in deck editor. diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VCardCatalog.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VCardCatalog.java index 388819576b8..5dc3b4728ce 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VCardCatalog.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VCardCatalog.java @@ -1,8 +1,5 @@ package forge.gui.deckeditor.views; -import javax.swing.JPanel; -import net.miginfocom.swing.MigLayout; - import forge.gui.deckeditor.controllers.CCardCatalog; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -11,6 +8,9 @@ import forge.gui.framework.IVDoc; import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.ItemManagerContainer; import forge.item.InventoryItem; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** * Assembles Swing components of card catalog in deck editor. diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VCurrentDeck.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VCurrentDeck.java index 64f19e244a2..80c326f5379 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VCurrentDeck.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VCurrentDeck.java @@ -1,8 +1,5 @@ package forge.gui.deckeditor.views; -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import net.miginfocom.swing.MigLayout; import forge.gui.deckeditor.controllers.CCurrentDeck; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -14,6 +11,9 @@ import forge.gui.toolbox.FTextField; import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.ItemManagerContainer; import forge.item.InventoryItem; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VDeckgen.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VDeckgen.java index 0f8a23bb157..785688d854a 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VDeckgen.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VDeckgen.java @@ -1,12 +1,12 @@ package forge.gui.deckeditor.views; -import net.miginfocom.swing.MigLayout; import forge.gui.deckeditor.controllers.CDeckgen; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; import forge.gui.toolbox.FLabel; +import net.miginfocom.swing.MigLayout; /** * Assembles Swing components of deck editor analysis tab. diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java index d10c17e1443..a34b9699fbd 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VEditorPreferences.java @@ -1,8 +1,5 @@ package forge.gui.deckeditor.views; -import javax.swing.JCheckBox; -import javax.swing.JPanel; -import net.miginfocom.swing.MigLayout; import forge.gui.deckeditor.controllers.CEditorPreferences; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -12,6 +9,9 @@ import forge.gui.toolbox.FCheckBox; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** * Assembles Swing components of deck editor analysis tab. diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VProbabilities.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VProbabilities.java index 9db7d7dbd8a..354248e88fc 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VProbabilities.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VProbabilities.java @@ -1,14 +1,5 @@ package forge.gui.deckeditor.views; -import java.awt.Font; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.List; - -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import net.miginfocom.swing.MigLayout; import forge.deck.DeckBase; import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.deckeditor.controllers.ACEditorBase; @@ -20,8 +11,15 @@ import forge.gui.framework.IVDoc; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; -import forge.item.PaperCard; import forge.item.InventoryItem; +import forge.item.PaperCard; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.List; /** * Assembles Swing components of deck editor analysis tab. diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/views/VStatistics.java b/forge-gui/src/main/java/forge/gui/deckeditor/views/VStatistics.java index a58e2b51da1..a25542a4cd7 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/views/VStatistics.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/views/VStatistics.java @@ -1,20 +1,19 @@ package forge.gui.deckeditor.views; -import java.awt.Font; - -import forge.gui.toolbox.FLabel; - -import javax.swing.JPanel; -import net.miginfocom.swing.MigLayout; import forge.gui.deckeditor.controllers.CStatistics; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; +import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinImage; import forge.gui.toolbox.itemmanager.SItemManagerUtil; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; /** * Assembles Swing components of deck editor analysis tab. diff --git a/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java index 8ec7528b8d8..74c22c72dec 100644 --- a/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPicturesLQ.java @@ -17,17 +17,16 @@ */ package forge.gui.download; -import java.io.File; -import java.util.Map; -import java.util.TreeMap; - -import org.apache.commons.lang3.StringUtils; - import forge.ImageCache; import forge.Singletons; import forge.card.CardRules; import forge.item.PaperCard; import forge.properties.NewConstants; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.util.Map; +import java.util.TreeMap; @SuppressWarnings("serial") public class GuiDownloadPicturesLQ extends GuiDownloader { diff --git a/forge-gui/src/main/java/forge/gui/download/GuiDownloadPrices.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPrices.java index 7d76f116cf1..f388131108e 100644 --- a/forge-gui/src/main/java/forge/gui/download/GuiDownloadPrices.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadPrices.java @@ -17,11 +17,11 @@ */ package forge.gui.download; +import forge.properties.NewConstants; + import java.util.HashMap; import java.util.Map; -import forge.properties.NewConstants; - @SuppressWarnings("serial") public class GuiDownloadPrices extends GuiDownloader { public GuiDownloadPrices() { diff --git a/forge-gui/src/main/java/forge/gui/download/GuiDownloadQuestImages.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadQuestImages.java index b898c0d3438..bd9671162f2 100644 --- a/forge-gui/src/main/java/forge/gui/download/GuiDownloadQuestImages.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadQuestImages.java @@ -17,11 +17,11 @@ */ package forge.gui.download; +import forge.properties.NewConstants; + import java.util.Map; import java.util.TreeMap; -import forge.properties.NewConstants; - /** */ @SuppressWarnings("serial") public class GuiDownloadQuestImages extends GuiDownloader { diff --git a/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java index f2da7611985..d9cb50651af 100644 --- a/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloadSetPicturesLQ.java @@ -17,19 +17,17 @@ */ package forge.gui.download; -import java.io.File; -import java.util.Map; -import java.util.TreeMap; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.Iterables; - import forge.ImageCache; import forge.Singletons; import forge.card.CardEdition; import forge.item.PaperCard; import forge.properties.NewConstants; +import org.apache.commons.lang3.StringUtils; + +import java.io.File; +import java.util.Map; +import java.util.TreeMap; @SuppressWarnings("serial") public class GuiDownloadSetPicturesLQ extends GuiDownloader { diff --git a/forge-gui/src/main/java/forge/gui/download/GuiDownloader.java b/forge-gui/src/main/java/forge/gui/download/GuiDownloader.java index 1afa8a8dfd4..7daac2daace 100644 --- a/forge-gui/src/main/java/forge/gui/download/GuiDownloader.java +++ b/forge-gui/src/main/java/forge/gui/download/GuiDownloader.java @@ -17,57 +17,34 @@ */ package forge.gui.download; -import java.awt.EventQueue; +import com.esotericsoftware.minlog.Log; +import forge.Command; +import forge.ImageCache; +import forge.error.BugReporter; +import forge.gui.SOverlayUtils; +import forge.gui.toolbox.*; +import forge.util.FileUtil; +import forge.util.MyRandom; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.tuple.Pair; + +import javax.swing.*; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.net.ConnectException; -import java.net.HttpURLConnection; -import java.net.InetSocketAddress; -import java.net.MalformedURLException; -import java.net.Proxy; -import java.net.URL; +import java.net.*; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; import java.util.Map; import java.util.Map.Entry; import java.util.Random; -import javax.swing.AbstractButton; -import javax.swing.DefaultBoundedRangeModel; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.JTextField; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import javax.swing.SwingWorker; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -import net.miginfocom.swing.MigLayout; - -import org.apache.commons.lang3.tuple.Pair; - -import com.esotericsoftware.minlog.Log; - -import forge.Command; -import forge.ImageCache; -import forge.error.BugReporter; -import forge.gui.SOverlayUtils; -import forge.gui.toolbox.FButton; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FOverlay; -import forge.gui.toolbox.FPanel; -import forge.gui.toolbox.FProgressBar; -import forge.gui.toolbox.FRadioButton; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.JXButtonPanel; -import forge.util.FileUtil; -import forge.util.MyRandom; - @SuppressWarnings("serial") public abstract class GuiDownloader extends DefaultBoundedRangeModel implements Runnable { public static final Proxy.Type[] TYPES = Proxy.Type.values(); diff --git a/forge-gui/src/main/java/forge/gui/framework/DragCell.java b/forge-gui/src/main/java/forge/gui/framework/DragCell.java index dae1d72bbf2..a6a6c0b0e1a 100644 --- a/forge-gui/src/main/java/forge/gui/framework/DragCell.java +++ b/forge-gui/src/main/java/forge/gui/framework/DragCell.java @@ -1,22 +1,6 @@ package forge.gui.framework; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.SwingConstants; - -import net.miginfocom.swing.MigLayout; - import com.google.common.collect.Lists; - import forge.Singletons; import forge.gui.toolbox.FPanel; import forge.gui.toolbox.FSkin; @@ -24,6 +8,14 @@ import forge.gui.toolbox.FSkin.SkinImage; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; import forge.view.FView; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; /** * Top-level container in drag layout. A cell holds diff --git a/forge-gui/src/main/java/forge/gui/framework/DragTab.java b/forge-gui/src/main/java/forge/gui/framework/DragTab.java index 9084c71cb98..8a61f12140d 100644 --- a/forge-gui/src/main/java/forge/gui/framework/DragTab.java +++ b/forge-gui/src/main/java/forge/gui/framework/DragTab.java @@ -1,13 +1,11 @@ package forge.gui.framework; -import java.awt.Dimension; -import java.awt.Graphics; - -import javax.swing.border.EmptyBorder; - import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedLabel; +import javax.swing.border.EmptyBorder; +import java.awt.*; + /** * The tab label object in drag layout. * No modification should be necessary to this object. diff --git a/forge-gui/src/main/java/forge/gui/framework/EDocID.java b/forge-gui/src/main/java/forge/gui/framework/EDocID.java index 2add4f44413..32fdbf16f87 100644 --- a/forge-gui/src/main/java/forge/gui/framework/EDocID.java +++ b/forge-gui/src/main/java/forge/gui/framework/EDocID.java @@ -3,22 +3,12 @@ */ package forge.gui.framework; -import forge.gui.deckeditor.views.VAllDecks; -import forge.gui.deckeditor.views.VCardCatalog; -import forge.gui.deckeditor.views.VCurrentDeck; -import forge.gui.deckeditor.views.VDeckgen; -import forge.gui.deckeditor.views.VEditorPreferences; -import forge.gui.deckeditor.views.VProbabilities; -import forge.gui.deckeditor.views.VStatistics; +import forge.gui.deckeditor.views.*; import forge.gui.home.gauntlet.VSubmenuGauntletBuild; import forge.gui.home.gauntlet.VSubmenuGauntletContests; import forge.gui.home.gauntlet.VSubmenuGauntletLoad; import forge.gui.home.gauntlet.VSubmenuGauntletQuick; -import forge.gui.home.quest.VSubmenuChallenges; -import forge.gui.home.quest.VSubmenuDuels; -import forge.gui.home.quest.VSubmenuQuestData; -import forge.gui.home.quest.VSubmenuQuestDecks; -import forge.gui.home.quest.VSubmenuQuestPrefs; +import forge.gui.home.quest.*; import forge.gui.home.sanctioned.VSubmenuConstructed; import forge.gui.home.sanctioned.VSubmenuDraft; import forge.gui.home.sanctioned.VSubmenuSealed; @@ -28,22 +18,14 @@ import forge.gui.home.settings.VSubmenuPreferences; import forge.gui.home.settings.VSubmenuReleaseNotes; import forge.gui.home.variant.VSubmenuArchenemy; import forge.gui.home.variant.VSubmenuCommander; -//import forge.gui.home.variant.VSubmenuPlanechase; -//import forge.gui.home.variant.VSubmenuVanguard; -import forge.gui.match.views.VAntes; -import forge.gui.match.views.VCombat; -import forge.gui.match.views.VDetail; -import forge.gui.match.views.VDev; -import forge.gui.match.views.VDock; -import forge.gui.match.views.VLog; -import forge.gui.match.views.VPrompt; -import forge.gui.match.views.VPicture; -import forge.gui.match.views.VPlayers; -import forge.gui.match.views.VStack; +import forge.gui.match.views.*; import forge.gui.workshop.views.VCardDesigner; import forge.gui.workshop.views.VCardScript; import forge.gui.workshop.views.VWorkshopCatalog; +//import forge.gui.home.variant.VSubmenuPlanechase; +//import forge.gui.home.variant.VSubmenuVanguard; + /** * These are the identifiers for tabs found in the drag layout. * These IDs are used in the save XML and card layouts. diff --git a/forge-gui/src/main/java/forge/gui/framework/FScreen.java b/forge-gui/src/main/java/forge/gui/framework/FScreen.java index 7fb64e677bf..368e4e665be 100644 --- a/forge-gui/src/main/java/forge/gui/framework/FScreen.java +++ b/forge-gui/src/main/java/forge/gui/framework/FScreen.java @@ -1,7 +1,5 @@ package forge.gui.framework; -import java.io.File; - import forge.Singletons; import forge.gui.bazaar.CBazaarUI; import forge.gui.bazaar.VBazaarUI; @@ -19,6 +17,8 @@ import forge.gui.workshop.VWorkshopUI; import forge.properties.FileLocation; import forge.properties.NewConstants; +import java.io.File; + /** * Definitions for Forge screens * diff --git a/forge-gui/src/main/java/forge/gui/framework/IVTopLevelUI.java b/forge-gui/src/main/java/forge/gui/framework/IVTopLevelUI.java index d265fab19e0..43425f52438 100644 --- a/forge-gui/src/main/java/forge/gui/framework/IVTopLevelUI.java +++ b/forge-gui/src/main/java/forge/gui/framework/IVTopLevelUI.java @@ -1,8 +1,6 @@ package forge.gui.framework; -import forge.gui.framework.FScreen; - -/** +/** * This interface provides a unifying type for all top-level * UI components. * diff --git a/forge-gui/src/main/java/forge/gui/framework/SDisplayUtil.java b/forge-gui/src/main/java/forge/gui/framework/SDisplayUtil.java index 605d7639012..d09d245c1ac 100644 --- a/forge-gui/src/main/java/forge/gui/framework/SDisplayUtil.java +++ b/forge-gui/src/main/java/forge/gui/framework/SDisplayUtil.java @@ -1,25 +1,13 @@ package forge.gui.framework; -import java.awt.Color; -import java.awt.Component; -import java.awt.GraphicsConfiguration; -import java.awt.GraphicsDevice; -import java.awt.GraphicsEnvironment; -import java.awt.Insets; -import java.awt.KeyboardFocusManager; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.Toolkit; -import java.awt.Window; -import java.util.Timer; -import java.util.TimerTask; - -import javax.swing.JPanel; -import javax.swing.SwingUtilities; - import forge.FThreads; import forge.view.FFrame; +import javax.swing.*; +import java.awt.*; +import java.util.Timer; +import java.util.TimerTask; + /** * Experimental static factory for generic operations carried out * onto specific members of the framework. Doublestrike 11-04-12 diff --git a/forge-gui/src/main/java/forge/gui/framework/SLayoutIO.java b/forge-gui/src/main/java/forge/gui/framework/SLayoutIO.java index 41706368c47..0d79863c4c5 100644 --- a/forge-gui/src/main/java/forge/gui/framework/SLayoutIO.java +++ b/forge-gui/src/main/java/forge/gui/framework/SLayoutIO.java @@ -1,31 +1,5 @@ package forge.gui.framework; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.Point; -import java.awt.Rectangle; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicBoolean; - -import javax.swing.border.EmptyBorder; -import javax.xml.stream.XMLEventFactory; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLEventWriter; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.XMLEvent; - import forge.Singletons; import forge.gui.toolbox.FAbsolutePositioner; import forge.properties.FileLocation; @@ -37,6 +11,19 @@ import forge.util.maps.MapOfLists; import forge.view.FFrame; import forge.view.FView; +import javax.swing.border.EmptyBorder; +import javax.xml.stream.*; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; +import java.awt.*; +import java.io.*; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; +import java.util.concurrent.atomic.AtomicBoolean; + /** * Handles layout saving and loading. diff --git a/forge-gui/src/main/java/forge/gui/framework/SOverflowUtil.java b/forge-gui/src/main/java/forge/gui/framework/SOverflowUtil.java index a342c02ff92..09e8607bc25 100644 --- a/forge-gui/src/main/java/forge/gui/framework/SOverflowUtil.java +++ b/forge-gui/src/main/java/forge/gui/framework/SOverflowUtil.java @@ -1,16 +1,13 @@ package forge.gui.framework; -import java.awt.Color; -import java.awt.Dimension; +import forge.view.FView; + +import javax.swing.*; +import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import javax.swing.JLabel; -import javax.swing.JPanel; - -import forge.view.FView; - /** * Package-private utilities for generic overflow behavior * in title bar for any cell in layout. diff --git a/forge-gui/src/main/java/forge/gui/framework/SRearrangingUtil.java b/forge-gui/src/main/java/forge/gui/framework/SRearrangingUtil.java index 3f43ff86179..44896feea50 100644 --- a/forge-gui/src/main/java/forge/gui/framework/SRearrangingUtil.java +++ b/forge-gui/src/main/java/forge/gui/framework/SRearrangingUtil.java @@ -1,22 +1,16 @@ package forge.gui.framework; -import java.awt.Container; -import java.awt.Cursor; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionAdapter; -import java.awt.event.MouseMotionListener; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JPanel; - import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinCursor; import forge.gui.toolbox.FSkin.SkinnedLayeredPane; import forge.view.FView; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; +import java.util.ArrayList; +import java.util.List; + /** * Package-private utilities for rearranging drag behavior using * the draggable panels registered in FView. diff --git a/forge-gui/src/main/java/forge/gui/framework/SResizingUtil.java b/forge-gui/src/main/java/forge/gui/framework/SResizingUtil.java index 07426f58693..7f866ba7b74 100644 --- a/forge-gui/src/main/java/forge/gui/framework/SResizingUtil.java +++ b/forge-gui/src/main/java/forge/gui/framework/SResizingUtil.java @@ -1,24 +1,5 @@ package forge.gui.framework; -import java.awt.Component; -import java.awt.Cursor; -import java.awt.Rectangle; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; -import java.awt.event.ComponentListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionAdapter; -import java.awt.event.MouseMotionListener; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import javax.swing.JPanel; - import forge.gui.FNetOverlay; import forge.gui.toolbox.FAbsolutePositioner; import forge.gui.toolbox.FOverlay; @@ -27,6 +8,12 @@ import forge.view.FFrame; import forge.view.FNavigationBar; import forge.view.FView; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; +import java.util.*; +import java.util.List; + /** * Package-private utilities for resizing drag behavior using * the draggable panels registered in FView. diff --git a/forge-gui/src/main/java/forge/gui/home/CHomeUI.java b/forge-gui/src/main/java/forge/gui/home/CHomeUI.java index 5818c11825d..4cfb06041fe 100644 --- a/forge-gui/src/main/java/forge/gui/home/CHomeUI.java +++ b/forge-gui/src/main/java/forge/gui/home/CHomeUI.java @@ -1,9 +1,5 @@ package forge.gui.home; -import java.util.List; - -import javax.swing.JMenu; - import forge.Command; import forge.Singletons; import forge.gui.FNetOverlay; @@ -19,6 +15,9 @@ import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; import forge.properties.NewConstants; +import javax.swing.*; +import java.util.List; + /** * Assembles Swing components of exit submenu option singleton. * diff --git a/forge-gui/src/main/java/forge/gui/home/LblGroup.java b/forge-gui/src/main/java/forge/gui/home/LblGroup.java index 2341bd8f768..2433a273dca 100644 --- a/forge-gui/src/main/java/forge/gui/home/LblGroup.java +++ b/forge-gui/src/main/java/forge/gui/home/LblGroup.java @@ -1,12 +1,5 @@ package forge.gui.home; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - import forge.Singletons; import forge.gui.framework.ILocalRepaint; import forge.gui.toolbox.FSkin; @@ -14,6 +7,10 @@ import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.properties.ForgePreferences.FPref; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + /** * Custom JLabel for title of menu item groups. * Handles repainting and listening for hover and click events. diff --git a/forge-gui/src/main/java/forge/gui/home/LblHeader.java b/forge-gui/src/main/java/forge/gui/home/LblHeader.java index ca49b6c0a94..c61edf91646 100644 --- a/forge-gui/src/main/java/forge/gui/home/LblHeader.java +++ b/forge-gui/src/main/java/forge/gui/home/LblHeader.java @@ -1,14 +1,12 @@ package forge.gui.home; -import java.awt.Graphics; -import java.awt.Graphics2D; - -import javax.swing.border.EmptyBorder; - import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinnedLabel; +import javax.swing.border.EmptyBorder; +import java.awt.*; + /** * Standardized header label for top of menu display panel. */ diff --git a/forge-gui/src/main/java/forge/gui/home/LblMenuItem.java b/forge-gui/src/main/java/forge/gui/home/LblMenuItem.java index 62b2a6b425a..f11f9bc1f80 100644 --- a/forge-gui/src/main/java/forge/gui/home/LblMenuItem.java +++ b/forge-gui/src/main/java/forge/gui/home/LblMenuItem.java @@ -1,17 +1,15 @@ package forge.gui.home; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - import forge.gui.framework.ICDoc; import forge.gui.framework.ILocalRepaint; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinnedLabel; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + /** * Custom JLabel for an item in the menu. Handles listening * and repainting for hover and select events. diff --git a/forge-gui/src/main/java/forge/gui/home/PnlGroup.java b/forge-gui/src/main/java/forge/gui/home/PnlGroup.java index e5904f5d2fe..b5f40016b60 100644 --- a/forge-gui/src/main/java/forge/gui/home/PnlGroup.java +++ b/forge-gui/src/main/java/forge/gui/home/PnlGroup.java @@ -1,13 +1,12 @@ package forge.gui.home; -import java.awt.Graphics; -import java.awt.Graphics2D; - -import javax.swing.JLabel; -import net.miginfocom.swing.MigLayout; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinnedPanel; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; /** * Custom JPanel for containing LblMenuItem components. diff --git a/forge-gui/src/main/java/forge/gui/home/StartButton.java b/forge-gui/src/main/java/forge/gui/home/StartButton.java index 18ce00cba7d..316c8aba711 100644 --- a/forge-gui/src/main/java/forge/gui/home/StartButton.java +++ b/forge-gui/src/main/java/forge/gui/home/StartButton.java @@ -1,16 +1,15 @@ package forge.gui.home; +import forge.gui.toolbox.FSkin; +import forge.gui.toolbox.FSkin.SkinnedButton; + +import javax.swing.*; +import javax.swing.border.Border; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; import java.awt.event.FocusListener; -import javax.swing.SwingUtilities; -import javax.swing.border.Border; - -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FSkin.SkinnedButton; - @SuppressWarnings("serial") public class StartButton extends SkinnedButton { public StartButton() { diff --git a/forge-gui/src/main/java/forge/gui/home/VHomeUI.java b/forge-gui/src/main/java/forge/gui/home/VHomeUI.java index 8b6ea85aaa4..f7d9035c284 100644 --- a/forge-gui/src/main/java/forge/gui/home/VHomeUI.java +++ b/forge-gui/src/main/java/forge/gui/home/VHomeUI.java @@ -17,37 +17,13 @@ */ package forge.gui.home; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; - -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; -import forge.gui.framework.EDocID; -import forge.gui.framework.FScreen; -import forge.gui.framework.ICDoc; -import forge.gui.framework.ILocalRepaint; -import forge.gui.framework.IVTopLevelUI; +import forge.gui.framework.*; import forge.gui.home.gauntlet.VSubmenuGauntletBuild; import forge.gui.home.gauntlet.VSubmenuGauntletContests; import forge.gui.home.gauntlet.VSubmenuGauntletLoad; import forge.gui.home.gauntlet.VSubmenuGauntletQuick; -import forge.gui.home.quest.VSubmenuChallenges; -import forge.gui.home.quest.VSubmenuDuels; -import forge.gui.home.quest.VSubmenuQuestData; -import forge.gui.home.quest.VSubmenuQuestDecks; -import forge.gui.home.quest.VSubmenuQuestPrefs; +import forge.gui.home.quest.*; import forge.gui.home.sanctioned.VSubmenuConstructed; import forge.gui.home.sanctioned.VSubmenuDraft; import forge.gui.home.sanctioned.VSubmenuSealed; @@ -57,16 +33,23 @@ import forge.gui.home.settings.VSubmenuPreferences; import forge.gui.home.settings.VSubmenuReleaseNotes; import forge.gui.home.variant.VSubmenuArchenemy; import forge.gui.home.variant.VSubmenuCommander; -//import forge.gui.home.variant.VSubmenuPlanechase; -//import forge.gui.home.variant.VSubmenuVanguard; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FScrollPanel; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinnedPanel; -import forge.properties.NewConstants; import forge.properties.ForgePreferences.FPref; +import forge.properties.NewConstants; import forge.view.FView; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.util.*; +import java.util.List; + +//import forge.gui.home.variant.VSubmenuPlanechase; +//import forge.gui.home.variant.VSubmenuVanguard; /** * Top level view class for home UI drag layout.
diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletBuild.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletBuild.java index cc0ebd91729..13df866d25e 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletBuild.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletBuild.java @@ -1,16 +1,5 @@ package forge.gui.home.gauntlet; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JFileChooser; -import javax.swing.ListSelectionModel; -import javax.swing.SwingUtilities; -import javax.swing.filechooser.FileFilter; - -import org.apache.commons.lang3.ArrayUtils; - import forge.Command; import forge.deck.Deck; import forge.gauntlet.GauntletData; @@ -18,6 +7,13 @@ import forge.gauntlet.GauntletIO; import forge.gui.framework.ICDoc; import forge.gui.toolbox.FOptionPane; import forge.properties.NewConstants; +import org.apache.commons.lang3.ArrayUtils; + +import javax.swing.*; +import javax.swing.filechooser.FileFilter; +import java.io.File; +import java.util.ArrayList; +import java.util.List; /** * Controls the "build gauntlet" submenu in the home UI. diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java index 4d9cd762ba2..2379ac086ce 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletContests.java @@ -1,13 +1,5 @@ package forge.gui.home.gauntlet; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.SwingUtilities; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -20,6 +12,13 @@ import forge.gui.framework.ICDoc; import forge.net.FServer; import forge.net.Lobby; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + /** * Controls the "gauntlet contests" submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletLoad.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletLoad.java index d37dcf16a20..fe8c8151d19 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletLoad.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletLoad.java @@ -1,14 +1,5 @@ package forge.gui.home.gauntlet; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JButton; -import javax.swing.SwingUtilities; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -21,6 +12,13 @@ import forge.gui.framework.ICDoc; import forge.net.FServer; import forge.net.Lobby; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.util.ArrayList; +import java.util.List; + /** * Controls the "quick gauntlet" submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java index ebc27ca026a..218f334f2a5 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/CSubmenuGauntletQuick.java @@ -1,15 +1,5 @@ package forge.gui.home.gauntlet; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.swing.SwingUtilities; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -24,6 +14,15 @@ import forge.gui.framework.ICDoc; import forge.net.FServer; import forge.net.Lobby; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * Controls the "quick gauntlet" submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/ContestGauntletLister.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/ContestGauntletLister.java index 177baf09886..a165f4ed4ff 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/ContestGauntletLister.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/ContestGauntletLister.java @@ -1,25 +1,22 @@ package forge.gui.home.gauntlet; - -import java.awt.Color; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import javax.swing.JPanel; -import javax.swing.SwingConstants; - -import net.miginfocom.swing.MigLayout; import forge.Command; import forge.gauntlet.GauntletData; import forge.gauntlet.GauntletIO; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedPanel; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; /** * Creates file list/table for quick deleting, editing, and basic info. diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/QuickGauntletLister.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/QuickGauntletLister.java index da1d03acdb4..9bcae619ec5 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/QuickGauntletLister.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/QuickGauntletLister.java @@ -1,19 +1,5 @@ package forge.gui.home.gauntlet; -import java.awt.Color; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import javax.swing.border.Border; - -import net.miginfocom.swing.MigLayout; import forge.Command; import forge.gauntlet.GauntletData; import forge.gauntlet.GauntletIO; @@ -23,6 +9,18 @@ import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinIcon; import forge.gui.toolbox.FSkin.SkinnedButton; import forge.gui.toolbox.FSkin.SkinnedPanel; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.Border; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; /** * Creates file list/table for quick deleting, editing, and basic info. diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletBuild.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletBuild.java index 57f91e01927..d1fef4f1fb9 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletBuild.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletBuild.java @@ -1,15 +1,5 @@ package forge.gui.home.gauntlet; -import java.awt.Color; - -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.JTextField; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; - -import net.miginfocom.swing.MigLayout; import forge.gauntlet.GauntletIO; import forge.gui.deckchooser.FDeckChooser; import forge.gui.framework.DragCell; @@ -18,11 +8,11 @@ import forge.gui.framework.EDocID; import forge.gui.home.EMenuGroup; import forge.gui.home.IVSubmenu; import forge.gui.home.VHomeUI; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FList; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FTextField; +import forge.gui.toolbox.*; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; /** * Assembles Swing components of "build gauntlet" submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletContests.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletContests.java index d4a200fc69e..36a5d17dd95 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletContests.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletContests.java @@ -1,12 +1,5 @@ package forge.gui.home.gauntlet; -import java.awt.Font; - -import javax.swing.JButton; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; - -import net.miginfocom.swing.MigLayout; import forge.gui.deckchooser.FDeckChooser; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -19,6 +12,10 @@ import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedPanel; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; /** * Assembles Swing components of "build gauntlet" submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletLoad.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletLoad.java index 56eab27785a..bc5f9464d8a 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletLoad.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletLoad.java @@ -1,8 +1,5 @@ package forge.gui.home.gauntlet; -import javax.swing.JButton; -import javax.swing.SwingConstants; -import net.miginfocom.swing.MigLayout; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; @@ -13,6 +10,9 @@ import forge.gui.home.VHomeUI; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** * Assembles Swing components of "quick gauntlet" submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletQuick.java b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletQuick.java index efbac330c68..8e25f5e2753 100644 --- a/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletQuick.java +++ b/forge-gui/src/main/java/forge/gui/home/gauntlet/VSubmenuGauntletQuick.java @@ -1,12 +1,5 @@ package forge.gui.home.gauntlet; -import java.awt.Font; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JSlider; -import javax.swing.SwingConstants; -import net.miginfocom.swing.MigLayout; import forge.gui.deckchooser.FDeckChooser; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -20,6 +13,10 @@ import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FPanel; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedSlider; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; /** * Assembles Swing components of "quick gauntlet" submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuChallenges.java b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuChallenges.java index 68261e340b9..05a2e98b489 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuChallenges.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuChallenges.java @@ -1,20 +1,5 @@ package forge.gui.home.quest; -import java.awt.Color; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JRadioButton; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import javax.swing.border.EmptyBorder; - import forge.Command; import forge.Singletons; import forge.gui.framework.EDocID; @@ -27,6 +12,13 @@ import forge.quest.QuestEventChallenge; import forge.quest.bazaar.QuestItemType; import forge.quest.bazaar.QuestPetController; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.awt.event.*; +import java.util.ArrayList; +import java.util.List; + /** * Controls the quest challenges submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuDuels.java b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuDuels.java index c4fd064160e..ef94514d794 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuDuels.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuDuels.java @@ -1,16 +1,5 @@ package forge.gui.home.quest; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.List; - -import javax.swing.JRadioButton; -import javax.swing.SwingUtilities; - import forge.Command; import forge.Singletons; import forge.gui.framework.EDocID; @@ -21,6 +10,10 @@ import forge.quest.QuestController; import forge.quest.QuestEventDuel; import forge.quest.bazaar.QuestPetController; +import javax.swing.*; +import java.awt.event.*; +import java.util.List; + /** * Controls the quest duels submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestData.java b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestData.java index 06226e3898c..57a19a76525 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestData.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestData.java @@ -1,17 +1,5 @@ package forge.gui.home.quest; -import java.io.File; -import java.io.FilenameFilter; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import javax.swing.SwingUtilities; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -21,16 +9,18 @@ import forge.gui.framework.ICDoc; import forge.gui.toolbox.FOptionPane; import forge.item.PaperCard; import forge.properties.NewConstants; -import forge.quest.QuestController; -import forge.quest.QuestMode; -import forge.quest.QuestWorld; -import forge.quest.StartingPoolPreferences; -import forge.quest.StartingPoolType; +import forge.quest.*; import forge.quest.data.GameFormatQuest; import forge.quest.data.QuestData; import forge.quest.data.QuestPreferences.QPref; import forge.quest.io.QuestDataIO; +import javax.swing.*; +import java.io.File; +import java.io.FilenameFilter; +import java.util.*; +import java.util.Map.Entry; + /** * Controls the quest data submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestDecks.java b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestDecks.java index b27c3613d32..b3347feaea7 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestDecks.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestDecks.java @@ -1,9 +1,5 @@ package forge.gui.home.quest; -import java.util.Map.Entry; - -import javax.swing.SwingUtilities; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -17,6 +13,9 @@ import forge.gui.home.CHomeUI; import forge.quest.QuestController; import forge.quest.data.QuestPreferences.QPref; +import javax.swing.*; +import java.util.Map.Entry; + /** * Controls the quest decks submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestPrefs.java b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestPrefs.java index 4c25bd05e38..97300d9420e 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestPrefs.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/CSubmenuQuestPrefs.java @@ -1,13 +1,13 @@ package forge.gui.home.quest; -import javax.swing.SwingUtilities; - import forge.Command; import forge.Singletons; import forge.gui.framework.ICDoc; import forge.gui.home.quest.VSubmenuQuestPrefs.PrefInput; import forge.quest.data.QuestPreferences; +import javax.swing.*; + /** * Controls the quest preferences submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/quest/DialogChooseSets.java b/forge-gui/src/main/java/forge/gui/home/quest/DialogChooseSets.java index c289229e9c1..d889a896ade 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/DialogChooseSets.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/DialogChooseSets.java @@ -1,5 +1,12 @@ package forge.gui.home.quest; +import forge.Singletons; +import forge.card.CardEdition; +import forge.gui.SOverlayUtils; +import forge.gui.toolbox.*; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; @@ -7,22 +14,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import javax.swing.JPanel; -import javax.swing.SwingUtilities; - -import net.miginfocom.swing.MigLayout; -import forge.Singletons; -import forge.card.CardEdition; -import forge.gui.SOverlayUtils; -import forge.gui.toolbox.FButton; -import forge.gui.toolbox.FCheckBox; -import forge.gui.toolbox.FCheckBoxList; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FOverlay; -import forge.gui.toolbox.FPanel; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; - public class DialogChooseSets { private final List selectedSets = new ArrayList(); private boolean wantReprints = true; diff --git a/forge-gui/src/main/java/forge/gui/home/quest/PnlEvent.java b/forge-gui/src/main/java/forge/gui/home/quest/PnlEvent.java index 62538aafc69..ba31a8b9d40 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/PnlEvent.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/PnlEvent.java @@ -1,19 +1,5 @@ package forge.gui.home.quest; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.GradientPaint; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.image.BufferedImage; - -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - -import net.miginfocom.swing.MigLayout; import forge.ImageCache; import forge.gui.toolbox.FRadioButton; import forge.gui.toolbox.FSkin; @@ -21,6 +7,13 @@ import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinImage; import forge.gui.toolbox.FTextArea; import forge.quest.QuestEvent; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.*; +import java.awt.image.BufferedImage; /** * Panels for displaying duels and challenges.
diff --git a/forge-gui/src/main/java/forge/gui/home/quest/QuestFileLister.java b/forge-gui/src/main/java/forge/gui/home/quest/QuestFileLister.java index 2f8e7f353d1..4bb4dc1afdc 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/QuestFileLister.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/QuestFileLister.java @@ -1,18 +1,5 @@ package forge.gui.home.quest; -import java.awt.Color; -import java.awt.event.MouseEvent; -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import javax.swing.border.Border; - -import net.miginfocom.swing.MigLayout; import forge.Command; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FMouseAdapter; @@ -22,6 +9,17 @@ import forge.gui.toolbox.FSkin.SkinnedButton; import forge.gui.toolbox.FSkin.SkinnedPanel; import forge.properties.NewConstants; import forge.quest.data.QuestData; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.Border; +import java.awt.*; +import java.awt.event.MouseEvent; +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; /** * Creates file list/table for quick deleting, editing, and basic info. diff --git a/forge-gui/src/main/java/forge/gui/home/quest/QuestPreferencesHandler.java b/forge-gui/src/main/java/forge/gui/home/quest/QuestPreferencesHandler.java index 24e1bd0a520..05e62394541 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/QuestPreferencesHandler.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/QuestPreferencesHandler.java @@ -1,17 +1,5 @@ package forge.gui.home.quest; -import java.awt.Color; -import java.awt.Font; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import javax.swing.border.Border; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FSkin; @@ -19,6 +7,15 @@ import forge.gui.toolbox.FSkin.SkinnedPanel; import forge.gui.toolbox.FSkin.SkinnedTextField; import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences.QPref; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.Border; +import java.awt.*; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java b/forge-gui/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java index b39896c4b98..16d1d04f902 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/SSubmenuQuestUtil.java @@ -1,14 +1,5 @@ package forge.gui.home.quest; -import java.awt.Color; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.SwingUtilities; -import javax.swing.SwingWorker; - -import org.apache.commons.lang3.tuple.ImmutablePair; - import forge.FThreads; import forge.Singletons; import forge.card.CardEdition; @@ -29,18 +20,18 @@ import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.net.FServer; import forge.net.Lobby; import forge.properties.ForgePreferences.FPref; -import forge.quest.QuestController; -import forge.quest.QuestEvent; -import forge.quest.QuestEventChallenge; -import forge.quest.QuestMode; -import forge.quest.QuestUtil; -import forge.quest.QuestUtilUnlockSets; -import forge.quest.QuestWorld; +import forge.quest.*; import forge.quest.bazaar.QuestItemType; import forge.quest.bazaar.QuestPetController; import forge.quest.data.QuestAchievements; import forge.quest.data.QuestAssets; import forge.quest.data.QuestPreferences.QPref; +import org.apache.commons.lang3.tuple.ImmutablePair; + +import javax.swing.*; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; /** * Utilities for the quest submenu, all over the MVC spectrum. diff --git a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuChallenges.java b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuChallenges.java index 77cf3c8dd34..1524711f850 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuChallenges.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuChallenges.java @@ -1,26 +1,14 @@ package forge.gui.home.quest; -import java.awt.Font; - -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; -import net.miginfocom.swing.MigLayout; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; -import forge.gui.home.EMenuGroup; -import forge.gui.home.IVSubmenu; -import forge.gui.home.LblHeader; -import forge.gui.home.StartButton; -import forge.gui.home.VHomeUI; -import forge.gui.toolbox.FCheckBox; -import forge.gui.toolbox.FComboBoxWrapper; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FScrollPanel; -import forge.gui.toolbox.FSkin; +import forge.gui.home.*; +import forge.gui.toolbox.*; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; /** * Assembles Swing components of quest challenges submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuDuels.java b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuDuels.java index 0ce04118448..1878a01dc73 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuDuels.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuDuels.java @@ -1,26 +1,14 @@ package forge.gui.home.quest; -import java.awt.Font; - -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; -import net.miginfocom.swing.MigLayout; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; -import forge.gui.home.EMenuGroup; -import forge.gui.home.IVSubmenu; -import forge.gui.home.LblHeader; -import forge.gui.home.StartButton; -import forge.gui.home.VHomeUI; -import forge.gui.toolbox.FCheckBox; -import forge.gui.toolbox.FComboBoxWrapper; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FScrollPanel; -import forge.gui.toolbox.FSkin; +import forge.gui.home.*; +import forge.gui.toolbox.*; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; /** * Assembles Swing components of quest duels submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestData.java b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestData.java index 045addfad33..ac0222237c0 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestData.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestData.java @@ -1,20 +1,5 @@ package forge.gui.home.quest; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.HashMap; -import java.util.Map; - -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import javax.swing.plaf.basic.BasicComboBoxRenderer; - -import net.miginfocom.swing.MigLayout; - -import org.apache.commons.lang3.text.WordUtils; - import forge.Singletons; import forge.card.MagicColor; import forge.deck.Deck; @@ -26,19 +11,23 @@ import forge.gui.framework.EDocID; import forge.gui.home.EMenuGroup; import forge.gui.home.IVSubmenu; import forge.gui.home.VHomeUI; -import forge.gui.toolbox.FCheckBox; -import forge.gui.toolbox.FComboBoxWrapper; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FRadioButton; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.JXButtonPanel; +import forge.gui.toolbox.*; import forge.item.PreconDeck; import forge.model.CardCollections; import forge.quest.QuestController; import forge.quest.QuestWorld; import forge.quest.StartingPoolType; import forge.util.storage.IStorage; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.text.WordUtils; + +import javax.swing.*; +import javax.swing.plaf.basic.BasicComboBoxRenderer; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.HashMap; +import java.util.Map; /** * Assembles Swing components of quest data submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestDecks.java b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestDecks.java index 6ddc5c7592f..236e42842d6 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestDecks.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestDecks.java @@ -1,11 +1,5 @@ package forge.gui.home.quest; -import java.awt.Font; - -import javax.swing.JLabel; -import javax.swing.SwingConstants; - -import net.miginfocom.swing.MigLayout; import forge.game.GameType; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -19,6 +13,10 @@ import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.itemmanager.DeckManager; import forge.gui.toolbox.itemmanager.ItemManagerContainer; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; /** * Assembles Swing components of quest decks submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestPrefs.java b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestPrefs.java index 1b805863cd0..d6588d59c49 100644 --- a/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestPrefs.java +++ b/forge-gui/src/main/java/forge/gui/home/quest/VSubmenuQuestPrefs.java @@ -1,18 +1,5 @@ package forge.gui.home.quest; -import java.awt.Color; -import java.awt.Font; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import javax.swing.border.Border; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -28,6 +15,15 @@ import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinnedTextField; import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences.QPref; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.Border; +import java.awt.*; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; /** * Assembles Swing components of quest preferences submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java index 56e6597aafc..9d34656e437 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/AvatarSelector.java @@ -1,15 +1,5 @@ package forge.gui.home.sanctioned; -import java.awt.Dimension; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; - import forge.gui.WrapLayout; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FScrollPane; @@ -17,6 +7,13 @@ import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinImage; import forge.view.FDialog; +import javax.swing.*; +import java.awt.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + @SuppressWarnings("serial") public class AvatarSelector extends FDialog { private List selectables = new ArrayList(); diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java index 14b0ae6023d..b823d180ec2 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuConstructed.java @@ -1,17 +1,6 @@ package forge.gui.home.sanctioned; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Vector; - -import javax.swing.JMenu; -import javax.swing.SwingUtilities; - import com.google.common.collect.Iterables; - import forge.Command; import forge.Singletons; import forge.deck.CardPool; @@ -24,7 +13,6 @@ import forge.gui.GuiDialog; import forge.gui.deckchooser.DeckgenUtil; import forge.gui.deckchooser.DecksComboBox.DeckType; import forge.gui.framework.ICDoc; -//import forge.gui.home.variant.VSubmenuVanguard; import forge.gui.menus.IMenuProvider; import forge.gui.menus.MenuUtil; import forge.gui.toolbox.FList; @@ -37,6 +25,16 @@ import forge.properties.ForgePreferences.FPref; import forge.util.Aggregates; import forge.util.storage.IStorage; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.Vector; + +//import forge.gui.home.variant.VSubmenuVanguard; + /** * Controls the constructed submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java index a2620861650..c5a6996de6b 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuDraft.java @@ -1,13 +1,5 @@ package forge.gui.home.sanctioned; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JButton; -import javax.swing.SwingUtilities; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -28,6 +20,12 @@ import forge.net.FServer; import forge.net.Lobby; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; + /** * Controls the draft submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java index d302a52f2fa..416b74c6e49 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java @@ -1,26 +1,9 @@ package forge.gui.home.sanctioned; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.swing.JButton; -import javax.swing.SwingUtilities; - -import org.apache.commons.lang3.StringUtils; - import forge.Command; import forge.Singletons; import forge.card.MagicColor; -import forge.deck.CardPool; -import forge.deck.Deck; -import forge.deck.DeckBase; -import forge.deck.DeckGroup; -import forge.deck.DeckSection; +import forge.deck.*; import forge.game.GameType; import forge.gui.GuiChoose; import forge.gui.deckeditor.CDeckEditorUI; @@ -30,8 +13,8 @@ import forge.gui.deckeditor.controllers.CEditorLimited; import forge.gui.framework.FScreen; import forge.gui.framework.ICDoc; import forge.gui.toolbox.FOptionPane; -import forge.item.PaperCard; import forge.item.InventoryItem; +import forge.item.PaperCard; import forge.limited.LimitedPoolType; import forge.limited.ReadDraftRankings; import forge.limited.SealedCardPoolGenerator; @@ -39,6 +22,16 @@ import forge.limited.SealedDeckBuilder; import forge.properties.ForgePreferences.FPref; import forge.util.MyRandom; import forge.util.storage.IStorage; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; /** * Controls the sealed submenu in the home UI. diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/ConstructedGameMenu.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/ConstructedGameMenu.java index 359e25796b3..d412fcdb1b8 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/ConstructedGameMenu.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/ConstructedGameMenu.java @@ -1,18 +1,15 @@ package forge.gui.home.sanctioned; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; - -import javax.swing.JCheckBoxMenuItem; -import javax.swing.JMenu; -import javax.swing.JMenuItem; - import forge.Singletons; import forge.gui.menus.MenuUtil; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; + /** * Returns a JMenu containing options for constructed game. */ diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java index 8ccaa95150e..111f94a8ac3 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java @@ -1,35 +1,6 @@ package forge.gui.home.sanctioned; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.Vector; - -import javax.swing.ButtonGroup; -import javax.swing.JButton; -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - -import net.miginfocom.swing.MigLayout; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; - import forge.Command; import forge.Singletons; import forge.deck.DeckSection; @@ -40,41 +11,34 @@ import forge.gui.CardDetailPanel; import forge.gui.deckchooser.DecksComboBox.DeckType; import forge.gui.deckchooser.DecksComboBoxEvent; import forge.gui.deckchooser.FDeckChooser; -import forge.gui.deckeditor.DeckProxy; import forge.gui.deckchooser.IDecksComboBoxListener; import forge.gui.deckeditor.CDeckEditorUI; +import forge.gui.deckeditor.DeckProxy; import forge.gui.deckeditor.controllers.CEditorVariant; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.FScreen; -import forge.gui.home.EMenuGroup; -import forge.gui.home.IVSubmenu; -import forge.gui.home.LblHeader; -import forge.gui.home.StartButton; -import forge.gui.home.VHomeUI; -import forge.gui.toolbox.FCheckBox; -import forge.gui.toolbox.FComboBox; -import forge.gui.toolbox.FComboBoxWrapper; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FList; -import forge.gui.toolbox.FMouseAdapter; -import forge.gui.toolbox.FOptionPane; -import forge.gui.toolbox.FPanel; -import forge.gui.toolbox.FRadioButton; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FScrollPanel; -import forge.gui.toolbox.FSkin; +import forge.gui.home.*; +import forge.gui.toolbox.*; import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinImage; -import forge.gui.toolbox.FTextField; - import forge.item.PaperCard; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; import forge.util.Lang; import forge.util.MyRandom; import forge.util.NameGenerator; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.*; +import java.awt.event.*; +import java.util.*; +import java.util.List; /** * Assembles Swing components of constructed submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuDraft.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuDraft.java index fca2e7fda85..c36268605c6 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuDraft.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuDraft.java @@ -1,33 +1,18 @@ package forge.gui.home.sanctioned; -import java.awt.Font; - -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.ListSelectionModel; -import javax.swing.SwingConstants; - -import net.miginfocom.swing.MigLayout; import forge.game.GameType; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; -import forge.gui.home.EMenuGroup; -import forge.gui.home.IVSubmenu; -import forge.gui.home.LblHeader; -import forge.gui.home.StartButton; -import forge.gui.home.VHomeUI; +import forge.gui.home.*; import forge.gui.home.VHomeUI.PnlDisplay; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FList; -import forge.gui.toolbox.FRadioButton; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.JXButtonPanel; +import forge.gui.toolbox.*; import forge.gui.toolbox.itemmanager.DeckManager; import forge.gui.toolbox.itemmanager.ItemManagerContainer; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; /** * Assembles Swing components of draft submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuSealed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuSealed.java index 1758dae80af..42ac02754ca 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuSealed.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuSealed.java @@ -1,29 +1,11 @@ package forge.gui.home.sanctioned; -import java.awt.Font; -import java.awt.Rectangle; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.JButton; -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import javax.swing.border.Border; -import javax.swing.text.SimpleAttributeSet; -import javax.swing.text.StyleConstants; -import javax.swing.text.StyledDocument; - -import net.miginfocom.swing.MigLayout; import forge.game.GameType; import forge.gui.SOverlayUtils; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; -import forge.gui.home.EMenuGroup; -import forge.gui.home.IVSubmenu; -import forge.gui.home.LblHeader; -import forge.gui.home.StartButton; -import forge.gui.home.VHomeUI; +import forge.gui.home.*; import forge.gui.home.VHomeUI.PnlDisplay; import forge.gui.toolbox.FButton; import forge.gui.toolbox.FLabel; @@ -32,6 +14,16 @@ import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedTextPane; import forge.gui.toolbox.itemmanager.DeckManager; import forge.gui.toolbox.itemmanager.ItemManagerContainer; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.Border; +import javax.swing.text.SimpleAttributeSet; +import javax.swing.text.StyleConstants; +import javax.swing.text.StyledDocument; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; /** * Assembles Swing components of sealed submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuAvatars.java b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuAvatars.java index 20b993b5eba..10bc162804e 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuAvatars.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuAvatars.java @@ -1,10 +1,10 @@ package forge.gui.home.settings; -import javax.swing.SwingUtilities; - import forge.Command; import forge.gui.framework.ICDoc; +import javax.swing.*; + /** * Controls the avatars submenu in the home UI. */ diff --git a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuDownloaders.java b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuDownloaders.java index a6100f46a6d..fa0bd5eae96 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuDownloaders.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuDownloaders.java @@ -1,7 +1,5 @@ package forge.gui.home.settings; -import javax.swing.SwingUtilities; - import forge.Command; import forge.error.BugReporter; import forge.gui.ImportDialog; @@ -11,6 +9,8 @@ import forge.gui.download.GuiDownloadQuestImages; import forge.gui.download.GuiDownloadSetPicturesLQ; import forge.gui.framework.ICDoc; +import javax.swing.*; + /** * Controls the utilities submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java index 18716932fce..e786eecf9a7 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/CSubmenuPreferences.java @@ -1,16 +1,5 @@ package forge.gui.home.settings; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JCheckBox; -import javax.swing.SwingUtilities; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; - import forge.Command; import forge.Constant.Preferences; import forge.Singletons; @@ -26,6 +15,14 @@ import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FOptionPane; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; + +import javax.swing.*; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.ArrayList; +import java.util.List; /** * Controls the preferences submenu in the home UI. diff --git a/forge-gui/src/main/java/forge/gui/home/settings/GamePlayerUtil.java b/forge-gui/src/main/java/forge/gui/home/settings/GamePlayerUtil.java index a19a2f38628..19c43ffea76 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/GamePlayerUtil.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/GamePlayerUtil.java @@ -1,11 +1,10 @@ package forge.gui.home.settings; -import org.apache.commons.lang3.StringUtils; - import forge.Singletons; import forge.gui.toolbox.FOptionPane; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import org.apache.commons.lang3.StringUtils; public final class GamePlayerUtil { private GamePlayerUtil() { }; diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuAvatars.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuAvatars.java index 7342426eac4..299ef58d0d2 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuAvatars.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuAvatars.java @@ -1,12 +1,5 @@ package forge.gui.home.settings; -import java.awt.Dimension; -import java.util.Map; - -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; - -import net.miginfocom.swing.MigLayout; import forge.Command; import forge.Singletons; import forge.gui.WrapLayout; @@ -21,6 +14,11 @@ import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinImage; import forge.properties.ForgePreferences.FPref; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.util.Map; /** * Assembles Swing components of avatars submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuDownloaders.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuDownloaders.java index 2ea35c3f89b..ccaf8dfec0e 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuDownloaders.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuDownloaders.java @@ -1,16 +1,5 @@ package forge.gui.home.settings; -import java.awt.Component; -import java.awt.Font; -import java.awt.Point; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import net.miginfocom.swing.MigLayout; import forge.Command; import forge.gui.SOverlayUtils; import forge.gui.framework.DragCell; @@ -19,15 +8,15 @@ import forge.gui.framework.EDocID; import forge.gui.home.EMenuGroup; import forge.gui.home.IVSubmenu; import forge.gui.home.VHomeUI; -import forge.gui.toolbox.FButton; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FOverlay; -import forge.gui.toolbox.FPanel; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FTextArea; +import forge.gui.toolbox.*; import forge.properties.NewConstants; import forge.util.FileUtil; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; /** * Assembles Swing components of utilities submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java index 3d0068ee00c..ddfff517d84 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuPreferences.java @@ -1,26 +1,5 @@ package forge.gui.home.settings; -import java.awt.Color; -import java.awt.Font; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.swing.JCheckBox; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; -import net.miginfocom.swing.MigLayout; - -import org.apache.commons.lang3.StringUtils; - import forge.Singletons; import forge.control.FControl.CloseAction; import forge.control.KeyboardShortcuts; @@ -32,14 +11,21 @@ import forge.gui.framework.EDocID; import forge.gui.home.EMenuGroup; import forge.gui.home.IVSubmenu; import forge.gui.home.VHomeUI; -import forge.gui.toolbox.FCheckBox; -import forge.gui.toolbox.FComboBoxPanel; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; +import forge.gui.toolbox.*; import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.gui.toolbox.FSkin.SkinnedTextField; import forge.properties.ForgePreferences.FPref; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.util.*; +import java.util.List; /** * Assembles Swing components of preferences submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuReleaseNotes.java b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuReleaseNotes.java index dd208261060..1963775f467 100644 --- a/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuReleaseNotes.java +++ b/forge-gui/src/main/java/forge/gui/home/settings/VSubmenuReleaseNotes.java @@ -18,11 +18,6 @@ package forge.gui.home.settings; -import javax.swing.BorderFactory; -import javax.swing.JPanel; -import javax.swing.SwingUtilities; - -import net.miginfocom.swing.MigLayout; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; @@ -32,6 +27,9 @@ import forge.gui.home.VHomeUI; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedTextArea; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** * Displays contents of CHANGES.txt file. diff --git a/forge-gui/src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java b/forge-gui/src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java index b0070e7e246..591d82fa771 100644 --- a/forge-gui/src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java +++ b/forge-gui/src/main/java/forge/gui/home/variant/CSubmenuArchenemy.java @@ -1,15 +1,6 @@ package forge.gui.home.variant; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.List; -import java.util.Vector; - -import javax.swing.SwingUtilities; - import com.google.common.base.Predicate; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -32,6 +23,13 @@ import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; import forge.util.Aggregates; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; +import java.util.Vector; + /** * Controls the constructed submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/variant/CSubmenuCommander.java b/forge-gui/src/main/java/forge/gui/home/variant/CSubmenuCommander.java index c6ecaec0a1f..52aca7f8870 100644 --- a/forge-gui/src/main/java/forge/gui/home/variant/CSubmenuCommander.java +++ b/forge-gui/src/main/java/forge/gui/home/variant/CSubmenuCommander.java @@ -1,14 +1,5 @@ package forge.gui.home.variant; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.Vector; - -import javax.swing.SwingUtilities; - import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -28,6 +19,14 @@ import forge.net.Lobby; import forge.properties.ForgePreferences.FPref; import forge.util.MyRandom; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.Vector; + /** * Controls the commander submenu in the home UI. * diff --git a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java index 8d40147e489..1c0b1736211 100644 --- a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java +++ b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuArchenemy.java @@ -1,38 +1,20 @@ package forge.gui.home.variant; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.ButtonGroup; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.ScrollPaneConstants; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.deck.Deck; import forge.gui.deckchooser.FDeckChooser; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; -import forge.gui.home.EMenuGroup; -import forge.gui.home.IVSubmenu; -import forge.gui.home.LblHeader; -import forge.gui.home.StartButton; -import forge.gui.home.VHomeUI; -import forge.gui.toolbox.FCheckBox; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FList; -import forge.gui.toolbox.FPanel; -import forge.gui.toolbox.FRadioButton; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FTabbedPane; -import forge.gui.toolbox.JXButtonPanel; +import forge.gui.home.*; +import forge.gui.toolbox.*; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.ArrayList; +import java.util.List; /** * Assembles Swing components of constructed submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java index c4748ec4a50..684c2dc525a 100644 --- a/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java +++ b/forge-gui/src/main/java/forge/gui/home/variant/VSubmenuCommander.java @@ -1,34 +1,20 @@ package forge.gui.home.variant; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.List; -import java.util.Vector; - -import javax.swing.ButtonGroup; -import javax.swing.JButton; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.ScrollPaneConstants; -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.deck.Deck; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; -import forge.gui.home.EMenuGroup; -import forge.gui.home.IVSubmenu; -import forge.gui.home.LblHeader; -import forge.gui.home.StartButton; -import forge.gui.home.VHomeUI; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FList; -import forge.gui.toolbox.FPanel; -import forge.gui.toolbox.FRadioButton; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FTabbedPane; +import forge.gui.home.*; +import forge.gui.toolbox.*; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.ArrayList; +import java.util.List; +import java.util.Vector; /** * Assembles Swing components of constructed submenu singleton. diff --git a/forge-gui/src/main/java/forge/gui/input/Input.java b/forge-gui/src/main/java/forge/gui/input/Input.java index e5fdcdff2bf..0e61f3e4169 100644 --- a/forge-gui/src/main/java/forge/gui/input/Input.java +++ b/forge-gui/src/main/java/forge/gui/input/Input.java @@ -1,11 +1,11 @@ package forge.gui.input; -import java.awt.event.MouseEvent; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.awt.event.MouseEvent; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/input/InputAttack.java b/forge-gui/src/main/java/forge/gui/input/InputAttack.java index 00b0dd0a07e..d7d0810af67 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputAttack.java +++ b/forge-gui/src/main/java/forge/gui/input/InputAttack.java @@ -17,11 +17,7 @@ */ package forge.gui.input; -import java.awt.event.MouseEvent; -import java.util.List; - import com.google.common.collect.Iterables; - import forge.game.GameEntity; import forge.game.ability.AbilityUtils; import forge.game.card.Card; @@ -35,6 +31,9 @@ import forge.gui.events.UiEventAttackerDeclared; import forge.gui.match.CMatchUI; import forge.view.ButtonUtil; +import java.awt.event.MouseEvent; +import java.util.List; + /** *

* InputAttack class. diff --git a/forge-gui/src/main/java/forge/gui/input/InputBase.java b/forge-gui/src/main/java/forge/gui/input/InputBase.java index 8ffdc1f7b62..f21fd84a293 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputBase.java +++ b/forge-gui/src/main/java/forge/gui/input/InputBase.java @@ -17,8 +17,6 @@ */ package forge.gui.input; -import java.awt.event.MouseEvent; - import forge.game.Game; import forge.game.card.Card; import forge.game.phase.PhaseHandler; @@ -28,6 +26,8 @@ import forge.gui.framework.SDisplayUtil; import forge.gui.match.CMatchUI; import forge.gui.match.views.VPrompt; +import java.awt.event.MouseEvent; + /** *

* Abstract Input class. diff --git a/forge-gui/src/main/java/forge/gui/input/InputBlock.java b/forge-gui/src/main/java/forge/gui/input/InputBlock.java index 7f866434e87..df988c41784 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputBlock.java +++ b/forge-gui/src/main/java/forge/gui/input/InputBlock.java @@ -17,8 +17,6 @@ */ package forge.gui.input; -import java.awt.event.MouseEvent; - import forge.game.card.Card; import forge.game.combat.Combat; import forge.game.combat.CombatUtil; @@ -29,6 +27,8 @@ import forge.gui.events.UiEventBlockerAssigned; import forge.gui.match.CMatchUI; import forge.view.ButtonUtil; +import java.awt.event.MouseEvent; + /** *

* Input_Block class. diff --git a/forge-gui/src/main/java/forge/gui/input/InputConfirmMulligan.java b/forge-gui/src/main/java/forge/gui/input/InputConfirmMulligan.java index 7bd23d4b301..515b1e61db8 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputConfirmMulligan.java +++ b/forge-gui/src/main/java/forge/gui/input/InputConfirmMulligan.java @@ -17,10 +17,6 @@ */ package forge.gui.input; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; - import forge.game.Game; import forge.game.card.Card; import forge.game.player.Player; @@ -30,6 +26,10 @@ import forge.gui.match.CMatchUI; import forge.util.Lang; import forge.util.ThreadUtil; import forge.view.ButtonUtil; + +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; /** *

diff --git a/forge-gui/src/main/java/forge/gui/input/InputLockUI.java b/forge-gui/src/main/java/forge/gui/input/InputLockUI.java index 5ca76377086..850c3340567 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputLockUI.java +++ b/forge-gui/src/main/java/forge/gui/input/InputLockUI.java @@ -1,8 +1,5 @@ package forge.gui.input; -import java.awt.event.MouseEvent; -import java.util.concurrent.atomic.AtomicInteger; - import forge.FThreads; import forge.Singletons; import forge.control.InputQueue; @@ -13,6 +10,9 @@ import forge.gui.match.CMatchUI; import forge.util.ThreadUtil; import forge.view.ButtonUtil; +import java.awt.event.MouseEvent; +import java.util.concurrent.atomic.AtomicInteger; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/input/InputPassPriority.java b/forge-gui/src/main/java/forge/gui/input/InputPassPriority.java index 99238bd106c..19fc2024def 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPassPriority.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPassPriority.java @@ -17,14 +17,14 @@ */ package forge.gui.input; -import java.awt.event.MouseEvent; -import java.util.List; - import forge.game.card.Card; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.view.ButtonUtil; +import java.awt.event.MouseEvent; +import java.util.List; + /** *

* Input_PassPriority class. diff --git a/forge-gui/src/main/java/forge/gui/input/InputPayMana.java b/forge-gui/src/main/java/forge/gui/input/InputPayMana.java index f3a710bee3c..08559c3dd6d 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPayMana.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPayMana.java @@ -1,12 +1,5 @@ package forge.gui.input; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.FThreads; import forge.ai.ComputerUtilMana; import forge.card.ColorSet; @@ -18,15 +11,21 @@ import forge.game.ability.ApiType; import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.mana.ManaCostBeingPaid; -import forge.gui.player.HumanPlay; import forge.game.player.Player; import forge.game.player.PlayerControllerAi; import forge.game.replacement.ReplacementEffect; import forge.game.spellability.AbilityManaPart; import forge.game.spellability.SpellAbility; import forge.gui.GuiChoose; +import forge.gui.player.HumanPlay; import forge.util.Evaluator; import forge.view.ButtonUtil; +import org.apache.commons.lang3.StringUtils; + +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/gui/input/InputPayManaExecuteCommands.java b/forge-gui/src/main/java/forge/gui/input/InputPayManaExecuteCommands.java index 4a64a2e1b2a..9ffe34c8a13 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPayManaExecuteCommands.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPayManaExecuteCommands.java @@ -17,14 +17,14 @@ */ package forge.gui.input; -import java.awt.event.MouseEvent; - import forge.card.mana.ManaCost; import forge.game.card.Card; import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.awt.event.MouseEvent; + //if cost is paid, Command.execute() is called /** diff --git a/forge-gui/src/main/java/forge/gui/input/InputPayManaOfCostPayment.java b/forge-gui/src/main/java/forge/gui/input/InputPayManaOfCostPayment.java index 9cf12c942c4..e6561bf84f0 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPayManaOfCostPayment.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPayManaOfCostPayment.java @@ -1,12 +1,12 @@ package forge.gui.input; -import java.awt.event.MouseEvent; - import forge.game.card.Card; import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.awt.event.MouseEvent; + public class InputPayManaOfCostPayment extends InputPayMana { public InputPayManaOfCostPayment(ManaCostBeingPaid cost, SpellAbility spellAbility) { super(spellAbility); diff --git a/forge-gui/src/main/java/forge/gui/input/InputPayManaSimple.java b/forge-gui/src/main/java/forge/gui/input/InputPayManaSimple.java index fee51fcafe4..dd59013de64 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPayManaSimple.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPayManaSimple.java @@ -17,8 +17,6 @@ */ package forge.gui.input; -import java.awt.event.MouseEvent; - import forge.card.mana.ManaCost; import forge.game.Game; import forge.game.card.Card; @@ -26,6 +24,8 @@ import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; import forge.game.spellability.SpellAbility; +import java.awt.event.MouseEvent; + //pays the cost of a card played from the player's hand //the card is removed from the players hand if the cost is paid //CANNOT be used for ABILITIES diff --git a/forge-gui/src/main/java/forge/gui/input/InputPayManaX.java b/forge-gui/src/main/java/forge/gui/input/InputPayManaX.java index 94bb00fd117..c4626132367 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputPayManaX.java +++ b/forge-gui/src/main/java/forge/gui/input/InputPayManaX.java @@ -1,11 +1,5 @@ package forge.gui.input; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.card.ColorSet; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostParser; @@ -13,6 +7,11 @@ import forge.game.card.Card; import forge.game.mana.ManaCostBeingPaid; import forge.game.spellability.SpellAbility; import forge.view.ButtonUtil; +import org.apache.commons.lang3.StringUtils; + +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; public class InputPayManaX extends InputPayMana { private static final long serialVersionUID = -6900234444347364050L; diff --git a/forge-gui/src/main/java/forge/gui/input/InputProliferate.java b/forge-gui/src/main/java/forge/gui/input/InputProliferate.java index dad5d9ee754..f3df9ae60fd 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputProliferate.java +++ b/forge-gui/src/main/java/forge/gui/input/InputProliferate.java @@ -1,19 +1,15 @@ package forge.gui.input; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CounterType; import forge.game.player.Player; import forge.gui.GuiChoose; +import java.awt.event.MouseEvent; +import java.util.*; +import java.util.Map.Entry; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/input/InputSelectCardsForConvoke.java b/forge-gui/src/main/java/forge/gui/input/InputSelectCardsForConvoke.java index bebe52e91e4..fbd9e0fb999 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputSelectCardsForConvoke.java +++ b/forge-gui/src/main/java/forge/gui/input/InputSelectCardsForConvoke.java @@ -1,20 +1,19 @@ package forge.gui.input; -import java.awt.event.MouseEvent; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.commons.lang3.tuple.ImmutablePair; - import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; import forge.game.card.Card; import forge.game.card.CardUtil; import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; +import org.apache.commons.lang3.tuple.ImmutablePair; + +import java.awt.event.MouseEvent; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/gui/input/InputSelectCardsFromList.java b/forge-gui/src/main/java/forge/gui/input/InputSelectCardsFromList.java index 6c9f7641e8f..ba349fc1f7e 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputSelectCardsFromList.java +++ b/forge-gui/src/main/java/forge/gui/input/InputSelectCardsFromList.java @@ -1,9 +1,9 @@ package forge.gui.input; -import java.util.Collection; - import forge.game.card.Card; +import java.util.Collection; + public class InputSelectCardsFromList extends InputSelectEntitiesFromList { private static final long serialVersionUID = 6230360322294805986L; diff --git a/forge-gui/src/main/java/forge/gui/input/InputSelectEntitiesFromList.java b/forge-gui/src/main/java/forge/gui/input/InputSelectEntitiesFromList.java index a0d4b92bdcb..6aa181740a0 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputSelectEntitiesFromList.java +++ b/forge-gui/src/main/java/forge/gui/input/InputSelectEntitiesFromList.java @@ -1,14 +1,14 @@ package forge.gui.input; +import forge.game.GameEntity; +import forge.game.card.Card; +import forge.game.player.Player; + import java.awt.event.MouseEvent; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import forge.game.GameEntity; -import forge.game.card.Card; -import forge.game.player.Player; - public class InputSelectEntitiesFromList extends InputSelectManyBase { private static final long serialVersionUID = -6609493252672573139L; diff --git a/forge-gui/src/main/java/forge/gui/input/InputSelectManyBase.java b/forge-gui/src/main/java/forge/gui/input/InputSelectManyBase.java index a3b196f0091..c39e9a2c5ca 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputSelectManyBase.java +++ b/forge-gui/src/main/java/forge/gui/input/InputSelectManyBase.java @@ -1,14 +1,13 @@ package forge.gui.input; -import java.util.Collection; - import com.google.common.collect.Iterables; - import forge.game.GameEntity; import forge.game.card.Card; import forge.gui.match.CMatchUI; import forge.view.ButtonUtil; +import java.util.Collection; + public abstract class InputSelectManyBase extends InputSyncronizedBase { private static final long serialVersionUID = -2305549394512889450L; diff --git a/forge-gui/src/main/java/forge/gui/input/InputSelectTargets.java b/forge-gui/src/main/java/forge/gui/input/InputSelectTargets.java index 4f0db46e707..c6a6f69cc02 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputSelectTargets.java +++ b/forge-gui/src/main/java/forge/gui/input/InputSelectTargets.java @@ -1,11 +1,5 @@ package forge.gui.input; -import java.awt.event.MouseEvent; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import forge.game.GameEntity; import forge.game.ability.ApiType; import forge.game.card.Card; @@ -16,6 +10,12 @@ import forge.gui.GuiChoose; import forge.gui.match.CMatchUI; import forge.view.ButtonUtil; +import java.awt.event.MouseEvent; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/input/InputSyncronizedBase.java b/forge-gui/src/main/java/forge/gui/input/InputSyncronizedBase.java index 4a923aead1e..c15863d4803 100644 --- a/forge-gui/src/main/java/forge/gui/input/InputSyncronizedBase.java +++ b/forge-gui/src/main/java/forge/gui/input/InputSyncronizedBase.java @@ -1,11 +1,11 @@ package forge.gui.input; -import java.util.concurrent.CountDownLatch; - import forge.FThreads; import forge.Singletons; import forge.error.BugReporter; +import java.util.concurrent.CountDownLatch; + public abstract class InputSyncronizedBase extends InputBase implements InputSynchronized { private static final long serialVersionUID = 8756177361251703052L; private final CountDownLatch cdlDone; diff --git a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java index 8d2088b7f6e..dc959d8a6a6 100644 --- a/forge-gui/src/main/java/forge/gui/match/CMatchUI.java +++ b/forge-gui/src/main/java/forge/gui/match/CMatchUI.java @@ -17,21 +17,9 @@ */ package forge.gui.match; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.swing.JMenu; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.collect.Lists; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; - import forge.Command; import forge.FThreads; import forge.ImageCache; @@ -49,22 +37,10 @@ import forge.gui.events.IUiEventVisitor; import forge.gui.events.UiEvent; import forge.gui.events.UiEventAttackerDeclared; import forge.gui.events.UiEventBlockerAssigned; -import forge.gui.framework.EDocID; -import forge.gui.framework.FScreen; -import forge.gui.framework.ICDoc; -import forge.gui.framework.IVDoc; -import forge.gui.framework.SDisplayUtil; -import forge.gui.match.controllers.CAntes; -import forge.gui.match.controllers.CCombat; -import forge.gui.match.controllers.CDetail; -import forge.gui.match.controllers.CPrompt; -import forge.gui.match.controllers.CPicture; +import forge.gui.framework.*; +import forge.gui.match.controllers.*; import forge.gui.match.menus.CMatchUIMenus; -import forge.gui.match.views.VCommand; -import forge.gui.match.views.VField; -import forge.gui.match.views.VHand; -import forge.gui.match.views.VPlayers; -import forge.gui.match.views.VStack; +import forge.gui.match.views.*; import forge.gui.menus.IMenuProvider; import forge.gui.toolbox.FOptionPane; import forge.gui.toolbox.FOverlay; @@ -76,6 +52,10 @@ import forge.net.FServer; import forge.properties.ForgePreferences.FPref; import forge.view.arcane.CardPanel; import forge.view.arcane.PlayArea; +import org.apache.commons.lang3.tuple.Pair; + +import javax.swing.*; +import java.util.*; /** * Constructs instance of match UI controller, used as a single point of diff --git a/forge-gui/src/main/java/forge/gui/match/ControlWinLose.java b/forge-gui/src/main/java/forge/gui/match/ControlWinLose.java index c425c919467..a22a7fdfbde 100644 --- a/forge-gui/src/main/java/forge/gui/match/ControlWinLose.java +++ b/forge-gui/src/main/java/forge/gui/match/ControlWinLose.java @@ -1,15 +1,15 @@ package forge.gui.match; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import javax.swing.JButton; - import forge.Singletons; import forge.game.Game; import forge.game.Match; import forge.gui.SOverlayUtils; import forge.gui.framework.FScreen; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + /** * Default controller for a ViewWinLose object. This class can * be extended for various game modes to populate the custom diff --git a/forge-gui/src/main/java/forge/gui/match/GameLogPanel.java b/forge-gui/src/main/java/forge/gui/match/GameLogPanel.java index 08265387be5..c68faa25fb0 100644 --- a/forge-gui/src/main/java/forge/gui/match/GameLogPanel.java +++ b/forge-gui/src/main/java/forge/gui/match/GameLogPanel.java @@ -1,30 +1,20 @@ package forge.gui.match; -import java.awt.AWTEvent; -import java.awt.Dimension; -import java.awt.Rectangle; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; -import java.awt.event.MouseEvent; - -import javax.swing.JComponent; -import javax.swing.JLayer; -import javax.swing.JPanel; -import javax.swing.JScrollBar; -import javax.swing.JTextArea; -import javax.swing.ScrollPaneConstants; -import javax.swing.Scrollable; -import javax.swing.SwingUtilities; -import javax.swing.border.EmptyBorder; -import javax.swing.plaf.LayerUI; - -import net.miginfocom.swing.MigLayout; import forge.gui.MouseUtil; import forge.gui.MouseUtil.MouseCursor; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinFont; import forge.gui.toolbox.FSkin.SkinnedTextArea; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import javax.swing.plaf.LayerUI; +import java.awt.*; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class GameLogPanel extends JPanel { diff --git a/forge-gui/src/main/java/forge/gui/match/GauntletWinLose.java b/forge-gui/src/main/java/forge/gui/match/GauntletWinLose.java index f0a232954ea..fcaba2f6486 100644 --- a/forge-gui/src/main/java/forge/gui/match/GauntletWinLose.java +++ b/forge-gui/src/main/java/forge/gui/match/GauntletWinLose.java @@ -17,16 +17,7 @@ package forge.gui.match; * along with this program. If not, see . */ -import java.awt.Color; -import java.util.List; - -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.SwingConstants; - import com.google.common.collect.Lists; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.deck.Deck; import forge.game.Game; @@ -41,6 +32,11 @@ import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedPanel; import forge.net.FServer; import forge.net.Lobby; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.util.List; /** * The Win/Lose handler for 'gauntlet' type tournament diff --git a/forge-gui/src/main/java/forge/gui/match/LimitedWinLose.java b/forge-gui/src/main/java/forge/gui/match/LimitedWinLose.java index 5db92e44aee..5de471d8c35 100644 --- a/forge-gui/src/main/java/forge/gui/match/LimitedWinLose.java +++ b/forge-gui/src/main/java/forge/gui/match/LimitedWinLose.java @@ -17,12 +17,6 @@ package forge.gui.match; * along with this program. If not, see . */ -import java.awt.Color; -import java.awt.Dimension; - -import javax.swing.BorderFactory; -import javax.swing.SwingConstants; - import forge.Singletons; import forge.game.Game; import forge.gui.SOverlayUtils; @@ -31,6 +25,9 @@ import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.limited.GauntletMini; import forge.net.FServer; +import javax.swing.*; +import java.awt.*; + /** * The Win/Lose handler for 'gauntlet' type tournament * games. diff --git a/forge-gui/src/main/java/forge/gui/match/QuestWinLose.java b/forge-gui/src/main/java/forge/gui/match/QuestWinLose.java index b7df0982c64..b50a418848d 100644 --- a/forge-gui/src/main/java/forge/gui/match/QuestWinLose.java +++ b/forge-gui/src/main/java/forge/gui/match/QuestWinLose.java @@ -16,18 +16,6 @@ */ package forge.gui.match; -import java.awt.Color; -import java.awt.Dimension; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map.Entry; - -import javax.swing.BorderFactory; -import javax.swing.SwingConstants; - -import org.apache.commons.lang3.StringUtils; - import forge.Singletons; import forge.card.CardEdition; import forge.card.IUnOpenedProduct; @@ -36,11 +24,7 @@ import forge.game.Game; import forge.game.GameEndReason; import forge.game.GameFormat; import forge.game.GameOutcome; -import forge.game.player.GameLossReason; -import forge.game.player.LobbyPlayer; -import forge.game.player.Player; -import forge.game.player.PlayerOutcome; -import forge.game.player.PlayerStatistics; +import forge.game.player.*; import forge.gui.GuiChoose; import forge.gui.SOverlayUtils; import forge.gui.framework.FScreen; @@ -49,23 +33,23 @@ import forge.gui.home.quest.CSubmenuDuels; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinIcon; import forge.gui.toolbox.FSkin.SkinnedLabel; -import forge.item.BoosterPack; -import forge.item.PaperCard; -import forge.item.InventoryItem; -import forge.item.SealedProduct; -import forge.item.TournamentPack; +import forge.item.*; import forge.net.FServer; import forge.properties.ForgePreferences.FPref; -import forge.quest.IQuestRewardCard; -import forge.quest.QuestController; -import forge.quest.QuestEvent; -import forge.quest.QuestEventChallenge; -import forge.quest.QuestEventDifficulty; +import forge.quest.*; import forge.quest.bazaar.QuestItemType; import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences.DifficultyPrefs; import forge.quest.data.QuestPreferences.QPref; import forge.util.MyRandom; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import java.awt.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map.Entry; /** *

diff --git a/forge-gui/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java b/forge-gui/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java index 4dba6bfc948..6551a78affc 100644 --- a/forge-gui/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java +++ b/forge-gui/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java @@ -17,15 +17,6 @@ */ package forge.gui.match; -import java.util.Collections; -import java.util.List; - -import javax.swing.AbstractListModel; -import javax.swing.JList; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - -import net.miginfocom.swing.MigLayout; import forge.game.card.Card; import forge.gui.CardDetailPanel; import forge.gui.CardPicturePanel; @@ -34,6 +25,13 @@ import forge.gui.toolbox.FPanel; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; import forge.item.PaperCard; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.util.Collections; +import java.util.List; /** * A simple JPanel that shows three columns: card list, pic, and description.. diff --git a/forge-gui/src/main/java/forge/gui/match/TargetingOverlay.java b/forge-gui/src/main/java/forge/gui/match/TargetingOverlay.java index f985b7f20bd..7f3560b8e60 100644 --- a/forge-gui/src/main/java/forge/gui/match/TargetingOverlay.java +++ b/forge-gui/src/main/java/forge/gui/match/TargetingOverlay.java @@ -17,22 +17,6 @@ */ package forge.gui.match; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.RenderingHints; -import java.awt.geom.AffineTransform; -import java.awt.geom.Area; -import java.awt.geom.GeneralPath; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.swing.JPanel; - import forge.Singletons; import forge.game.card.Card; import forge.game.combat.Combat; @@ -44,6 +28,16 @@ import forge.gui.toolbox.FSkin.SkinnedPanel; import forge.view.FView; import forge.view.arcane.CardPanel; +import javax.swing.*; +import java.awt.*; +import java.awt.geom.AffineTransform; +import java.awt.geom.Area; +import java.awt.geom.GeneralPath; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Semi-transparent overlay panel. Should be used with layered panes. * diff --git a/forge-gui/src/main/java/forge/gui/match/VAssignDamage.java b/forge-gui/src/main/java/forge/gui/match/VAssignDamage.java index 01d6230d910..5f440b733a7 100644 --- a/forge-gui/src/main/java/forge/gui/match/VAssignDamage.java +++ b/forge-gui/src/main/java/forge/gui/match/VAssignDamage.java @@ -17,24 +17,6 @@ */ package forge.gui.match; -import java.awt.Dialog.ModalityType; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import javax.swing.border.Border; - -import net.miginfocom.swing.MigLayout; import forge.game.GameEntity; import forge.game.card.Card; import forge.game.card.CounterType; @@ -47,6 +29,20 @@ import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedPanel; import forge.view.FDialog; import forge.view.arcane.CardPanel; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.Border; +import java.awt.Dialog.ModalityType; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * Assembles Swing components of assign damage dialog. diff --git a/forge-gui/src/main/java/forge/gui/match/VMatchUI.java b/forge-gui/src/main/java/forge/gui/match/VMatchUI.java index 1bba6d1b400..bc3ca051f4f 100644 --- a/forge-gui/src/main/java/forge/gui/match/VMatchUI.java +++ b/forge-gui/src/main/java/forge/gui/match/VMatchUI.java @@ -1,26 +1,15 @@ package forge.gui.match; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JButton; -import javax.swing.SwingUtilities; - import forge.Singletons; -import forge.gui.framework.DragCell; -import forge.gui.framework.EDocID; -import forge.gui.framework.FScreen; -import forge.gui.framework.IVTopLevelUI; -import forge.gui.framework.SRearrangingUtil; -import forge.gui.framework.VEmptyDoc; -import forge.gui.match.views.VCommand; -import forge.gui.match.views.VDev; -import forge.gui.match.views.VField; -import forge.gui.match.views.VHand; -import forge.gui.match.views.VPrompt; +import forge.gui.framework.*; +import forge.gui.match.views.*; import forge.properties.ForgePreferences.FPref; import forge.view.FView; +import javax.swing.*; +import java.util.ArrayList; +import java.util.List; + /** * Top level view class for match UI drag layout.
* Has access methods for all draggable documents.
diff --git a/forge-gui/src/main/java/forge/gui/match/ViewWinLose.java b/forge-gui/src/main/java/forge/gui/match/ViewWinLose.java index be45c9bfc21..5ebdb879cc0 100644 --- a/forge-gui/src/main/java/forge/gui/match/ViewWinLose.java +++ b/forge-gui/src/main/java/forge/gui/match/ViewWinLose.java @@ -1,31 +1,17 @@ package forge.gui.match; -import java.awt.Color; -import java.awt.Font; -import java.awt.Point; -import java.awt.Toolkit; -import java.awt.datatransfer.StringSelection; - -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import net.miginfocom.swing.MigLayout; import forge.Command; import forge.Singletons; -import forge.game.Game; -import forge.game.GameLog; -import forge.game.GameLogEntry; -import forge.game.GameLogEntryType; -import forge.game.GameOutcome; +import forge.game.*; import forge.game.player.Player; -import forge.gui.toolbox.FButton; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FOverlay; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; +import forge.gui.toolbox.*; import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.gui.toolbox.FSkin.SkinnedPanel; -import forge.gui.toolbox.FTextArea; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.awt.datatransfer.StringSelection; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/gui/match/ZoneAction.java b/forge-gui/src/main/java/forge/gui/match/ZoneAction.java index 78b1885c391..cf505484d73 100644 --- a/forge-gui/src/main/java/forge/gui/match/ZoneAction.java +++ b/forge-gui/src/main/java/forge/gui/match/ZoneAction.java @@ -1,9 +1,5 @@ package forge.gui.match; -import java.awt.event.ActionEvent; -import java.util.ArrayList; -import java.util.List; - import forge.Singletons; import forge.card.CardCharacteristicName; import forge.game.card.Card; @@ -12,6 +8,10 @@ import forge.game.zone.PlayerZone; import forge.gui.ForgeAction; import forge.gui.GuiChoose; +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.List; + /** * Receives click and programmatic requests for viewing data stacks in the * "zones" of a player field: hand, library, etc. diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CCombat.java b/forge-gui/src/main/java/forge/gui/match/controllers/CCombat.java index db99d15f801..9050cac0138 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CCombat.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CCombat.java @@ -1,7 +1,5 @@ package forge.gui.match.controllers; -import java.util.List; - import forge.Command; import forge.game.GameEntity; import forge.game.card.Card; @@ -12,6 +10,8 @@ import forge.gui.framework.ICDoc; import forge.gui.match.views.VCombat; import forge.util.Lang; +import java.util.List; + /** * Controls the combat panel in the match UI. * diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java b/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java index daafef91397..408b8297f7c 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java @@ -17,8 +17,6 @@ */ package forge.gui.match.controllers; -import java.awt.event.MouseEvent; - import forge.Command; import forge.Singletons; import forge.game.card.Card; @@ -29,6 +27,8 @@ import forge.item.IPaperCard; import forge.item.InventoryItem; import forge.item.InventoryItemFromSet; +import java.awt.event.MouseEvent; + /** * Controls the card detail area in the match UI. * diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CDev.java b/forge-gui/src/main/java/forge/gui/match/controllers/CDev.java index 887f9c25974..a704f37b080 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CDev.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CDev.java @@ -1,9 +1,5 @@ package forge.gui.match.controllers; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; - import forge.Command; import forge.Singletons; import forge.game.player.Player; @@ -14,6 +10,10 @@ import forge.net.FServer; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + /** * Controls the combat panel in the match UI. * diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CDock.java b/forge-gui/src/main/java/forge/gui/match/controllers/CDock.java index ea50180e125..dd0ef4df68d 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CDock.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CDock.java @@ -17,13 +17,6 @@ */ package forge.gui.match.controllers; -import java.awt.Toolkit; -import java.awt.datatransfer.StringSelection; -import java.io.File; -import java.util.List; -import java.util.Map.Entry; -import java.util.TreeMap; - import forge.Command; import forge.FThreads; import forge.Singletons; @@ -53,6 +46,13 @@ import forge.properties.FileLocation; import forge.properties.ForgePreferences.FPref; import forge.view.FView; +import java.awt.*; +import java.awt.datatransfer.StringSelection; +import java.io.File; +import java.util.List; +import java.util.Map.Entry; +import java.util.TreeMap; + /** * Controls the dock panel in the match UI. * diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CField.java b/forge-gui/src/main/java/forge/gui/match/controllers/CField.java index 7a76f883b66..0524b7dca6f 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CField.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CField.java @@ -17,20 +17,12 @@ */ package forge.gui.match.controllers; -import java.awt.event.ActionEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.util.List; - import com.google.common.base.Function; - import forge.Command; -import forge.Singletons; import forge.Constant.Preferences; +import forge.Singletons; import forge.game.Game; import forge.game.card.Card; -import forge.gui.player.HumanPlay; import forge.game.player.LobbyPlayer; import forge.game.player.Player; import forge.game.spellability.SpellAbility; @@ -41,6 +33,13 @@ import forge.gui.input.Input; import forge.gui.input.InputPayMana; import forge.gui.match.ZoneAction; import forge.gui.match.views.VField; +import forge.gui.player.HumanPlay; + +import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.util.List; /** * Controls Swing components of a player's field instance. diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CHand.java b/forge-gui/src/main/java/forge/gui/match/controllers/CHand.java index 22693f8e076..f7c11e75e15 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CHand.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CHand.java @@ -17,16 +17,6 @@ */ package forge.gui.match.controllers; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; -import java.util.Observable; - -import javax.swing.JLayeredPane; -import javax.swing.SwingUtilities; - import forge.Command; import forge.FThreads; import forge.Singletons; @@ -42,6 +32,13 @@ import forge.view.arcane.HandArea; import forge.view.arcane.util.Animation; import forge.view.arcane.util.CardPanelMouseAdapter; +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; +import java.util.Observable; + /** * Controls Swing components of a player's hand instance. * diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CLog.java b/forge-gui/src/main/java/forge/gui/match/controllers/CLog.java index 08d43befd1a..892c08947c3 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CLog.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CLog.java @@ -1,14 +1,14 @@ package forge.gui.match.controllers; -import java.util.Observable; -import java.util.Observer; - import forge.Command; import forge.FThreads; import forge.game.GameLog; import forge.gui.framework.ICDoc; import forge.gui.match.views.VLog; +import java.util.Observable; +import java.util.Observer; + /** * Controls the combat panel in the match UI. * diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CPicture.java b/forge-gui/src/main/java/forge/gui/match/controllers/CPicture.java index 382acc8891e..cb1c78da3d1 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CPicture.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CPicture.java @@ -17,12 +17,6 @@ */ package forge.gui.match.controllers; -import java.awt.event.MouseEvent; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; - -import javax.swing.JLabel; - import forge.Command; import forge.Singletons; import forge.card.CardCharacteristicName; @@ -35,6 +29,11 @@ import forge.gui.toolbox.special.CardZoomer; import forge.item.IPaperCard; import forge.item.InventoryItem; +import javax.swing.*; +import java.awt.event.MouseEvent; +import java.awt.event.MouseWheelEvent; +import java.awt.event.MouseWheelListener; + /** * Singleton controller for VPicture. *

diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CPrompt.java b/forge-gui/src/main/java/forge/gui/match/controllers/CPrompt.java index 3c891fb937b..0cde168da66 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CPrompt.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CPrompt.java @@ -17,15 +17,6 @@ */ package forge.gui.match.controllers; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; - -import javax.swing.JButton; - import forge.Command; import forge.FThreads; import forge.game.Game; @@ -37,6 +28,10 @@ import forge.gui.framework.SDisplayUtil; import forge.gui.match.views.VPrompt; import forge.gui.toolbox.FSkin; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; + /** * Controls the prompt panel in the match UI. * diff --git a/forge-gui/src/main/java/forge/gui/match/menus/CMatchUIMenus.java b/forge-gui/src/main/java/forge/gui/match/menus/CMatchUIMenus.java index 0d5142b1c88..37b44012e9e 100644 --- a/forge-gui/src/main/java/forge/gui/match/menus/CMatchUIMenus.java +++ b/forge-gui/src/main/java/forge/gui/match/menus/CMatchUIMenus.java @@ -1,14 +1,13 @@ package forge.gui.match.menus; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JMenu; - import forge.Singletons; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import java.util.ArrayList; +import java.util.List; + /** * Gets the menus associated with the Game screen. * diff --git a/forge-gui/src/main/java/forge/gui/match/menus/CardOverlaysMenu.java b/forge-gui/src/main/java/forge/gui/match/menus/CardOverlaysMenu.java index caa4989a4ad..8f13453625a 100644 --- a/forge-gui/src/main/java/forge/gui/match/menus/CardOverlaysMenu.java +++ b/forge-gui/src/main/java/forge/gui/match/menus/CardOverlaysMenu.java @@ -1,22 +1,17 @@ package forge.gui.match.menus; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; - -import javax.swing.JCheckBoxMenuItem; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.JPopupMenu; -import javax.swing.SwingUtilities; - import forge.Singletons; import forge.gui.match.CMatchUI; import forge.gui.menus.MenuUtil; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; + public final class CardOverlaysMenu { private CardOverlaysMenu() { } diff --git a/forge-gui/src/main/java/forge/gui/match/menus/DevModeMenu.java b/forge-gui/src/main/java/forge/gui/match/menus/DevModeMenu.java index 10755577a6d..5845f12dc54 100644 --- a/forge-gui/src/main/java/forge/gui/match/menus/DevModeMenu.java +++ b/forge-gui/src/main/java/forge/gui/match/menus/DevModeMenu.java @@ -1,18 +1,16 @@ package forge.gui.match.menus; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; - -import javax.swing.JCheckBoxMenuItem; -import javax.swing.JMenu; -import javax.swing.JMenuItem; import forge.Singletons; import forge.gui.match.controllers.CDev; import forge.gui.menus.MenuUtil; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; + /** * Gets a menu that replicates all the DevMode options. *

diff --git a/forge-gui/src/main/java/forge/gui/match/menus/GameMenu.java b/forge-gui/src/main/java/forge/gui/match/menus/GameMenu.java index ecd197017d9..b661b59dea0 100644 --- a/forge-gui/src/main/java/forge/gui/match/menus/GameMenu.java +++ b/forge-gui/src/main/java/forge/gui/match/menus/GameMenu.java @@ -1,27 +1,19 @@ package forge.gui.match.menus; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; - -import javax.swing.ButtonGroup; -import javax.swing.JMenu; -import javax.swing.JPopupMenu; - import forge.Singletons; import forge.gui.match.CMatchUI; import forge.gui.match.controllers.CDock; import forge.gui.menus.MenuUtil; import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FSkin.SkinIcon; -import forge.gui.toolbox.FSkin.SkinProp; -import forge.gui.toolbox.FSkin.SkinnedCheckBoxMenuItem; -import forge.gui.toolbox.FSkin.SkinnedMenu; -import forge.gui.toolbox.FSkin.SkinnedMenuItem; -import forge.gui.toolbox.FSkin.SkinnedRadioButtonMenuItem; +import forge.gui.toolbox.FSkin.*; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; + /** * Returns a JMenu containing options associated with current game. *

diff --git a/forge-gui/src/main/java/forge/gui/match/views/VAntes.java b/forge-gui/src/main/java/forge/gui/match/views/VAntes.java index 30d6c690229..68a304711db 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VAntes.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VAntes.java @@ -17,13 +17,6 @@ */ package forge.gui.match.views; -import java.awt.Dimension; -import java.util.SortedSet; -import java.util.TreeSet; - -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import net.miginfocom.swing.MigLayout; import forge.game.card.Card; import forge.game.player.Player; import forge.game.zone.ZoneType; @@ -36,6 +29,12 @@ import forge.gui.framework.IVDoc; import forge.gui.match.controllers.CAntes; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FScrollPane; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.util.SortedSet; +import java.util.TreeSet; /** * Assembles Swing components of card ante area. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VCombat.java b/forge-gui/src/main/java/forge/gui/match/views/VCombat.java index 9a1251df3c7..4751dbb3338 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VCombat.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VCombat.java @@ -17,7 +17,6 @@ */ package forge.gui.match.views; -import net.miginfocom.swing.MigLayout; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; @@ -25,6 +24,7 @@ import forge.gui.framework.IVDoc; import forge.gui.match.controllers.CCombat; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedTextArea; +import net.miginfocom.swing.MigLayout; /** * Assembles Swing components of combat report. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VCommand.java b/forge-gui/src/main/java/forge/gui/match/views/VCommand.java index bbb44a5d75f..c7e0d50b34c 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VCommand.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VCommand.java @@ -17,8 +17,6 @@ */ package forge.gui.match.views; -import javax.swing.JPanel; -import net.miginfocom.swing.MigLayout; import forge.game.player.Player; import forge.game.zone.ZoneType; import forge.gui.framework.DragCell; @@ -29,6 +27,9 @@ import forge.gui.match.controllers.CCommand; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; import forge.view.arcane.PlayArea; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** * Assembles Swing components of a player command instance. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VDetail.java b/forge-gui/src/main/java/forge/gui/match/views/VDetail.java index 19497d8ad1d..42f63b42ef7 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VDetail.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VDetail.java @@ -17,9 +17,6 @@ */ package forge.gui.match.views; -import javax.swing.JLabel; - -import net.miginfocom.swing.MigLayout; import forge.gui.CardDetailPanel; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -28,6 +25,9 @@ import forge.gui.framework.IVDoc; import forge.gui.match.controllers.CDetail; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedLabel; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** * Assembles Swing components of card detail area. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VDev.java b/forge-gui/src/main/java/forge/gui/match/views/VDev.java index 0776188e994..c520b48e576 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VDev.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VDev.java @@ -17,18 +17,6 @@ */ package forge.gui.match.views; -import java.awt.Graphics; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; -import javax.swing.border.EmptyBorder; - -import net.miginfocom.swing.MigLayout; import forge.gui.MultiLineLabelUI; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -38,6 +26,15 @@ import forge.gui.match.controllers.CDev; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedLabel; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; /** * Assembles Swing components of players report. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VDock.java b/forge-gui/src/main/java/forge/gui/match/views/VDock.java index 8b7ed6ee631..4aea7fddc6d 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VDock.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VDock.java @@ -17,20 +17,8 @@ */ package forge.gui.match.views; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Graphics; -import java.awt.event.MouseEvent; - -import javax.swing.JPanel; - import forge.Command; -import forge.gui.framework.DragCell; -import forge.gui.framework.DragTab; -import forge.gui.framework.EDocID; -import forge.gui.framework.ILocalRepaint; -import forge.gui.framework.IVDoc; +import forge.gui.framework.*; import forge.gui.match.controllers.CDock; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FMouseAdapter; @@ -39,6 +27,10 @@ import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinImage; import forge.gui.toolbox.FSkin.SkinnedLabel; +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseEvent; + /** * Assembles Swing components of button dock area. * diff --git a/forge-gui/src/main/java/forge/gui/match/views/VField.java b/forge-gui/src/main/java/forge/gui/match/views/VField.java index ae18d404c6c..b13cfe08ea1 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VField.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VField.java @@ -17,17 +17,6 @@ */ package forge.gui.match.views; -import java.awt.Color; -import java.awt.Font; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -import javax.swing.JPanel; -import javax.swing.SwingConstants; -import javax.swing.border.Border; -import javax.swing.border.LineBorder; - -import net.miginfocom.swing.MigLayout; import forge.game.player.LobbyPlayer; import forge.game.player.Player; import forge.game.zone.ZoneType; @@ -44,6 +33,14 @@ import forge.gui.toolbox.FSkin.SkinnedPanel; import forge.gui.toolbox.special.PhaseIndicator; import forge.gui.toolbox.special.PlayerDetailsPanel; import forge.view.arcane.PlayArea; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.Border; +import javax.swing.border.LineBorder; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; /** * Assembles Swing components of a player field instance. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VHand.java b/forge-gui/src/main/java/forge/gui/match/views/VHand.java index 5ff1df8d39a..f9fb11fdd35 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VHand.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VHand.java @@ -17,8 +17,6 @@ */ package forge.gui.match.views; -import javax.swing.JPanel; -import net.miginfocom.swing.MigLayout; import forge.game.player.Player; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -27,6 +25,9 @@ import forge.gui.framework.IVDoc; import forge.gui.match.controllers.CHand; import forge.gui.toolbox.FScrollPane; import forge.view.arcane.HandArea; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** * Assembles Swing components of hand area. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VLog.java b/forge-gui/src/main/java/forge/gui/match/views/VLog.java index 310ebe52b9b..31ecfb84ed2 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VLog.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VLog.java @@ -17,15 +17,7 @@ */ package forge.gui.match.views; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JPanel; - -import net.miginfocom.swing.MigLayout; - import com.google.common.collect.Lists; - import forge.Singletons; import forge.game.GameLog; import forge.game.GameLogEntry; @@ -39,6 +31,11 @@ import forge.gui.match.controllers.CLog; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinFont; import forge.properties.ForgePreferences.FPref; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.util.ArrayList; +import java.util.List; /** * Assembles Swing components of game log report. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VPicture.java b/forge-gui/src/main/java/forge/gui/match/views/VPicture.java index 2eb55d33190..22901a15991 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VPicture.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VPicture.java @@ -17,9 +17,6 @@ */ package forge.gui.match.views; -import javax.swing.JLabel; - -import net.miginfocom.swing.MigLayout; import forge.gui.CardPicturePanel; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -28,6 +25,9 @@ import forge.gui.framework.IVDoc; import forge.gui.match.controllers.CPicture; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedLabel; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** * Assembles Swing components of card picture area. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VPlayers.java b/forge-gui/src/main/java/forge/gui/match/views/VPlayers.java index 41428eb3c1f..e9dbaa32abd 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VPlayers.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VPlayers.java @@ -17,15 +17,6 @@ */ package forge.gui.match.views; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.swing.JLabel; -import javax.swing.JPanel; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.game.Game; import forge.game.GameType; @@ -41,6 +32,13 @@ import forge.gui.match.controllers.CPlayers; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.properties.ForgePreferences.FPref; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; /** * Assembles Swing components of players report. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VPrompt.java b/forge-gui/src/main/java/forge/gui/match/views/VPrompt.java index 3f31f89cfe4..7d29faa56bb 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VPrompt.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VPrompt.java @@ -17,31 +17,21 @@ */ package forge.gui.match.views; -import java.awt.Font; -import java.awt.Insets; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; - -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; import forge.gui.match.controllers.CPrompt; -import forge.gui.toolbox.FButton; -import forge.gui.toolbox.FHtmlViewer; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; +import forge.gui.toolbox.*; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; /** * Assembles Swing components of message report. diff --git a/forge-gui/src/main/java/forge/gui/match/views/VStack.java b/forge-gui/src/main/java/forge/gui/match/views/VStack.java index cb4d12de8ec..da5d4bbaf81 100644 --- a/forge-gui/src/main/java/forge/gui/match/views/VStack.java +++ b/forge-gui/src/main/java/forge/gui/match/views/VStack.java @@ -17,27 +17,6 @@ */ package forge.gui.match.views; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Insets; -import java.awt.Rectangle; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JCheckBoxMenuItem; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.JTextArea; -import javax.swing.ScrollPaneConstants; -import javax.swing.border.Border; -import javax.swing.border.EmptyBorder; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.game.card.CardUtil; import forge.game.player.LobbyPlayer; @@ -59,6 +38,18 @@ import forge.view.arcane.CardArea; import forge.view.arcane.CardPanel; import forge.view.arcane.CardPanelContainer; import forge.view.arcane.util.Animation; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; /** * Assembles Swing components of stack report. diff --git a/forge-gui/src/main/java/forge/gui/menus/ForgeMenu.java b/forge-gui/src/main/java/forge/gui/menus/ForgeMenu.java index ff414961e64..b5c5635dc4f 100644 --- a/forge-gui/src/main/java/forge/gui/menus/ForgeMenu.java +++ b/forge-gui/src/main/java/forge/gui/menus/ForgeMenu.java @@ -1,23 +1,19 @@ package forge.gui.menus; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; -import java.util.HashMap; -import java.util.List; - -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.JPopupMenu; -import javax.swing.KeyStroke; -import javax.swing.event.PopupMenuEvent; -import javax.swing.event.PopupMenuListener; - import forge.Singletons; import forge.control.RestartUtil; import forge.gui.GuiUtils; import forge.util.ReflectionUtil; +import javax.swing.*; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; +import java.util.HashMap; +import java.util.List; + public final class ForgeMenu { private JPopupMenu popupMenu; private IMenuProvider provider; diff --git a/forge-gui/src/main/java/forge/gui/menus/HelpMenu.java b/forge-gui/src/main/java/forge/gui/menus/HelpMenu.java index cd3443c6cb8..51a5e860f2c 100644 --- a/forge-gui/src/main/java/forge/gui/menus/HelpMenu.java +++ b/forge-gui/src/main/java/forge/gui/menus/HelpMenu.java @@ -1,20 +1,17 @@ package forge.gui.menus; -import java.awt.Desktop; +import forge.gui.toolbox.FOptionPane; +import forge.util.BuildInfo; +import forge.util.FileUtil; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.io.File; import java.io.IOException; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.KeyStroke; - -import forge.gui.toolbox.FOptionPane; -import forge.util.BuildInfo; -import forge.util.FileUtil; - public final class HelpMenu { private HelpMenu() { } diff --git a/forge-gui/src/main/java/forge/gui/menus/IMenuProvider.java b/forge-gui/src/main/java/forge/gui/menus/IMenuProvider.java index b43e575c558..d1338998b70 100644 --- a/forge-gui/src/main/java/forge/gui/menus/IMenuProvider.java +++ b/forge-gui/src/main/java/forge/gui/menus/IMenuProvider.java @@ -1,9 +1,8 @@ package forge.gui.menus; +import javax.swing.*; import java.util.List; -import javax.swing.JMenu; - /** * By implementing this interface a class can add menus to the menu bar * by calling the {@code MenuBarManager.SetupMenuBar()} method. diff --git a/forge-gui/src/main/java/forge/gui/menus/LayoutMenu.java b/forge-gui/src/main/java/forge/gui/menus/LayoutMenu.java index 858f7b916e0..b8ce63c8b29 100644 --- a/forge-gui/src/main/java/forge/gui/menus/LayoutMenu.java +++ b/forge-gui/src/main/java/forge/gui/menus/LayoutMenu.java @@ -1,17 +1,5 @@ package forge.gui.menus; -import java.awt.Image; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; - -import javax.swing.ButtonGroup; -import javax.swing.JCheckBoxMenuItem; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.JRadioButtonMenuItem; -import javax.swing.KeyStroke; - import forge.Singletons; import forge.gui.GuiChoose; import forge.gui.MouseUtil; @@ -25,6 +13,12 @@ import forge.properties.ForgePreferences.FPref; import forge.view.FFrame; import forge.view.FView; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; + /** * Returns a JMenu containing options associated with game screen layout. *

diff --git a/forge-gui/src/main/java/forge/gui/menus/MenuUtil.java b/forge-gui/src/main/java/forge/gui/menus/MenuUtil.java index a8ab5770e94..01ae8c590e5 100644 --- a/forge-gui/src/main/java/forge/gui/menus/MenuUtil.java +++ b/forge-gui/src/main/java/forge/gui/menus/MenuUtil.java @@ -1,16 +1,14 @@ package forge.gui.menus; -import java.awt.Toolkit; -import java.io.IOException; - -import javax.swing.JMenuItem; -import javax.swing.KeyStroke; - import forge.Singletons; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinProp; import forge.gui.toolbox.imaging.ImageUtil; +import javax.swing.*; +import java.awt.*; +import java.io.IOException; + public final class MenuUtil { private MenuUtil() { } diff --git a/forge-gui/src/main/java/forge/gui/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/gui/player/HumanCostDecision.java index b1c0e3855cd..ef68137fd5d 100644 --- a/forge-gui/src/main/java/forge/gui/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/gui/player/HumanCostDecision.java @@ -1,18 +1,8 @@ package forge.gui.player; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.card.CardType; import forge.game.Game; import forge.game.GameEntity; @@ -20,35 +10,9 @@ import forge.game.ability.AbilityUtils; import forge.game.card.Card; import forge.game.card.CardLists; import forge.game.card.CardPredicates; -import forge.game.card.CounterType; import forge.game.card.CardPredicates.Presets; -import forge.game.cost.CostAddMana; -import forge.game.cost.CostChooseCreatureType; -import forge.game.cost.CostDamage; -import forge.game.cost.CostDecisionMakerBase; -import forge.game.cost.CostDiscard; -import forge.game.cost.CostDraw; -import forge.game.cost.CostExile; -import forge.game.cost.CostExiledMoveToGrave; -import forge.game.cost.CostFlipCoin; -import forge.game.cost.CostGainControl; -import forge.game.cost.CostGainLife; -import forge.game.cost.CostMill; -import forge.game.cost.CostPartMana; -import forge.game.cost.CostPayLife; -import forge.game.cost.CostPutCardToLib; -import forge.game.cost.CostPutCounter; -import forge.game.cost.CostRemoveAnyCounter; -import forge.game.cost.CostRemoveCounter; -import forge.game.cost.CostReturn; -import forge.game.cost.CostReveal; -import forge.game.cost.CostSacrifice; -import forge.game.cost.CostTap; -import forge.game.cost.CostTapType; -import forge.game.cost.CostUnattach; -import forge.game.cost.CostUntap; -import forge.game.cost.CostUntapType; -import forge.game.cost.PaymentDecision; +import forge.game.card.CounterType; +import forge.game.cost.*; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbilityStackInstance; @@ -59,6 +23,10 @@ import forge.gui.input.InputSelectManyBase; import forge.util.Aggregates; import forge.util.Lang; +import java.awt.event.MouseEvent; +import java.util.*; +import java.util.Map.Entry; + public class HumanCostDecision extends CostDecisionMakerBase { private final SpellAbility ability; diff --git a/forge-gui/src/main/java/forge/gui/player/HumanPlay.java b/forge-gui/src/main/java/forge/gui/player/HumanPlay.java index d6e3d2bc4ec..aca2d4da56e 100644 --- a/forge-gui/src/main/java/forge/gui/player/HumanPlay.java +++ b/forge-gui/src/main/java/forge/gui/player/HumanPlay.java @@ -1,54 +1,20 @@ package forge.gui.player; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; - import forge.FThreads; import forge.card.MagicColor; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; -import forge.game.GameActionUtil; import forge.game.Game; +import forge.game.GameActionUtil; import forge.game.GameLogEntryType; import forge.game.ability.AbilityUtils; import forge.game.ability.ApiType; import forge.game.ability.effects.CharmEffect; import forge.game.ability.effects.FlipCoinEffect; -import forge.game.card.Card; -import forge.game.card.CardFactoryUtil; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; -import forge.game.card.CounterType; +import forge.game.card.*; import forge.game.card.CardPredicates.Presets; -import forge.game.cost.Cost; -import forge.game.cost.CostAddMana; -import forge.game.cost.CostDamage; -import forge.game.cost.CostDiscard; -import forge.game.cost.CostDraw; -import forge.game.cost.CostExile; -import forge.game.cost.CostFlipCoin; -import forge.game.cost.CostGainControl; -import forge.game.cost.CostGainLife; -import forge.game.cost.CostMill; -import forge.game.cost.CostPart; -import forge.game.cost.CostPartMana; -import forge.game.cost.CostPartWithList; -import forge.game.cost.CostPayLife; -import forge.game.cost.CostPayment; -import forge.game.cost.CostPutCardToLib; -import forge.game.cost.CostPutCounter; -import forge.game.cost.CostRemoveAnyCounter; -import forge.game.cost.CostRemoveCounter; -import forge.game.cost.CostReturn; -import forge.game.cost.CostReveal; -import forge.game.cost.CostSacrifice; -import forge.game.cost.CostTapType; -import forge.game.cost.PaymentDecision; +import forge.game.cost.*; import forge.game.mana.ManaCostBeingPaid; import forge.game.player.Player; import forge.game.spellability.Ability; @@ -56,13 +22,13 @@ import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; -import forge.gui.input.InputPayMana; -import forge.gui.input.InputPayManaExecuteCommands; -import forge.gui.input.InputPayManaOfCostPayment; -import forge.gui.input.InputPayManaSimple; -import forge.gui.input.InputPayManaX; -import forge.gui.input.InputSelectCardsFromList; +import forge.gui.input.*; import forge.util.Lang; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/gui/player/HumanPlaySpellAbility.java b/forge-gui/src/main/java/forge/gui/player/HumanPlaySpellAbility.java index 03b98411590..48cf25f2555 100644 --- a/forge-gui/src/main/java/forge/gui/player/HumanPlaySpellAbility.java +++ b/forge-gui/src/main/java/forge/gui/player/HumanPlaySpellAbility.java @@ -17,12 +17,7 @@ */ package forge.gui.player; -import java.util.ArrayList; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.Iterables; - import forge.card.CardType; import forge.game.Game; import forge.game.GameObject; @@ -37,6 +32,9 @@ import forge.game.spellability.Spell; import forge.game.spellability.SpellAbility; import forge.game.spellability.TargetRestrictions; import forge.game.zone.Zone; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; /** *

diff --git a/forge-gui/src/main/java/forge/gui/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/gui/player/PlayerControllerHuman.java index 6e8b15453ca..7148d2d3bde 100644 --- a/forge-gui/src/main/java/forge/gui/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/gui/player/PlayerControllerHuman.java @@ -1,31 +1,10 @@ package forge.gui.player; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.swing.JPopupMenu; -import javax.swing.KeyStroke; -import javax.swing.MenuElement; -import javax.swing.MenuSelectionManager; -import javax.swing.SwingUtilities; - -import org.apache.commons.lang3.Range; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; - import forge.Singletons; import forge.card.ColorSet; import forge.card.MagicColor; @@ -65,15 +44,7 @@ import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.gui.GuiDialog; import forge.gui.GuiUtils; -import forge.gui.input.InputAttack; -import forge.gui.input.InputBlock; -import forge.gui.input.InputConfirmMulligan; -import forge.gui.input.InputPassPriority; -import forge.gui.input.InputProliferate; -import forge.gui.input.InputSelectCardsForConvoke; -import forge.gui.input.InputSelectCardsFromList; -import forge.gui.input.InputConfirm; -import forge.gui.input.InputSelectEntitiesFromList; +import forge.gui.input.*; import forge.gui.match.CMatchUI; import forge.gui.match.controllers.CPrompt; import forge.gui.toolbox.FOptionPane; @@ -82,6 +53,15 @@ import forge.item.PaperCard; import forge.properties.ForgePreferences.FPref; import forge.util.Lang; import forge.util.TextUtil; +import org.apache.commons.lang3.Range; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import javax.swing.*; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.util.*; /** diff --git a/forge-gui/src/main/java/forge/gui/player/TargetSelection.java b/forge-gui/src/main/java/forge/gui/player/TargetSelection.java index af3f026d410..304017350c8 100644 --- a/forge-gui/src/main/java/forge/gui/player/TargetSelection.java +++ b/forge-gui/src/main/java/forge/gui/player/TargetSelection.java @@ -17,12 +17,8 @@ */ package forge.gui.player; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.collect.Lists; - import forge.game.Game; import forge.game.GameObject; import forge.game.card.Card; @@ -37,6 +33,9 @@ import forge.gui.GuiChoose; import forge.gui.input.InputSelectTargets; import forge.util.Aggregates; +import java.util.ArrayList; +import java.util.List; + /** *

* Target_Selection class. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/CardFaceSymbols.java b/forge-gui/src/main/java/forge/gui/toolbox/CardFaceSymbols.java index 8b1fbc760a0..b068afeea43 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/CardFaceSymbols.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/CardFaceSymbols.java @@ -17,17 +17,16 @@ */ package forge.gui.toolbox; -import java.awt.Graphics; -import java.util.HashMap; -import java.util.Map; -import java.util.StringTokenizer; - import com.esotericsoftware.minlog.Log; - import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; import forge.gui.toolbox.FSkin.SkinImage; +import java.awt.*; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; + /** *

* CardFaceSymbols class. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/ContextMenuBuilder.java b/forge-gui/src/main/java/forge/gui/toolbox/ContextMenuBuilder.java index 63e57d0f3ee..5d8e1f99b90 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/ContextMenuBuilder.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/ContextMenuBuilder.java @@ -1,6 +1,6 @@ package forge.gui.toolbox; -import javax.swing.JPopupMenu; +import javax.swing.*; public interface ContextMenuBuilder { void buildContextMenu(JPopupMenu menu); diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FAbsolutePositioner.java b/forge-gui/src/main/java/forge/gui/toolbox/FAbsolutePositioner.java index 91ae0d5bd86..1f9a92664a4 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FAbsolutePositioner.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FAbsolutePositioner.java @@ -17,12 +17,8 @@ */ package forge.gui.toolbox; -import java.awt.Component; -import java.awt.Point; -import java.awt.Rectangle; - -import javax.swing.JLayeredPane; -import javax.swing.JPanel; +import javax.swing.*; +import java.awt.*; /** * Utility to manage absolutely positioned components diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FButton.java b/forge-gui/src/main/java/forge/gui/toolbox/FButton.java index cff95214ad2..e9ad80bcb67 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FButton.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FButton.java @@ -17,25 +17,14 @@ */ package forge.gui.toolbox; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Insets; -import java.awt.RenderingHints; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; - -import javax.swing.BorderFactory; import forge.gui.framework.ILocalRepaint; import forge.gui.toolbox.FSkin.SkinImage; import forge.gui.toolbox.FSkin.SkinnedButton; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; + /** * The core JButton used throughout the Forge project. Follows skin font and * theme button styling. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FCheckBoxList.java b/forge-gui/src/main/java/forge/gui/toolbox/FCheckBoxList.java index d770fa655c1..5299d11f0b7 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FCheckBoxList.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FCheckBoxList.java @@ -1,19 +1,10 @@ package forge.gui.toolbox; -import java.awt.Component; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -import javax.swing.JList; -import javax.swing.ListCellRenderer; -import javax.swing.ListSelectionModel; -import javax.swing.UIManager; +import javax.swing.*; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.awt.event.*; /** * A list of FCheckBox items using Forge skin properties. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FComboBox.java b/forge-gui/src/main/java/forge/gui/toolbox/FComboBox.java index f6bc8992d99..bf6ee053b13 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FComboBox.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FComboBox.java @@ -1,28 +1,15 @@ package forge.gui.toolbox; -import java.awt.Component; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.LayoutManager; -import java.util.Vector; +import forge.gui.toolbox.FSkin.SkinFont; +import forge.gui.toolbox.FSkin.SkinnedComboBox; -import javax.swing.ComboBoxModel; -import javax.swing.DefaultListCellRenderer; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.ListCellRenderer; -import javax.swing.SwingConstants; -import javax.swing.UIManager; +import javax.swing.*; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; import javax.swing.plaf.basic.BasicComboBoxUI; import javax.swing.plaf.basic.ComboPopup; - -import forge.gui.toolbox.FSkin.SkinFont; -import forge.gui.toolbox.FSkin.SkinnedComboBox; +import java.awt.*; +import java.util.Vector; @SuppressWarnings("serial") public class FComboBox extends SkinnedComboBox { diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FComboBoxPanel.java b/forge-gui/src/main/java/forge/gui/toolbox/FComboBoxPanel.java index 12f82e94de3..2ac6f48be38 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FComboBoxPanel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FComboBoxPanel.java @@ -1,13 +1,13 @@ package forge.gui.toolbox; -import java.awt.FlowLayout; -import java.util.ArrayList; - -import javax.swing.JPanel; import forge.Singletons; import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import java.awt.*; +import java.util.ArrayList; + /** * Panel with combo box and caption (either FComboBoxWrapper or FComboBoxPanel should be used instead of FComboBox so skinning works) * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FComboBoxWrapper.java b/forge-gui/src/main/java/forge/gui/toolbox/FComboBoxWrapper.java index 45493169d35..145042868e0 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FComboBoxWrapper.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FComboBoxWrapper.java @@ -1,19 +1,16 @@ package forge.gui.toolbox; -import java.awt.Container; +import forge.gui.toolbox.FComboBox.TextAlignment; +import forge.gui.toolbox.FSkin.SkinFont; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionListener; import java.awt.event.ItemListener; import java.awt.event.KeyListener; import java.util.ArrayList; import java.util.Vector; -import javax.swing.ComboBoxModel; -import javax.swing.JComponent; -import javax.swing.ListCellRenderer; - -import forge.gui.toolbox.FComboBox.TextAlignment; -import forge.gui.toolbox.FSkin.SkinFont; - /** * Wrapper for combo box with extra logic (either FComboBoxWrapper or FComboBoxPanel should be used instead of FComboBox so skinning works) * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FDigitalClock.java b/forge-gui/src/main/java/forge/gui/toolbox/FDigitalClock.java index 6c6f7cec09d..ac9bb2bedef 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FDigitalClock.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FDigitalClock.java @@ -1,15 +1,14 @@ package forge.gui.toolbox; +import forge.gui.toolbox.FSkin.SkinnedLabel; + +import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.text.DateFormat; import java.util.ArrayList; import java.util.Calendar; -import javax.swing.Timer; - -import forge.gui.toolbox.FSkin.SkinnedLabel; - /** * Digital clock label that displays current time * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FHtmlViewer.java b/forge-gui/src/main/java/forge/gui/toolbox/FHtmlViewer.java index 4d4b75fe171..c766c45d6fd 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FHtmlViewer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FHtmlViewer.java @@ -1,10 +1,9 @@ package forge.gui.toolbox; -import javax.swing.JEditorPane; -import javax.swing.SwingUtilities; - import forge.gui.toolbox.FSkin.SkinnedEditorPane; +import javax.swing.*; + /** * Viewer for HTML * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FHyperlink.java b/forge-gui/src/main/java/forge/gui/toolbox/FHyperlink.java index e94d9fd8a0a..cb93cf05e5f 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FHyperlink.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FHyperlink.java @@ -1,16 +1,13 @@ package forge.gui.toolbox; -import java.awt.Cursor; -import java.awt.Desktop; -import java.awt.Toolkit; +import forge.Command; + +import javax.swing.*; +import java.awt.*; import java.awt.datatransfer.StringSelection; import java.net.URI; import java.net.URISyntaxException; -import javax.swing.SwingWorker; - -import forge.Command; - @SuppressWarnings("serial") public class FHyperlink extends FLabel { diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FLabel.java b/forge-gui/src/main/java/forge/gui/toolbox/FLabel.java index 66a50e84388..3cbac67308f 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FLabel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FLabel.java @@ -1,37 +1,17 @@ package forge.gui.toolbox; -import java.awt.AlphaComposite; -import java.awt.Composite; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.Point; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; - -import javax.swing.Icon; -import javax.swing.ImageIcon; -import javax.swing.SwingConstants; -import javax.swing.Timer; -import javax.swing.event.AncestorEvent; -import javax.swing.event.AncestorListener; - import forge.Command; import forge.gui.framework.ILocalRepaint; import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinImage; import forge.gui.toolbox.FSkin.SkinnedLabel; +import javax.swing.*; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; +import java.awt.*; +import java.awt.event.*; + /** * Uses the Builder pattern to facilitate/encourage inline styling. * Credit to Effective Java 2 (Joshua Bloch). diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FList.java b/forge-gui/src/main/java/forge/gui/toolbox/FList.java index 7ee1abfccdd..994868ae885 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FList.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FList.java @@ -1,20 +1,14 @@ package forge.gui.toolbox; -import java.awt.Component; -import java.awt.FontMetrics; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; - -import javax.swing.DefaultListCellRenderer; -import javax.swing.JLabel; -import javax.swing.JList; -import javax.swing.ListCellRenderer; -import javax.swing.ListModel; -import javax.swing.border.EmptyBorder; - import forge.Singletons; import forge.gui.toolbox.FSkin.SkinnedList; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; + /** * A JList object using Forge skin properties. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FMouseAdapter.java b/forge-gui/src/main/java/forge/gui/toolbox/FMouseAdapter.java index 7c03c224403..248f77488da 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FMouseAdapter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FMouseAdapter.java @@ -1,7 +1,6 @@ package forge.gui.toolbox; -import java.awt.Component; -import java.awt.Point; +import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FOptionPane.java b/forge-gui/src/main/java/forge/gui/toolbox/FOptionPane.java index 4a3119a299b..10dcd7c3208 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FOptionPane.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FOptionPane.java @@ -1,20 +1,15 @@ package forge.gui.toolbox; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.FontMetrics; +import forge.gui.toolbox.FSkin.SkinImage; +import forge.view.FDialog; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.SwingUtilities; - -import forge.gui.toolbox.FSkin.SkinImage; -import forge.view.FDialog; - /** * Class to replace JOptionPane using skinned dialogs * @@ -72,7 +67,7 @@ public class FOptionPane extends FDialog { return showOptionDialog(message, title, icon, options, 0); } - public static int showOptionDialog(String message, String title, SkinImage icon, String[] options, int defaultOption) { + public static int showOptionDialog(String message, String title, SkinImage icon, String[] options, int defaultOption) { final FOptionPane optionPane = new FOptionPane(message, title, icon, null, options, defaultOption); optionPane.setVisible(true); int dialogResult = optionPane.result; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FOverlay.java b/forge-gui/src/main/java/forge/gui/toolbox/FOverlay.java index 4dd113253c5..52521a373cd 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FOverlay.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FOverlay.java @@ -17,18 +17,16 @@ */ package forge.gui.toolbox; -import java.awt.Color; -import java.awt.Graphics; +import forge.gui.SOverlayUtils; +import forge.gui.toolbox.FSkin.SkinnedPanel; + +import javax.swing.*; +import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import forge.gui.SOverlayUtils; -import forge.gui.toolbox.FSkin.SkinnedPanel; - /** * Semi-transparent overlay panel. Should be used with layered panes. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FPanel.java b/forge-gui/src/main/java/forge/gui/toolbox/FPanel.java index b4fd8cd5821..8f763349296 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FPanel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FPanel.java @@ -17,26 +17,18 @@ */ package forge.gui.toolbox; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.LayoutManager; -import java.awt.RenderingHints; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.SwingConstants; - import forge.Command; import forge.gui.framework.ILocalRepaint; import forge.gui.toolbox.FSkin.FPanelBase; import forge.gui.toolbox.FSkin.SkinColor; +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; + /** * Core panel used in UI. *

diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FProgressBar.java b/forge-gui/src/main/java/forge/gui/toolbox/FProgressBar.java index 4484c32ce1c..e3308f64ec9 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FProgressBar.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FProgressBar.java @@ -1,12 +1,10 @@ package forge.gui.toolbox; -import java.util.Date; - -import javax.swing.JProgressBar; -import javax.swing.SwingUtilities; - import forge.FThreads; +import javax.swing.*; +import java.util.Date; + /** * A simple progress bar component using the Forge skin. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FScrollPane.java b/forge-gui/src/main/java/forge/gui/toolbox/FScrollPane.java index 143e4ce1574..1d563d0bca1 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FScrollPane.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FScrollPane.java @@ -1,20 +1,14 @@ package forge.gui.toolbox; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.JScrollBar; -import javax.swing.ScrollPaneConstants; -import javax.swing.Timer; -import javax.swing.border.Border; - import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinnedScrollPane; +import javax.swing.*; +import javax.swing.border.Border; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + /** * An extension of JScrollPane to centralize common styling changes * and supports using arrow buttons to scroll instead of scrollbars diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FScrollPanel.java b/forge-gui/src/main/java/forge/gui/toolbox/FScrollPanel.java index 77e79464859..7ccd108fded 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FScrollPanel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FScrollPanel.java @@ -17,13 +17,8 @@ */ package forge.gui.toolbox; -import java.awt.Component; -import java.awt.LayoutManager; -import java.awt.MenuComponent; -import java.awt.PopupMenu; - -import javax.swing.JPanel; -import javax.swing.ScrollPaneConstants; +import javax.swing.*; +import java.awt.*; /** * An extension of FScrollPane that can be used as a panel diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java index edac80a5827..2090d3075db 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java @@ -17,75 +17,18 @@ */ package forge.gui.toolbox; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Component; -import java.awt.Cursor; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.FontMetrics; -import java.awt.Frame; -import java.awt.GradientPaint; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.LayoutManager; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.RenderingHints; -import java.awt.Toolkit; -import java.awt.Window; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Vector; +import forge.FThreads; +import forge.Singletons; +import forge.gui.GuiUtils; +import forge.gui.framework.ILocalRepaint; +import forge.properties.ForgePreferences; +import forge.properties.ForgePreferences.FPref; +import forge.properties.NewConstants; +import forge.view.FView; +import org.apache.commons.lang3.text.WordUtils; import javax.imageio.ImageIO; -import javax.swing.AbstractButton; -import javax.swing.Action; -import javax.swing.BorderFactory; -import javax.swing.ComboBoxModel; -import javax.swing.Icon; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JCheckBoxMenuItem; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JDialog; -import javax.swing.JEditorPane; -import javax.swing.JFormattedTextField; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JLayeredPane; -import javax.swing.JList; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.JRadioButtonMenuItem; -import javax.swing.JScrollBar; -import javax.swing.JScrollPane; -import javax.swing.JSlider; -import javax.swing.JSpinner; -import javax.swing.JTabbedPane; -import javax.swing.JTable; -import javax.swing.JTextArea; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.ListModel; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.*; import javax.swing.border.Border; import javax.swing.border.LineBorder; import javax.swing.border.TitledBorder; @@ -93,17 +36,15 @@ import javax.swing.plaf.basic.BasicScrollBarUI; import javax.swing.table.JTableHeader; import javax.swing.table.TableColumnModel; import javax.swing.text.JTextComponent; - -import org.apache.commons.lang3.text.WordUtils; - -import forge.FThreads; -import forge.Singletons; -import forge.gui.GuiUtils; -import forge.gui.framework.ILocalRepaint; -import forge.properties.ForgePreferences; -import forge.properties.NewConstants; -import forge.properties.ForgePreferences.FPref; -import forge.view.FView; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.*; +import java.util.Map.Entry; /** * Assembles settings from selected or default theme as appropriate. Saves in a diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FSpinner.java b/forge-gui/src/main/java/forge/gui/toolbox/FSpinner.java index e845107ebc9..347d8b4956b 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FSpinner.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FSpinner.java @@ -1,14 +1,11 @@ package forge.gui.toolbox; -import java.awt.Insets; - -import javax.swing.JFormattedTextField; -import javax.swing.JSpinner; -import javax.swing.SpinnerNumberModel; -import javax.swing.text.NumberFormatter; - import forge.gui.toolbox.FSkin.SkinnedSpinner; +import javax.swing.*; +import javax.swing.text.NumberFormatter; +import java.awt.*; + /** * A custom instance of JSpinner using Forge skin properties. Only numeric * integer spinners are implemented, since that's all we've needed so far. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FTextArea.java b/forge-gui/src/main/java/forge/gui/toolbox/FTextArea.java index 8576fb03fb4..9f51dbbb428 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FTextArea.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FTextArea.java @@ -1,9 +1,9 @@ package forge.gui.toolbox; -import java.awt.FontMetrics; - import forge.gui.toolbox.FSkin.SkinnedTextArea; +import java.awt.*; + /** * A custom instance of JTextArea using Forge skin properties. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FTextEditor.java b/forge-gui/src/main/java/forge/gui/toolbox/FTextEditor.java index 480c53e3fbe..dd919e96333 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FTextEditor.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FTextEditor.java @@ -1,15 +1,14 @@ package forge.gui.toolbox; -import java.awt.Insets; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; - -import javax.swing.border.Border; -import javax.swing.event.DocumentListener; - import forge.gui.toolbox.FSkin.SkinnedScrollPane; import forge.gui.toolbox.FSkin.SkinnedTextArea; +import javax.swing.border.Border; +import javax.swing.event.DocumentListener; +import java.awt.*; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; + @SuppressWarnings("serial") public class FTextEditor extends SkinnedScrollPane { private final SkinnedTextArea tarEditor; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FTextField.java b/forge-gui/src/main/java/forge/gui/toolbox/FTextField.java index c58493233d6..6418b9c2371 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FTextField.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FTextField.java @@ -1,21 +1,16 @@ package forge.gui.toolbox; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Insets; -import java.awt.RenderingHints; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; +import forge.gui.toolbox.FSkin.SkinnedTextField; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.text.AttributeSet; import javax.swing.text.BadLocationException; import javax.swing.text.PlainDocument; - -import forge.gui.toolbox.FSkin.SkinnedTextField; +import java.awt.*; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; /** * A custom instance of JTextArea using Forge skin properties. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FUndoManager.java b/forge-gui/src/main/java/forge/gui/toolbox/FUndoManager.java index e7a3f0d5764..624984e2569 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FUndoManager.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FUndoManager.java @@ -1,23 +1,16 @@ package forge.gui.toolbox; -import java.awt.event.ActionEvent; -import java.awt.event.InputEvent; -import java.awt.event.KeyEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.KeyStroke; +import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.UndoableEditEvent; import javax.swing.event.UndoableEditListener; import javax.swing.text.AbstractDocument; import javax.swing.text.JTextComponent; -import javax.swing.undo.CannotRedoException; -import javax.swing.undo.CannotUndoException; -import javax.swing.undo.CompoundEdit; -import javax.swing.undo.UndoManager; -import javax.swing.undo.UndoableEdit; +import javax.swing.undo.*; +import java.awt.event.ActionEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; /* ** This class will merge individual edits into a single larger edit. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/JXButtonPanel.java b/forge-gui/src/main/java/forge/gui/toolbox/JXButtonPanel.java index 25de373d0a7..612e5cfce2d 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/JXButtonPanel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/JXButtonPanel.java @@ -20,26 +20,14 @@ // move from original package (org.jdesktop.swinghelper.buttonpanel) to keep with other gui widgets package forge.gui.toolbox; -import java.awt.Component; -import java.awt.Container; -import java.awt.FocusTraversalPolicy; -import java.awt.KeyboardFocusManager; -import java.awt.LayoutManager; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; -import javax.swing.AbstractButton; -import javax.swing.ButtonGroup; -import javax.swing.ButtonModel; -import javax.swing.DefaultButtonModel; -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.KeyStroke; -import javax.swing.LayoutFocusTraversalPolicy; - -import net.miginfocom.swing.MigLayout; - /** * This is a JPanel subclass which provides a special functionality * for its children buttons components. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/LayoutHelper.java b/forge-gui/src/main/java/forge/gui/toolbox/LayoutHelper.java index e7ccf873430..4567dba4f05 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/LayoutHelper.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/LayoutHelper.java @@ -1,6 +1,6 @@ package forge.gui.toolbox; -import javax.swing.JComponent; +import javax.swing.*; /** * Helper class for doing custom layout diff --git a/forge-gui/src/main/java/forge/gui/toolbox/SaveOpenDialog.java b/forge-gui/src/main/java/forge/gui/toolbox/SaveOpenDialog.java index ddb5a7b8df7..c2e3eb2ffa4 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/SaveOpenDialog.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/SaveOpenDialog.java @@ -18,13 +18,10 @@ package forge.gui.toolbox; -import java.io.File; - -import javax.swing.JFileChooser; -import javax.swing.JOptionPane; -import javax.swing.JPanel; +import javax.swing.*; import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileNameExtensionFilter; +import java.io.File; /** * A class for showing open or save dialogs in Forge. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/SmartScroller.java b/forge-gui/src/main/java/forge/gui/toolbox/SmartScroller.java index bd254ba9a75..2f2d4871e08 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/SmartScroller.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/SmartScroller.java @@ -2,10 +2,12 @@ // based on code from http://tips4java.wordpress.com/2013/03/03/smart-scrolling/ package forge.gui.toolbox; -import java.awt.Component; -import java.awt.event.*; import javax.swing.*; -import javax.swing.text.*; +import javax.swing.text.DefaultCaret; +import javax.swing.text.JTextComponent; +import java.awt.*; +import java.awt.event.AdjustmentEvent; +import java.awt.event.AdjustmentListener; /** * The SmartScroller will attempt to keep the viewport positioned based on diff --git a/forge-gui/src/main/java/forge/gui/toolbox/ToolTipListener.java b/forge-gui/src/main/java/forge/gui/toolbox/ToolTipListener.java index 555cdcb8e9b..c68e90984d5 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/ToolTipListener.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/ToolTipListener.java @@ -17,19 +17,9 @@ */ package forge.gui.toolbox; -import java.awt.Component; -import java.awt.Point; -import java.awt.event.AdjustmentEvent; -import java.awt.event.AdjustmentListener; -import java.awt.event.ComponentEvent; -import java.awt.event.ComponentListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; - -import javax.swing.JScrollBar; -import javax.swing.JScrollPane; -import javax.swing.ToolTipManager; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; // based on code from http://tips4java.wordpress.com/2009/11/08/tooltips-and-scrollpanes/ diff --git a/forge-gui/src/main/java/forge/gui/toolbox/imaging/FImagePanel.java b/forge-gui/src/main/java/forge/gui/toolbox/imaging/FImagePanel.java index 313882e3edf..3eaef46f9e4 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/imaging/FImagePanel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/imaging/FImagePanel.java @@ -18,10 +18,11 @@ package forge.gui.toolbox.imaging; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.RenderingHints; +import com.mortennobel.imagescaling.DimensionConstrain; +import com.mortennobel.imagescaling.ResampleOp; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ComponentAdapter; @@ -29,13 +30,6 @@ import java.awt.event.ComponentEvent; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; -import javax.swing.BorderFactory; -import javax.swing.JPanel; -import javax.swing.Timer; - -import com.mortennobel.imagescaling.DimensionConstrain; -import com.mortennobel.imagescaling.ResampleOp; - /** * Displays a {@code BufferedImage} at its center. *

diff --git a/forge-gui/src/main/java/forge/gui/toolbox/imaging/FImageUtil.java b/forge-gui/src/main/java/forge/gui/toolbox/imaging/FImageUtil.java index 897033715e7..706274bda54 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/imaging/FImageUtil.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/imaging/FImageUtil.java @@ -18,9 +18,6 @@ package forge.gui.toolbox.imaging; -import java.awt.image.BufferedImage; -import java.awt.image.ColorModel; - import forge.ImageCache; import forge.Singletons; import forge.card.CardCharacteristicName; @@ -28,6 +25,9 @@ import forge.game.card.Card; import forge.gui.toolbox.CardFaceSymbols; import forge.properties.ForgePreferences; +import java.awt.image.BufferedImage; +import java.awt.image.ColorModel; + /** * Common image-related routines specific to Forge images. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/imaging/ImageUtil.java b/forge-gui/src/main/java/forge/gui/toolbox/imaging/ImageUtil.java index 3fda5b2a354..e480c9f92d8 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/imaging/ImageUtil.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/imaging/ImageUtil.java @@ -18,9 +18,10 @@ package forge.gui.toolbox.imaging; -import java.awt.Dimension; import forge.gui.toolbox.FSkin.SkinIcon; +import java.awt.*; + /** * Useful general imaging routines. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/CardManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/CardManager.java index c39b28e805e..d9280a31486 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/CardManager.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/CardManager.java @@ -1,27 +1,16 @@ package forge.gui.toolbox.itemmanager; -import java.util.List; - -import javax.swing.JMenu; - import forge.Singletons; import forge.game.GameFormat; import forge.gui.GuiUtils; import forge.gui.home.quest.DialogChooseSets; -import forge.gui.toolbox.itemmanager.filters.CardCMCFilter; -import forge.gui.toolbox.itemmanager.filters.CardCMCRangeFilter; -import forge.gui.toolbox.itemmanager.filters.CardColorFilter; -import forge.gui.toolbox.itemmanager.filters.CardFormatFilter; -import forge.gui.toolbox.itemmanager.filters.CardPowerFilter; -import forge.gui.toolbox.itemmanager.filters.CardQuestWorldFilter; -import forge.gui.toolbox.itemmanager.filters.CardSearchFilter; -import forge.gui.toolbox.itemmanager.filters.CardSetFilter; -import forge.gui.toolbox.itemmanager.filters.CardToughnessFilter; -import forge.gui.toolbox.itemmanager.filters.CardTypeFilter; -import forge.gui.toolbox.itemmanager.filters.ItemFilter; +import forge.gui.toolbox.itemmanager.filters.*; import forge.item.PaperCard; import forge.quest.QuestWorld; +import javax.swing.*; +import java.util.List; + /** * ItemManager for cards * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java index 1c026c3a936..2bb7aa6b783 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/DeckManager.java @@ -1,22 +1,5 @@ package forge.gui.toolbox.itemmanager; -import java.awt.Component; -import java.awt.Graphics; -import java.awt.Rectangle; -import java.awt.event.MouseEvent; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import javax.swing.JMenu; -import javax.swing.JTable; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - -import org.apache.commons.lang3.StringUtils; - import forge.Command; import forge.Singletons; import forge.deck.DeckBase; @@ -33,20 +16,22 @@ import forge.gui.framework.FScreen; import forge.gui.home.quest.DialogChooseSets; import forge.gui.toolbox.FOptionPane; import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.itemmanager.filters.DeckColorFilter; -import forge.gui.toolbox.itemmanager.filters.DeckFolderFilter; -import forge.gui.toolbox.itemmanager.filters.DeckFormatFilter; -import forge.gui.toolbox.itemmanager.filters.DeckQuestWorldFilter; -import forge.gui.toolbox.itemmanager.filters.DeckSearchFilter; -import forge.gui.toolbox.itemmanager.filters.DeckSetFilter; -import forge.gui.toolbox.itemmanager.filters.ItemFilter; -import forge.gui.toolbox.itemmanager.views.ColumnDef; -import forge.gui.toolbox.itemmanager.views.ItemCellRenderer; -import forge.gui.toolbox.itemmanager.views.ItemColumn; -import forge.gui.toolbox.itemmanager.views.ItemListView; -import forge.gui.toolbox.itemmanager.views.SColumnUtil; +import forge.gui.toolbox.itemmanager.filters.*; +import forge.gui.toolbox.itemmanager.views.*; import forge.item.InventoryItem; import forge.quest.QuestWorld; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.*; +import java.awt.event.MouseEvent; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; /** * ItemManager for cards diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java index 97dca0a4a89..285819ca547 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManager.java @@ -17,59 +17,33 @@ */ package forge.gui.toolbox.itemmanager; -import java.awt.Component; -import java.awt.Toolkit; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import javax.swing.JMenu; -import javax.swing.JPanel; -import javax.swing.JPopupMenu; -import javax.swing.KeyStroke; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import javax.swing.event.ListSelectionListener; -import javax.swing.event.PopupMenuEvent; -import javax.swing.event.PopupMenuListener; - -import net.miginfocom.swing.MigLayout; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; - import forge.Command; import forge.gui.GuiUtils; -import forge.gui.toolbox.ContextMenuBuilder; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FSkin; +import forge.gui.toolbox.*; +import forge.gui.toolbox.FSkin.Colors; import forge.gui.toolbox.FSkin.SkinIcon; import forge.gui.toolbox.FSkin.SkinnedCheckBox; import forge.gui.toolbox.FSkin.SkinnedPanel; -import forge.gui.toolbox.FTextField; -import forge.gui.toolbox.LayoutHelper; -import forge.gui.toolbox.FSkin.Colors; import forge.gui.toolbox.itemmanager.filters.ItemFilter; -import forge.gui.toolbox.itemmanager.views.ColumnDef; -import forge.gui.toolbox.itemmanager.views.GroupDef; -import forge.gui.toolbox.itemmanager.views.ImageView; -import forge.gui.toolbox.itemmanager.views.ItemColumn; -import forge.gui.toolbox.itemmanager.views.ItemListView; -import forge.gui.toolbox.itemmanager.views.ItemView; +import forge.gui.toolbox.itemmanager.views.*; import forge.item.InventoryItem; import forge.util.Aggregates; import forge.util.ItemPool; import forge.util.ReflectionUtil; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.event.ListSelectionListener; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; +import java.awt.*; +import java.awt.event.*; +import java.util.*; +import java.util.List; +import java.util.Map.Entry; /** diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerContainer.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerContainer.java index b2b950f0367..78cd4802657 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerContainer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerContainer.java @@ -17,11 +17,11 @@ */ package forge.gui.toolbox.itemmanager; -import javax.swing.ScrollPaneConstants; -import javax.swing.border.Border; - import forge.gui.toolbox.FSkin.SkinnedScrollPane; +import javax.swing.*; +import javax.swing.border.Border; + /** * Simple container pane meant to contain item managers. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerModel.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerModel.java index 881947cac6d..ad8c1f3cc8c 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerModel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/ItemManagerModel.java @@ -17,19 +17,15 @@ */ package forge.gui.toolbox.itemmanager; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - import forge.gui.toolbox.itemmanager.views.ItemColumn; import forge.gui.toolbox.itemmanager.views.ItemColumn.SortState; import forge.item.InventoryItem; import forge.util.ItemPool; import forge.util.ItemPoolSorter; +import java.util.*; +import java.util.Map.Entry; + /** *

* ItemManagerModel class. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SFilterUtil.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SFilterUtil.java index eb3010a0c62..46d9959e08e 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SFilterUtil.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SFilterUtil.java @@ -1,17 +1,11 @@ package forge.gui.toolbox.itemmanager; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; import forge.card.CardRulesPredicates; -import forge.card.MagicColor; import forge.card.CardRulesPredicates.Presets; +import forge.card.MagicColor; import forge.game.GameFormat; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.itemmanager.SItemManagerUtil.StatTypes; @@ -19,6 +13,11 @@ import forge.item.InventoryItem; import forge.item.PaperCard; import forge.util.PredicateString.StringOp; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; + /** * Static factory; holds blocks of form elements and predicates * which are used in various editing environments. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SItemManagerUtil.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SItemManagerUtil.java index b4ed69a777d..f5b9593c770 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SItemManagerUtil.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SItemManagerUtil.java @@ -1,12 +1,6 @@ package forge.gui.toolbox.itemmanager; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Map.Entry; - import com.google.common.base.Predicate; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.gui.deckeditor.controllers.ACEditorBase; @@ -17,6 +11,11 @@ import forge.gui.toolbox.FSkin.SkinImage; import forge.item.InventoryItem; import forge.util.ComparableOp; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Map.Entry; + /** * Static methods for working with top-level editor methods, diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SpellShopManager.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SpellShopManager.java index 06e681a2e3d..46c07175dbb 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SpellShopManager.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/SpellShopManager.java @@ -1,10 +1,10 @@ package forge.gui.toolbox.itemmanager; -import javax.swing.JMenu; - import forge.gui.toolbox.itemmanager.filters.ItemFilter; import forge.item.InventoryItem; +import javax.swing.*; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardCMCFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardCMCFilter.java index 7eb9fe570c6..4173e364da0 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardCMCFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardCMCFilter.java @@ -1,20 +1,18 @@ package forge.gui.toolbox.itemmanager.filters; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JPanel; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil; -import forge.gui.toolbox.itemmanager.SpellShopManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil.StatTypes; +import forge.gui.toolbox.itemmanager.SpellShopManager; import forge.item.PaperCard; +import javax.swing.*; +import java.util.ArrayList; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardCMCRangeFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardCMCRangeFilter.java index 7ce7913bc22..2c511d45517 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardCMCRangeFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardCMCRangeFilter.java @@ -2,7 +2,6 @@ package forge.gui.toolbox.itemmanager.filters; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.gui.toolbox.itemmanager.ItemManager; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardColorFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardColorFilter.java index 39d187a06ad..553e7a2b466 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardColorFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardColorFilter.java @@ -1,14 +1,14 @@ package forge.gui.toolbox.itemmanager.filters; -import javax.swing.JPanel; - import com.google.common.base.Predicate; import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.SFilterUtil; -import forge.gui.toolbox.itemmanager.SpellShopManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil.StatTypes; +import forge.gui.toolbox.itemmanager.SpellShopManager; import forge.item.PaperCard; +import javax.swing.*; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardPowerFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardPowerFilter.java index 69d7364a39c..f9e8596cfd3 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardPowerFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardPowerFilter.java @@ -2,7 +2,6 @@ package forge.gui.toolbox.itemmanager.filters; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.gui.toolbox.itemmanager.ItemManager; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardQuestWorldFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardQuestWorldFilter.java index af22a850a8e..18402dd6247 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardQuestWorldFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardQuestWorldFilter.java @@ -1,14 +1,14 @@ package forge.gui.toolbox.itemmanager.filters; -import java.util.HashSet; -import java.util.Set; - import forge.Singletons; import forge.game.GameFormat; import forge.gui.toolbox.itemmanager.ItemManager; import forge.item.PaperCard; import forge.quest.QuestWorld; +import java.util.HashSet; +import java.util.Set; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardSearchFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardSearchFilter.java index 5440e0fa888..ff3bcfdb45f 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardSearchFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardSearchFilter.java @@ -1,12 +1,6 @@ package forge.gui.toolbox.itemmanager.filters; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; - -import javax.swing.JPanel; - import com.google.common.base.Predicate; - import forge.Command; import forge.gui.toolbox.FComboBoxWrapper; import forge.gui.toolbox.FLabel; @@ -17,6 +11,10 @@ import forge.gui.toolbox.itemmanager.SFilterUtil; import forge.item.InventoryItem; import forge.item.PaperCard; +import javax.swing.*; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardSetFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardSetFilter.java index af24e36f538..c4b8d862f3c 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardSetFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardSetFilter.java @@ -1,14 +1,14 @@ package forge.gui.toolbox.itemmanager.filters; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; - import forge.game.GameFormat; import forge.gui.home.quest.DialogChooseSets; import forge.gui.toolbox.itemmanager.ItemManager; import forge.item.PaperCard; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardToughnessFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardToughnessFilter.java index f35c75a0b88..c061e421bb5 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardToughnessFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardToughnessFilter.java @@ -2,7 +2,6 @@ package forge.gui.toolbox.itemmanager.filters; import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.gui.toolbox.itemmanager.ItemManager; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardTypeFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardTypeFilter.java index aa544dc2b1d..84d950abc7b 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardTypeFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/CardTypeFilter.java @@ -1,20 +1,18 @@ package forge.gui.toolbox.itemmanager.filters; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JPanel; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.card.CardRules; import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil; -import forge.gui.toolbox.itemmanager.SpellShopManager; import forge.gui.toolbox.itemmanager.SItemManagerUtil.StatTypes; +import forge.gui.toolbox.itemmanager.SpellShopManager; import forge.item.PaperCard; +import javax.swing.*; +import java.util.ArrayList; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java index a2ceb016f27..39edf41ccd4 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckColorFilter.java @@ -1,9 +1,6 @@ package forge.gui.toolbox.itemmanager.filters; -import javax.swing.JPanel; - import com.google.common.base.Predicate; - import forge.card.ColorSet; import forge.card.MagicColor; import forge.gui.deckeditor.DeckProxy; @@ -12,6 +9,8 @@ import forge.gui.toolbox.itemmanager.SItemManagerUtil.StatTypes; import forge.util.BinaryUtil; import forge.util.ItemPool; +import javax.swing.*; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckFolderFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckFolderFilter.java index 327f3aad0a7..6d488ead108 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckFolderFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckFolderFilter.java @@ -1,13 +1,12 @@ package forge.gui.toolbox.itemmanager.filters; +import com.google.common.base.Predicate; +import forge.gui.deckeditor.DeckProxy; +import forge.gui.toolbox.itemmanager.ItemManager; + import java.util.HashSet; import java.util.Set; -import com.google.common.base.Predicate; - -import forge.gui.deckeditor.DeckProxy; -import forge.gui.toolbox.itemmanager.ItemManager; - /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckFormatFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckFormatFilter.java index 9ff7898b522..db1681f3b20 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckFormatFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckFormatFilter.java @@ -1,7 +1,6 @@ package forge.gui.toolbox.itemmanager.filters; import com.google.common.base.Predicate; - import forge.game.GameFormat; import forge.gui.deckeditor.DeckProxy; import forge.gui.toolbox.itemmanager.ItemManager; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckQuestWorldFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckQuestWorldFilter.java index 912a552bb73..e7cdd07455a 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckQuestWorldFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckQuestWorldFilter.java @@ -1,14 +1,14 @@ package forge.gui.toolbox.itemmanager.filters; -import java.util.HashSet; -import java.util.Set; - import forge.Singletons; import forge.game.GameFormat; import forge.gui.deckeditor.DeckProxy; import forge.gui.toolbox.itemmanager.ItemManager; import forge.quest.QuestWorld; +import java.util.HashSet; +import java.util.Set; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckSetFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckSetFilter.java index e145dbbe3b1..8fffc722719 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckSetFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckSetFilter.java @@ -1,14 +1,14 @@ package forge.gui.toolbox.itemmanager.filters; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; - import forge.game.GameFormat; import forge.gui.deckeditor.DeckProxy; import forge.gui.home.quest.DialogChooseSets; import forge.gui.toolbox.itemmanager.ItemManager; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckStatTypeFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckStatTypeFilter.java index 9ec68ab7ca3..ab1ff4bf7c7 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckStatTypeFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/DeckStatTypeFilter.java @@ -1,9 +1,6 @@ package forge.gui.toolbox.itemmanager.filters; -import java.util.Map; - import com.google.common.base.Predicates; - import forge.gui.deckeditor.DeckProxy; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.itemmanager.ItemManager; @@ -12,6 +9,8 @@ import forge.item.InventoryItem; import forge.item.PaperCard; import forge.util.ItemPool; +import java.util.Map; + public abstract class DeckStatTypeFilter extends StatTypeFilter { public DeckStatTypeFilter(ItemManager itemManager0) { super(itemManager0); diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/FormatFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/FormatFilter.java index e4d1fc6f2b1..818bae0c131 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/FormatFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/FormatFilter.java @@ -1,15 +1,15 @@ package forge.gui.toolbox.itemmanager.filters; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - import forge.Singletons; import forge.card.CardEdition; import forge.game.GameFormat; import forge.gui.toolbox.itemmanager.ItemManager; import forge.item.InventoryItem; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ItemFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ItemFilter.java index 62a444f83ac..4c934ad322c 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ItemFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ItemFilter.java @@ -1,22 +1,6 @@ package forge.gui.toolbox.itemmanager.filters; -import java.awt.BasicStroke; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.SwingUtilities; - import com.google.common.base.Predicate; - import forge.gui.framework.ILocalRepaint; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.Colors; @@ -28,6 +12,13 @@ import forge.gui.toolbox.LayoutHelper; import forge.gui.toolbox.itemmanager.ItemManager; import forge.item.InventoryItem; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ListLabelFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ListLabelFilter.java index b1a88da2d7b..f77b34acc47 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ListLabelFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ListLabelFilter.java @@ -1,8 +1,5 @@ package forge.gui.toolbox.itemmanager.filters; -import javax.swing.JPanel; -import javax.swing.SwingConstants; - import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FTextField; import forge.gui.toolbox.LayoutHelper; @@ -10,6 +7,8 @@ import forge.gui.toolbox.itemmanager.ItemManager; import forge.item.InventoryItem; import forge.util.TextUtil; +import javax.swing.*; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/StatTypeFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/StatTypeFilter.java index 9470601b67f..e4657aad406 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/StatTypeFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/StatTypeFilter.java @@ -1,12 +1,6 @@ package forge.gui.toolbox.itemmanager.filters; -import java.util.HashMap; -import java.util.Map; - -import javax.swing.JPanel; - import com.google.common.base.Predicates; - import forge.Command; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.itemmanager.ItemManager; @@ -17,6 +11,10 @@ import forge.item.ItemPredicate; import forge.item.PaperCard; import forge.util.ItemPool; +import javax.swing.*; +import java.util.HashMap; +import java.util.Map; + public abstract class StatTypeFilter extends ToggleButtonsFilter { protected final Map buttonMap; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/TextSearchFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/TextSearchFilter.java index e438d9fb084..35ccec68b11 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/TextSearchFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/TextSearchFilter.java @@ -1,22 +1,20 @@ package forge.gui.toolbox.itemmanager.filters; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import javax.swing.JPanel; -import javax.swing.Timer; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.gui.toolbox.FTextField; import forge.gui.toolbox.LayoutHelper; import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.SFilterUtil; import forge.item.InventoryItem; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ToggleButtonsFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ToggleButtonsFilter.java index 7c129670457..6ed6cc0e1e6 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ToggleButtonsFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ToggleButtonsFilter.java @@ -1,11 +1,5 @@ package forge.gui.toolbox.itemmanager.filters; -import java.awt.Graphics; -import java.util.ArrayList; - -import javax.swing.Icon; -import javax.swing.JPanel; - import forge.Command; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FSkin; @@ -15,6 +9,10 @@ import forge.gui.toolbox.LayoutHelper; import forge.gui.toolbox.itemmanager.ItemManager; import forge.item.InventoryItem; +import javax.swing.*; +import java.awt.*; +import java.util.ArrayList; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ValueRangeFilter.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ValueRangeFilter.java index 3e766275288..2e4e5054262 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ValueRangeFilter.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/filters/ValueRangeFilter.java @@ -1,13 +1,6 @@ package forge.gui.toolbox.itemmanager.filters; -import java.awt.Component; -import javax.swing.JPanel; -import javax.swing.JSpinner; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - import com.google.common.base.Predicate; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.gui.toolbox.FLabel; @@ -19,6 +12,11 @@ import forge.gui.toolbox.itemmanager.SFilterUtil; import forge.item.InventoryItem; import forge.util.ComparableOp; +import javax.swing.*; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.*; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ColorSetRenderer.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ColorSetRenderer.java index b842c605970..372149f1657 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ColorSetRenderer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ColorSetRenderer.java @@ -1,14 +1,12 @@ package forge.gui.toolbox.itemmanager.views; -import java.awt.Component; -import java.awt.Graphics; - -import javax.swing.JTable; - import forge.card.ColorSet; import forge.card.mana.ManaCostShard; import forge.gui.toolbox.CardFaceSymbols; +import javax.swing.*; +import java.awt.*; + public class ColorSetRenderer extends ItemCellRenderer { private static final long serialVersionUID = 1770527102334163549L; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ColumnDef.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ColumnDef.java index b32296f9719..f5abe1c390e 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ColumnDef.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ColumnDef.java @@ -17,20 +17,10 @@ */ package forge.gui.toolbox.itemmanager.views; -import java.util.Map.Entry; -import java.util.regex.Pattern; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Function; import com.google.common.collect.Iterables; - import forge.Singletons; -import forge.card.CardAiHints; -import forge.card.CardEdition; -import forge.card.CardRarity; -import forge.card.CardRules; -import forge.card.ColorSet; +import forge.card.*; import forge.card.mana.ManaCost; import forge.game.GameFormat; import forge.gui.CardPreferences; @@ -41,6 +31,10 @@ import forge.item.InventoryItem; import forge.item.InventoryItemFromSet; import forge.item.PaperCard; import forge.limited.DraftRankCache; +import org.apache.commons.lang3.StringUtils; + +import java.util.Map.Entry; +import java.util.regex.Pattern; public enum ColumnDef { STRING("", "", 0, -1, -1, SortState.ASC, new ItemCellRenderer(), diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/DeckQuantityRenderer.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/DeckQuantityRenderer.java index e97fd75230d..be0b07a7e92 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/DeckQuantityRenderer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/DeckQuantityRenderer.java @@ -17,17 +17,15 @@ */ package forge.gui.toolbox.itemmanager.views; -import java.awt.Graphics; -import java.awt.Rectangle; -import java.awt.event.MouseEvent; - -import javax.swing.JLabel; - import forge.gui.deckeditor.CDeckEditorUI; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinImage; import forge.item.InventoryItem; +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseEvent; + /** * Displays deck quantity with +/- buttons */ diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/GroupDef.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/GroupDef.java index 3b15bfe0d9a..2800c024258 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/GroupDef.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/GroupDef.java @@ -1,7 +1,6 @@ package forge.gui.toolbox.itemmanager.views; import com.google.common.base.Function; - import forge.card.CardType; import forge.card.ColorSet; import forge.gui.deckeditor.DeckProxy; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ImageView.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ImageView.java index 6dbdd12b4d1..e11f39a2777 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ImageView.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ImageView.java @@ -1,48 +1,15 @@ package forge.gui.toolbox.itemmanager.views; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FontMetrics; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Insets; -import java.awt.Point; -import java.awt.Polygon; -import java.awt.Rectangle; -import java.awt.RenderingHints; -import java.awt.Shape; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; -import java.awt.event.MouseWheelEvent; -import java.awt.image.BufferedImage; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; -import java.util.TreeMap; - -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.JViewport; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingUtilities; - import forge.ImageCache; import forge.game.card.Card; import forge.gui.deckeditor.DeckProxy; import forge.gui.framework.ILocalRepaint; import forge.gui.match.controllers.CDetail; import forge.gui.match.controllers.CPicture; -import forge.gui.toolbox.FComboBoxWrapper; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FMouseAdapter; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; +import forge.gui.toolbox.*; import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinFont; import forge.gui.toolbox.FSkin.SkinImage; -import forge.gui.toolbox.FTextField; import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.ItemManagerModel; import forge.gui.toolbox.special.CardZoomer; @@ -50,6 +17,15 @@ import forge.item.IPaperCard; import forge.item.InventoryItem; import forge.view.arcane.CardPanel; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; +import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; +import java.util.TreeMap; + public class ImageView extends ItemView { private static final int PADDING = 5; private static final float PILE_SPACING_Y = 0.1f; diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/IntegerRenderer.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/IntegerRenderer.java index 509a1cc5845..58c6e263e75 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/IntegerRenderer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/IntegerRenderer.java @@ -17,9 +17,8 @@ */ package forge.gui.toolbox.itemmanager.views; -import java.awt.Component; - -import javax.swing.JTable; +import javax.swing.*; +import java.awt.*; /** * A quick converter to avoid -1 being displayed for unapplicable values. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemCellRenderer.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemCellRenderer.java index 7b8c710bf70..ade4ded352d 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemCellRenderer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemCellRenderer.java @@ -17,17 +17,15 @@ */ package forge.gui.toolbox.itemmanager.views; -import java.awt.Component; -import java.awt.event.MouseEvent; +import forge.gui.toolbox.FSkin; +import forge.item.InventoryItem; -import javax.swing.JLabel; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; import javax.swing.table.DefaultTableCellRenderer; - -import forge.gui.toolbox.FSkin; -import forge.item.InventoryItem; +import java.awt.*; +import java.awt.event.MouseEvent; /** * Base cell renderer class for item tables diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java index 17fef6b3e90..e87521b816c 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemColumn.java @@ -17,12 +17,12 @@ */ package forge.gui.toolbox.itemmanager.views; -import java.util.Map.Entry; -import javax.swing.table.TableColumn; - import com.google.common.base.Function; import forge.item.InventoryItem; +import javax.swing.table.TableColumn; +import java.util.Map.Entry; + /** * A column object in a EditorTableModel in the card editor. * Requires a sorting function and a display function diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemListView.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemListView.java index 4f9bd10cdb6..4d5e2e98894 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemListView.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemListView.java @@ -17,56 +17,29 @@ */ package forge.gui.toolbox.itemmanager.views; -import java.awt.Component; -import java.awt.Cursor; -import java.awt.Dimension; -import java.awt.KeyboardFocusManager; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Enumeration; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; +import forge.gui.toolbox.FMouseAdapter; +import forge.gui.toolbox.FSkin; +import forge.gui.toolbox.FSkin.*; +import forge.gui.toolbox.itemmanager.ItemManager; +import forge.gui.toolbox.itemmanager.ItemManagerModel; +import forge.gui.toolbox.itemmanager.SItemManagerIO; +import forge.item.InventoryItem; -import javax.swing.JComponent; -import javax.swing.JLabel; -import javax.swing.JTable; -import javax.swing.JViewport; -import javax.swing.ListSelectionModel; -import javax.swing.SwingConstants; +import javax.swing.*; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.TableModelEvent; -import javax.swing.table.AbstractTableModel; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.DefaultTableColumnModel; -import javax.swing.table.JTableHeader; -import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableColumn; -import javax.swing.table.TableColumnModel; - -import forge.gui.toolbox.FMouseAdapter; -import forge.gui.toolbox.FSkin; -import forge.gui.toolbox.FSkin.SkinBorder; -import forge.gui.toolbox.FSkin.SkinColor; -import forge.gui.toolbox.FSkin.SkinFont; -import forge.gui.toolbox.FSkin.SkinImage; -import forge.gui.toolbox.FSkin.SkinnedTable; -import forge.gui.toolbox.FSkin.SkinnedTableHeader; -import forge.gui.toolbox.itemmanager.ItemManager; -import forge.gui.toolbox.itemmanager.ItemManagerModel; -import forge.gui.toolbox.itemmanager.SItemManagerIO; -import forge.item.InventoryItem; +import javax.swing.table.*; +import java.awt.*; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.MouseEvent; +import java.util.*; +import java.util.List; +import java.util.Map.Entry; /** diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemView.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemView.java index f3034c85b72..8f6ccfb6506 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemView.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ItemView.java @@ -1,38 +1,5 @@ package forge.gui.toolbox.itemmanager.views; -import java.awt.Color; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Point; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; -import java.awt.event.FocusAdapter; -import java.awt.event.FocusEvent; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseWheelEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.swing.JComponent; -import javax.swing.JViewport; -import javax.swing.Popup; -import javax.swing.PopupFactory; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import javax.swing.Timer; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - -import net.miginfocom.swing.MigLayout; - -import org.apache.commons.lang3.CharUtils; -import org.apache.commons.lang3.StringUtils; - import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FScrollPane; import forge.gui.toolbox.FSkin; @@ -43,6 +10,18 @@ import forge.gui.toolbox.ToolTipListener; import forge.gui.toolbox.itemmanager.ItemManager; import forge.gui.toolbox.itemmanager.ItemManagerModel; import forge.item.InventoryItem; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.CharUtils; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.awt.*; +import java.awt.event.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; public abstract class ItemView { private static final SkinColor BORDER_COLOR = FSkin.getColor(FSkin.Colors.CLR_TEXT); diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ManaCostRenderer.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ManaCostRenderer.java index d00d30cdc06..ce45cdc4e24 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ManaCostRenderer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/ManaCostRenderer.java @@ -17,17 +17,15 @@ */ package forge.gui.toolbox.itemmanager.views; -import java.awt.Component; -import java.awt.Graphics; - -import javax.swing.JTable; - import forge.card.CardRules; import forge.card.CardSplitType; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; import forge.gui.toolbox.CardFaceSymbols; +import javax.swing.*; +import java.awt.*; + /** * Displays mana cost as symbols. */ diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/SColumnUtil.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/SColumnUtil.java index 9f05e6ce77d..04b1e9f4a22 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/SColumnUtil.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/SColumnUtil.java @@ -17,14 +17,13 @@ */ package forge.gui.toolbox.itemmanager.views; +import javax.swing.*; +import javax.swing.table.TableColumn; +import javax.swing.table.TableColumnModel; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import javax.swing.JTable; -import javax.swing.table.TableColumn; -import javax.swing.table.TableColumnModel; - /** * A collection of methods pertaining to columns in card catalog and * current deck tables, for use in the deck editor. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/StarRenderer.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/StarRenderer.java index 2a2c6194d29..7c94428bcb2 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/StarRenderer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/StarRenderer.java @@ -17,12 +17,6 @@ */ package forge.gui.toolbox.itemmanager.views; -import java.awt.Component; -import java.awt.Graphics; -import java.awt.event.MouseEvent; - -import javax.swing.JTable; - import forge.gui.CardPreferences; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinImage; @@ -30,6 +24,10 @@ import forge.item.IPaperCard; import forge.item.InventoryItem; import forge.properties.NewConstants; +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseEvent; + /** * Displays favorite icons */ diff --git a/forge-gui/src/main/java/forge/gui/toolbox/special/CardViewer.java b/forge-gui/src/main/java/forge/gui/toolbox/special/CardViewer.java index f0b1a47fccf..644f1c06722 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/special/CardViewer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/special/CardViewer.java @@ -17,21 +17,18 @@ */ package forge.gui.toolbox.special; -import java.util.Collections; -import java.util.List; - -import javax.swing.AbstractListModel; -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - import forge.game.card.Card; import forge.gui.CardDetailPanel; import forge.gui.CardPicturePanel; import forge.gui.toolbox.FScrollPane; import forge.item.PaperCard; +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.util.Collections; +import java.util.List; + /** * A simple JPanel that shows three columns: card list, pic, and description.. * diff --git a/forge-gui/src/main/java/forge/gui/toolbox/special/CardZoomer.java b/forge-gui/src/main/java/forge/gui/toolbox/special/CardZoomer.java index dd57f523dfd..7f6b3195f60 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/special/CardZoomer.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/special/CardZoomer.java @@ -18,19 +18,6 @@ package forge.gui.toolbox.special; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; - -import javax.swing.JPanel; -import javax.swing.Timer; - -import net.miginfocom.swing.MigLayout; import forge.card.CardCharacteristicName; import forge.game.card.Card; import forge.gui.SOverlayUtils; @@ -39,8 +26,12 @@ import forge.gui.toolbox.FOverlay; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.gui.toolbox.imaging.FImagePanel; -import forge.gui.toolbox.imaging.FImageUtil; import forge.gui.toolbox.imaging.FImagePanel.AutoSizeImageMode; +import forge.gui.toolbox.imaging.FImageUtil; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.event.*; /** * Displays card image at its original size and correct orientation. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/special/PhaseIndicator.java b/forge-gui/src/main/java/forge/gui/toolbox/special/PhaseIndicator.java index e454f3e70aa..69fb87d7d6b 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/special/PhaseIndicator.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/special/PhaseIndicator.java @@ -1,10 +1,9 @@ package forge.gui.toolbox.special; -import javax.swing.JPanel; - +import forge.game.phase.PhaseType; import net.miginfocom.swing.MigLayout; -import forge.game.phase.PhaseType; +import javax.swing.*; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/gui/toolbox/special/PhaseLabel.java b/forge-gui/src/main/java/forge/gui/toolbox/special/PhaseLabel.java index 3d7ae3d5d8a..f74e552d083 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/special/PhaseLabel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/special/PhaseLabel.java @@ -1,15 +1,12 @@ package forge.gui.toolbox.special; -import java.awt.Dimension; -import java.awt.Graphics; +import forge.gui.toolbox.FSkin; + +import javax.swing.*; +import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import javax.swing.JLabel; -import javax.swing.SwingConstants; - -import forge.gui.toolbox.FSkin; - /** * Shows phase labels, handles repainting and on/off states. A PhaseLabel * has "skip" and "active" states, meaning "this phase is (not) skipped" and diff --git a/forge-gui/src/main/java/forge/gui/toolbox/special/PlayerDetailsPanel.java b/forge-gui/src/main/java/forge/gui/toolbox/special/PlayerDetailsPanel.java index 74a6d1d74dc..f11006392e9 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/special/PlayerDetailsPanel.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/special/PlayerDetailsPanel.java @@ -1,21 +1,6 @@ package forge.gui.toolbox.special; -import java.awt.Color; -import java.awt.Font; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JPanel; -import javax.swing.SwingConstants; - -import net.miginfocom.swing.MigLayout; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Function; - import forge.Constant.Preferences; import forge.card.MagicColor; import forge.game.mana.ManaPool; @@ -27,6 +12,15 @@ import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinProp; import forge.gui.toolbox.FSkin.SkinnedPanel; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.tuple.Pair; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.List; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/gui/workshop/CWorkshopUI.java b/forge-gui/src/main/java/forge/gui/workshop/CWorkshopUI.java index ec6b64126bd..f6bc722d11a 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/CWorkshopUI.java +++ b/forge-gui/src/main/java/forge/gui/workshop/CWorkshopUI.java @@ -17,16 +17,15 @@ */ package forge.gui.workshop; -import java.util.List; - -import javax.swing.JMenu; - import forge.Command; import forge.Singletons; import forge.gui.framework.ICDoc; import forge.gui.menus.IMenuProvider; import forge.gui.workshop.menus.CWorkshopUIMenus; +import javax.swing.*; +import java.util.List; + /** * Constructs instance of workshop UI controller, used as a single point of * top-level control for child UIs. Tasks targeting the view of individual diff --git a/forge-gui/src/main/java/forge/gui/workshop/CardScriptInfo.java b/forge-gui/src/main/java/forge/gui/workshop/CardScriptInfo.java index 76edc12c0a3..522877f4aab 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/CardScriptInfo.java +++ b/forge-gui/src/main/java/forge/gui/workshop/CardScriptInfo.java @@ -17,18 +17,17 @@ */ package forge.gui.workshop; +import forge.CardStorageReader; +import forge.card.CardRules; +import forge.gui.toolbox.FOptionPane; +import org.apache.commons.lang3.StringUtils; + import java.io.File; import java.io.PrintWriter; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.lang3.StringUtils; - -import forge.CardStorageReader; -import forge.card.CardRules; -import forge.gui.toolbox.FOptionPane; - public final class CardScriptInfo { private String text; private File file; diff --git a/forge-gui/src/main/java/forge/gui/workshop/VWorkshopUI.java b/forge-gui/src/main/java/forge/gui/workshop/VWorkshopUI.java index 9a1453e537c..18bd8a6d9e4 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/VWorkshopUI.java +++ b/forge-gui/src/main/java/forge/gui/workshop/VWorkshopUI.java @@ -1,13 +1,13 @@ package forge.gui.workshop; -import javax.swing.SwingUtilities; - import forge.Singletons; import forge.gui.framework.FScreen; import forge.gui.framework.IVTopLevelUI; import forge.gui.workshop.controllers.CCardScript; import forge.gui.workshop.views.VWorkshopCatalog; +import javax.swing.*; + /** /** * Top level view class; instantiates and assembles diff --git a/forge-gui/src/main/java/forge/gui/workshop/controllers/CCardScript.java b/forge-gui/src/main/java/forge/gui/workshop/controllers/CCardScript.java index 45b0cf2de5f..a38c3cba9b8 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/controllers/CCardScript.java +++ b/forge-gui/src/main/java/forge/gui/workshop/controllers/CCardScript.java @@ -1,10 +1,5 @@ package forge.gui.workshop.controllers; -import java.util.Arrays; - -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; - import forge.Command; import forge.Singletons; import forge.card.CardDb; @@ -23,6 +18,10 @@ import forge.gui.workshop.views.VCardScript; import forge.gui.workshop.views.VWorkshopCatalog; import forge.item.PaperCard; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; +import java.util.Arrays; + /** * Controls the "card script" panel in the workshop UI. diff --git a/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java b/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java index 0f8221db111..5c9fd35dae2 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java +++ b/forge-gui/src/main/java/forge/gui/workshop/controllers/CWorkshopCatalog.java @@ -1,13 +1,13 @@ package forge.gui.workshop.controllers; -import java.util.Map; - import forge.Command; -import forge.gui.workshop.views.VWorkshopCatalog; import forge.gui.framework.ICDoc; import forge.gui.toolbox.itemmanager.views.ColumnDef; -import forge.gui.toolbox.itemmanager.views.SColumnUtil; import forge.gui.toolbox.itemmanager.views.ItemColumn; +import forge.gui.toolbox.itemmanager.views.SColumnUtil; +import forge.gui.workshop.views.VWorkshopCatalog; + +import java.util.Map; /** * Controls the "card catalog" panel in the workshop UI. diff --git a/forge-gui/src/main/java/forge/gui/workshop/menus/CWorkshopUIMenus.java b/forge-gui/src/main/java/forge/gui/workshop/menus/CWorkshopUIMenus.java index 9b0d9d2ebb8..adecfeb0372 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/menus/CWorkshopUIMenus.java +++ b/forge-gui/src/main/java/forge/gui/workshop/menus/CWorkshopUIMenus.java @@ -1,10 +1,9 @@ package forge.gui.workshop.menus; +import javax.swing.*; import java.util.ArrayList; import java.util.List; -import javax.swing.JMenu; - /** * Gets the menus associated with the Game screen. * diff --git a/forge-gui/src/main/java/forge/gui/workshop/menus/WorkshopFileMenu.java b/forge-gui/src/main/java/forge/gui/workshop/menus/WorkshopFileMenu.java index e87e186e348..714add48397 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/menus/WorkshopFileMenu.java +++ b/forge-gui/src/main/java/forge/gui/workshop/menus/WorkshopFileMenu.java @@ -1,17 +1,15 @@ package forge.gui.workshop.menus; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyEvent; - -import javax.swing.JMenu; -import javax.swing.JMenuItem; - import forge.gui.menus.MenuUtil; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedMenuItem; import forge.gui.workshop.controllers.CCardScript; +import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyEvent; + /** * Returns a JMenu containing options associated with current game. *

diff --git a/forge-gui/src/main/java/forge/gui/workshop/views/VCardDesigner.java b/forge-gui/src/main/java/forge/gui/workshop/views/VCardDesigner.java index 0c5f8b25b5e..3f7c1171984 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/views/VCardDesigner.java +++ b/forge-gui/src/main/java/forge/gui/workshop/views/VCardDesigner.java @@ -1,10 +1,5 @@ package forge.gui.workshop.views; -import java.awt.Dimension; - -import javax.swing.JPanel; -import javax.swing.SpringLayout; - import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; @@ -13,6 +8,9 @@ import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FSkin; import forge.gui.workshop.controllers.CCardDesigner; +import javax.swing.*; +import java.awt.*; + /** * Assembles Swing components of workshop card designer tab. * diff --git a/forge-gui/src/main/java/forge/gui/workshop/views/VCardScript.java b/forge-gui/src/main/java/forge/gui/workshop/views/VCardScript.java index 2cd4deb7148..6cf42959ef4 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/views/VCardScript.java +++ b/forge-gui/src/main/java/forge/gui/workshop/views/VCardScript.java @@ -1,13 +1,14 @@ package forge.gui.workshop.views; -import javax.swing.JPanel; -import net.miginfocom.swing.MigLayout; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; import forge.gui.framework.EDocID; import forge.gui.framework.IVDoc; import forge.gui.toolbox.FTextEditor; import forge.gui.workshop.controllers.CCardScript; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; /** * Assembles Swing components of workshop card script tab. diff --git a/forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java b/forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java index 81f3f035638..39f9a074778 100644 --- a/forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java +++ b/forge-gui/src/main/java/forge/gui/workshop/views/VWorkshopCatalog.java @@ -1,13 +1,6 @@ package forge.gui.workshop.views; -import javax.swing.JPanel; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - -import net.miginfocom.swing.MigLayout; - import com.google.common.collect.Iterables; - import forge.Singletons; import forge.gui.framework.DragCell; import forge.gui.framework.DragTab; @@ -21,6 +14,11 @@ import forge.gui.workshop.controllers.CCardScript; import forge.gui.workshop.controllers.CWorkshopCatalog; import forge.item.PaperCard; import forge.util.ItemPool; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; /** * Assembles Swing components of card catalog in workshop. diff --git a/forge-gui/src/main/java/forge/limited/BoosterDeckBuilder.java b/forge-gui/src/main/java/forge/limited/BoosterDeckBuilder.java index 8f1d7d135ca..8fe4ff91c9e 100644 --- a/forge-gui/src/main/java/forge/limited/BoosterDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDeckBuilder.java @@ -1,10 +1,10 @@ package forge.limited; -import java.util.List; - import forge.item.PaperCard; +import java.util.List; + /** * Deck built from a Booster Draft. diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraft.java b/forge-gui/src/main/java/forge/limited/BoosterDraft.java index bf263a44a1c..b169ea61800 100644 --- a/forge-gui/src/main/java/forge/limited/BoosterDraft.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraft.java @@ -17,20 +17,7 @@ */ package forge.limited; -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.NoSuchElementException; -import java.util.Stack; -import java.util.TreeMap; - -import org.apache.commons.lang3.ArrayUtils; - import com.google.common.base.Supplier; - import forge.Constant.Preferences; import forge.Singletons; import forge.card.CardEdition; @@ -41,8 +28,8 @@ import forge.deck.Deck; import forge.game.card.Card; import forge.gui.GuiChoose; import forge.gui.toolbox.FOptionPane; -import forge.item.PaperCard; import forge.item.IPaperCard; +import forge.item.PaperCard; import forge.item.SealedProduct; import forge.model.CardBlock; import forge.properties.NewConstants; @@ -50,6 +37,11 @@ import forge.util.FileUtil; import forge.util.HttpUtil; import forge.util.ItemPool; import forge.util.storage.IStorage; +import org.apache.commons.lang3.ArrayUtils; + +import java.io.File; +import java.util.*; +import java.util.Map.Entry; /** * diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java index 48f8c01e5b5..ade85e97155 100644 --- a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java @@ -17,17 +17,16 @@ */ package forge.limited; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.tuple.MutablePair; -import org.apache.commons.lang3.tuple.Pair; - import forge.Constant.Preferences; import forge.card.ColorSet; import forge.deck.Deck; import forge.item.PaperCard; import forge.util.Aggregates; +import org.apache.commons.lang3.tuple.MutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.List; /** *

diff --git a/forge-gui/src/main/java/forge/limited/CardRankingComparator.java b/forge-gui/src/main/java/forge/limited/CardRankingComparator.java index 4ce2ff9d468..441bedb85e8 100644 --- a/forge-gui/src/main/java/forge/limited/CardRankingComparator.java +++ b/forge-gui/src/main/java/forge/limited/CardRankingComparator.java @@ -1,10 +1,9 @@ package forge.limited; -import java.util.Comparator; - +import forge.item.PaperCard; import org.apache.commons.lang3.tuple.Pair; -import forge.item.PaperCard; +import java.util.Comparator; /** * Sorts cards by rank. diff --git a/forge-gui/src/main/java/forge/limited/CustomLimited.java b/forge-gui/src/main/java/forge/limited/CustomLimited.java index d9070d182ad..c553b38b2d2 100644 --- a/forge-gui/src/main/java/forge/limited/CustomLimited.java +++ b/forge-gui/src/main/java/forge/limited/CustomLimited.java @@ -17,13 +17,6 @@ */ package forge.limited; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - import forge.Singletons; import forge.card.CardEdition; import forge.deck.Deck; @@ -34,6 +27,12 @@ import forge.util.FileSection; import forge.util.ItemPool; import forge.util.TextUtil; import forge.util.storage.IStorage; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.List; /** *

diff --git a/forge-gui/src/main/java/forge/limited/GauntletMini.java b/forge-gui/src/main/java/forge/limited/GauntletMini.java index b466413b831..ca62883ef69 100644 --- a/forge-gui/src/main/java/forge/limited/GauntletMini.java +++ b/forge-gui/src/main/java/forge/limited/GauntletMini.java @@ -17,11 +17,6 @@ */ package forge.limited; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.SwingUtilities; - import forge.Singletons; import forge.deck.Deck; import forge.game.GameType; @@ -30,6 +25,10 @@ import forge.gui.SOverlayUtils; import forge.net.FServer; import forge.net.Lobby; +import javax.swing.*; +import java.util.ArrayList; +import java.util.List; + /** *

* GauntletMini class. diff --git a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java index b40b8460da5..2ac97eccf62 100644 --- a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java @@ -1,39 +1,23 @@ package forge.limited; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.Singletons; - -import forge.card.CardAiHints; -import forge.card.CardEdition; -import forge.card.CardRules; -import forge.card.CardRulesPredicates; -import forge.card.ColorSet; -import forge.card.DeckHints; -import forge.card.MagicColor; +import forge.card.*; import forge.card.mana.ManaCost; import forge.card.mana.ManaCostShard; import forge.deck.CardPool; import forge.deck.Deck; import forge.deck.DeckSection; import forge.deck.generation.DeckGeneratorBase; -import forge.item.PaperCard; import forge.item.IPaperCard; +import forge.item.PaperCard; import forge.util.MyRandom; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.*; /** * Limited format deck. diff --git a/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java b/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java index f2bf55426f1..ecbca8d6ac4 100644 --- a/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java +++ b/forge-gui/src/main/java/forge/limited/ReadDraftRankings.java @@ -1,15 +1,14 @@ package forge.limited; +import com.esotericsoftware.minlog.Log; +import forge.card.MagicColor; +import forge.properties.NewConstants; +import forge.util.FileUtil; + import java.util.HashMap; import java.util.List; import java.util.Map; -import com.esotericsoftware.minlog.Log; - -import forge.card.MagicColor; -import forge.properties.NewConstants; -import forge.util.FileUtil; - /** * ReadDraftRankings class. * diff --git a/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java b/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java index 87cfd2a4034..9dceab4eb0b 100644 --- a/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java +++ b/forge-gui/src/main/java/forge/limited/SealedCardPoolGenerator.java @@ -17,13 +17,6 @@ */ package forge.limited; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Stack; - -import org.apache.commons.lang3.ArrayUtils; - import forge.Singletons; import forge.card.CardEdition; import forge.card.IUnOpenedProduct; @@ -37,6 +30,12 @@ import forge.model.CardBlock; import forge.model.UnOpenedMeta; import forge.util.FileUtil; import forge.util.TextUtil; +import org.apache.commons.lang3.ArrayUtils; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; /** *

diff --git a/forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java index 84ecb79f657..980d5b931ab 100644 --- a/forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/SealedDeckBuilder.java @@ -1,20 +1,18 @@ package forge.limited; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Random; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.collect.Iterables; - import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.card.ColorSet; import forge.card.MagicColor; import forge.item.PaperCard; import forge.util.MyRandom; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Random; /** * Deck builder for Sealed Deck Format. diff --git a/forge-gui/src/main/java/forge/model/CardBlock.java b/forge-gui/src/main/java/forge/model/CardBlock.java index 1c603968295..470a6cf3062 100644 --- a/forge-gui/src/main/java/forge/model/CardBlock.java +++ b/forge-gui/src/main/java/forge/model/CardBlock.java @@ -17,24 +17,22 @@ */ package forge.model; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Function; import com.google.common.base.Predicate; - import forge.Singletons; import forge.card.CardEdition; import forge.card.IUnOpenedProduct; import forge.card.UnOpenedProduct; -import forge.item.PaperCard; import forge.item.IPaperCard; +import forge.item.PaperCard; import forge.util.TextUtil; import forge.util.storage.StorageReaderFile; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; // import forge.deck.Deck; diff --git a/forge-gui/src/main/java/forge/model/CardCollections.java b/forge-gui/src/main/java/forge/model/CardCollections.java index 1b331d55c87..c6211650905 100644 --- a/forge-gui/src/main/java/forge/model/CardCollections.java +++ b/forge-gui/src/main/java/forge/model/CardCollections.java @@ -17,10 +17,6 @@ */ package forge.model; -import java.io.File; - -import org.apache.commons.lang3.time.StopWatch; - import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.io.DeckGroupSerializer; @@ -29,6 +25,9 @@ import forge.deck.io.OldDeckParser; import forge.properties.NewConstants; import forge.util.storage.IStorage; import forge.util.storage.StorageImmediatelySerialized; +import org.apache.commons.lang3.time.StopWatch; + +import java.io.File; /** * Holds editable maps of decks saved to disk. Adding or removing items to(from) diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java index 36683b7f5a8..02d97692cfb 100644 --- a/forge-gui/src/main/java/forge/model/FModel.java +++ b/forge-gui/src/main/java/forge/model/FModel.java @@ -17,13 +17,6 @@ */ package forge.model; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PrintStream; -import java.util.List; import forge.Constant; import forge.Constant.Preferences; import forge.Singletons; @@ -45,6 +38,9 @@ import forge.util.storage.IStorage; import forge.util.storage.StorageBase; import forge.view.FView; +import java.io.*; +import java.util.List; + /** * The default Model implementation for Forge. * diff --git a/forge-gui/src/main/java/forge/model/MetaSet.java b/forge-gui/src/main/java/forge/model/MetaSet.java index 8ec69f26be2..42a921507f4 100644 --- a/forge-gui/src/main/java/forge/model/MetaSet.java +++ b/forge-gui/src/main/java/forge/model/MetaSet.java @@ -18,19 +18,19 @@ package forge.model; -import java.io.File; -import java.util.List; - import com.google.common.base.Predicate; import forge.Singletons; import forge.card.IUnOpenedProduct; import forge.card.UnOpenedProduct; -import forge.item.PaperCard; import forge.item.IPaperCard; +import forge.item.PaperCard; import forge.item.SealedProduct; import forge.limited.CustomLimited; import forge.util.FileUtil; +import java.io.File; +import java.util.List; + /** * The class MetaSet. This class is used to define 'special' * sets within a (fantasy) block, like custom sets (cubes), diff --git a/forge-gui/src/main/java/forge/model/UnOpenedMeta.java b/forge-gui/src/main/java/forge/model/UnOpenedMeta.java index 43341e24c36..d9ea992d081 100644 --- a/forge-gui/src/main/java/forge/model/UnOpenedMeta.java +++ b/forge-gui/src/main/java/forge/model/UnOpenedMeta.java @@ -18,16 +18,16 @@ package forge.model; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - import forge.card.IUnOpenedProduct; import forge.gui.GuiChoose; import forge.item.PaperCard; import forge.util.MyRandom; import forge.util.TextUtil; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + /** * This type extends UnOpenedProduct to support booster choice or random boosters * in sealed deck games. See MetaSet.java for further information. diff --git a/forge-gui/src/main/java/forge/net/FServer.java b/forge-gui/src/main/java/forge/net/FServer.java index 550f98a2b83..2bbc931d7a5 100644 --- a/forge-gui/src/main/java/forge/net/FServer.java +++ b/forge-gui/src/main/java/forge/net/FServer.java @@ -1,25 +1,20 @@ package forge.net; +import com.google.common.base.Supplier; +import forge.Singletons; +import forge.deck.Deck; +import forge.deck.io.DeckSerializer; +import forge.game.*; +import forge.game.player.LobbyPlayer; +import forge.game.player.RegisteredPlayer; +import forge.gui.player.LobbyPlayerHuman; +import forge.util.Lang; +import org.apache.commons.lang3.time.StopWatch; + import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.lang3.time.StopWatch; - -import com.google.common.base.Supplier; - -import forge.Singletons; -import forge.deck.Deck; -import forge.deck.io.DeckSerializer; -import forge.game.Game; -import forge.game.GameLogEntry; -import forge.game.GameRules; -import forge.game.GameType; -import forge.game.Match; -import forge.game.player.LobbyPlayer; -import forge.game.player.RegisteredPlayer; -import forge.gui.player.LobbyPlayerHuman; -import forge.util.Lang; /** diff --git a/forge-gui/src/main/java/forge/net/Lobby.java b/forge-gui/src/main/java/forge/net/Lobby.java index 66c7f4adfc7..8bad21c7fb3 100644 --- a/forge-gui/src/main/java/forge/net/Lobby.java +++ b/forge-gui/src/main/java/forge/net/Lobby.java @@ -1,10 +1,6 @@ package forge.net; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import com.google.common.base.Supplier; - import forge.Singletons; import forge.ai.AiProfileUtil; import forge.control.ChatArea; @@ -17,6 +13,9 @@ import forge.properties.ForgePreferences.FPref; import forge.util.MyRandom; import forge.util.NameGenerator; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/net/NetServer.java b/forge-gui/src/main/java/forge/net/NetServer.java index cbe5e9d37e7..c9e23defb77 100644 --- a/forge-gui/src/main/java/forge/net/NetServer.java +++ b/forge-gui/src/main/java/forge/net/NetServer.java @@ -1,12 +1,7 @@ package forge.net; -import java.io.IOException; -import java.net.URI; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArraySet; - -import javax.servlet.http.HttpServletRequest; - +import forge.error.BugReporter; +import forge.net.client.NetClient; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.nio.SelectChannelConnector; @@ -15,9 +10,11 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.websocket.WebSocket; import org.eclipse.jetty.websocket.WebSocketServlet; - -import forge.error.BugReporter; -import forge.net.client.NetClient; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.net.URI; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/net/client/NetClient.java b/forge-gui/src/main/java/forge/net/client/NetClient.java index d8be54ebe10..a529116d438 100644 --- a/forge-gui/src/main/java/forge/net/client/NetClient.java +++ b/forge-gui/src/main/java/forge/net/client/NetClient.java @@ -1,15 +1,12 @@ package forge.net.client; -import java.util.concurrent.BlockingDeque; -import java.util.concurrent.LinkedBlockingDeque; - import forge.game.player.LobbyPlayer; import forge.net.FServer; import forge.net.IClientSocket; import forge.net.IConnectionObserver; import forge.net.client.state.ConnectedClientState; -import forge.net.client.state.UnauthorizedClientState; import forge.net.client.state.IClientState; +import forge.net.client.state.UnauthorizedClientState; import forge.net.protocol.ClientProtocol; import forge.net.protocol.ClientProtocolJson; import forge.net.protocol.toclient.ErrorIncorrectPacketClt; @@ -18,6 +15,9 @@ import forge.net.protocol.toclient.IPacketClt; import forge.net.protocol.toclient.WelcomePacketClt; import forge.net.protocol.toserver.IPacketSrv; +import java.util.concurrent.BlockingDeque; +import java.util.concurrent.LinkedBlockingDeque; + public class NetClient implements IConnectionObserver, INetClient{ private final IClientSocket socket; diff --git a/forge-gui/src/main/java/forge/net/client/state/UnauthorizedClientState.java b/forge-gui/src/main/java/forge/net/client/state/UnauthorizedClientState.java index 5cecace8018..2e5f8bed180 100644 --- a/forge-gui/src/main/java/forge/net/client/state/UnauthorizedClientState.java +++ b/forge-gui/src/main/java/forge/net/client/state/UnauthorizedClientState.java @@ -1,12 +1,11 @@ package forge.net.client.state; -import org.apache.commons.lang3.StringUtils; - import forge.net.client.INetClient; import forge.net.client.InvalidFieldInPacketException; import forge.net.protocol.toclient.AuthResultPacketClt; import forge.net.protocol.toserver.AuthorizePacketSrv; import forge.net.protocol.toserver.IPacketSrv; +import org.apache.commons.lang3.StringUtils; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/properties/ForgePreferences.java b/forge-gui/src/main/java/forge/properties/ForgePreferences.java index 59cf1888710..d0c35742fa3 100644 --- a/forge-gui/src/main/java/forge/properties/ForgePreferences.java +++ b/forge-gui/src/main/java/forge/properties/ForgePreferences.java @@ -17,8 +17,6 @@ */ package forge.properties; -import java.util.List; - import forge.Constant; import forge.Constant.Preferences; import forge.ai.AiProfileUtil; @@ -30,6 +28,8 @@ import forge.gui.match.views.VDev; import forge.gui.match.views.VField; import forge.gui.toolbox.special.PhaseIndicator; +import java.util.List; + public class ForgePreferences extends PreferencesStore { /** * Preference identifiers, and their default values. diff --git a/forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java b/forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java index 7491d6c71e2..13c6d6ea088 100644 --- a/forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java +++ b/forge-gui/src/main/java/forge/properties/ForgeProfileProperties.java @@ -17,17 +17,16 @@ */ package forge.properties; +import forge.util.FileSection; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.Map; import java.util.Properties; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; - -import forge.util.FileSection; - /** * Determines the user data and cache dirs, first looking at the specified file for overrides * then falling back to platform-specific defaults. Resulting dir strings are guaranteed to end in a slash diff --git a/forge-gui/src/main/java/forge/properties/Preferences.java b/forge-gui/src/main/java/forge/properties/Preferences.java index 44d4c025053..e9236a07151 100644 --- a/forge-gui/src/main/java/forge/properties/Preferences.java +++ b/forge-gui/src/main/java/forge/properties/Preferences.java @@ -20,11 +20,7 @@ package forge.properties; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.util.Collections; -import java.util.Enumeration; -import java.util.Properties; -import java.util.Set; -import java.util.Vector; +import java.util.*; /** * A collection of name/value pairs with sorted keys and utility methods. diff --git a/forge-gui/src/main/java/forge/properties/PreferencesStore.java b/forge-gui/src/main/java/forge/properties/PreferencesStore.java index d4b71435972..8f0755fd27d 100644 --- a/forge-gui/src/main/java/forge/properties/PreferencesStore.java +++ b/forge-gui/src/main/java/forge/properties/PreferencesStore.java @@ -17,6 +17,8 @@ */ package forge.properties; +import forge.util.FileUtil; + import java.io.BufferedWriter; import java.io.FileWriter; import java.io.IOException; @@ -24,8 +26,6 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import forge.util.FileUtil; - /** * Holds default preference values in an enum. * Loads preferred values when instantiated. diff --git a/forge-gui/src/main/java/forge/quest/BoosterUtils.java b/forge-gui/src/main/java/forge/quest/BoosterUtils.java index d45031e1f9a..34b36bb5855 100644 --- a/forge-gui/src/main/java/forge/quest/BoosterUtils.java +++ b/forge-gui/src/main/java/forge/quest/BoosterUtils.java @@ -17,30 +17,24 @@ */ package forge.quest; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.Singletons; import forge.card.CardRules; import forge.card.CardRulesPredicates; import forge.card.MagicColor; import forge.card.PrintSheet; -import forge.item.BoosterPack; -import forge.item.PaperCard; -import forge.item.IPaperCard; -import forge.item.InventoryItem; -import forge.item.TournamentPack; +import forge.item.*; import forge.quest.data.QuestPreferences.QPref; import forge.util.Aggregates; import forge.util.MyRandom; +import org.apache.commons.lang3.StringUtils; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; // The BoosterPack generates cards for the Card Pool in Quest Mode /** diff --git a/forge-gui/src/main/java/forge/quest/IQuestRewardCard.java b/forge-gui/src/main/java/forge/quest/IQuestRewardCard.java index 212e4c344ba..9c2705b766b 100644 --- a/forge-gui/src/main/java/forge/quest/IQuestRewardCard.java +++ b/forge-gui/src/main/java/forge/quest/IQuestRewardCard.java @@ -1,9 +1,9 @@ package forge.quest; -import java.util.List; - -import forge.item.PaperCard; import forge.item.InventoryItem; +import forge.item.PaperCard; + +import java.util.List; /** * Various card rewards that may be awarded during the Quest. diff --git a/forge-gui/src/main/java/forge/quest/QuestController.java b/forge-gui/src/main/java/forge/quest/QuestController.java index 2d01eeb44a5..573d7a53ce4 100644 --- a/forge-gui/src/main/java/forge/quest/QuestController.java +++ b/forge-gui/src/main/java/forge/quest/QuestController.java @@ -17,17 +17,9 @@ */ package forge.quest; -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.eventbus.Subscribe; - import forge.Singletons; import forge.deck.Deck; import forge.game.GameFormat; @@ -49,6 +41,9 @@ import forge.quest.io.QuestChallengeReader; import forge.util.storage.IStorage; import forge.util.storage.StorageBase; +import java.io.File; +import java.util.*; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/quest/QuestDeckMap.java b/forge-gui/src/main/java/forge/quest/QuestDeckMap.java index 365b394e30a..b86bd857137 100644 --- a/forge-gui/src/main/java/forge/quest/QuestDeckMap.java +++ b/forge-gui/src/main/java/forge/quest/QuestDeckMap.java @@ -17,11 +17,11 @@ */ package forge.quest; -import java.util.Map; - import forge.deck.Deck; import forge.util.storage.StorageBase; +import java.util.Map; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/quest/QuestEvent.java b/forge-gui/src/main/java/forge/quest/QuestEvent.java index 4269f95f286..973d0357c7b 100644 --- a/forge-gui/src/main/java/forge/quest/QuestEvent.java +++ b/forge-gui/src/main/java/forge/quest/QuestEvent.java @@ -17,16 +17,15 @@ */ package forge.quest; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import com.google.common.base.Function; - import forge.deck.Deck; import forge.game.player.IHasIcon; import forge.item.InventoryItem; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + /** *

* QuestEvent. diff --git a/forge-gui/src/main/java/forge/quest/QuestEventChallenge.java b/forge-gui/src/main/java/forge/quest/QuestEventChallenge.java index 1551ee17165..3afac377b5a 100644 --- a/forge-gui/src/main/java/forge/quest/QuestEventChallenge.java +++ b/forge-gui/src/main/java/forge/quest/QuestEventChallenge.java @@ -17,13 +17,12 @@ */ package forge.quest; +import com.google.common.base.Function; +import forge.deck.Deck; + import java.util.ArrayList; import java.util.List; -import com.google.common.base.Function; - -import forge.deck.Deck; - /** *

* QuestQuest class. diff --git a/forge-gui/src/main/java/forge/quest/QuestEventDuelManager.java b/forge-gui/src/main/java/forge/quest/QuestEventDuelManager.java index deec88a0aca..76f0afd05af 100644 --- a/forge-gui/src/main/java/forge/quest/QuestEventDuelManager.java +++ b/forge-gui/src/main/java/forge/quest/QuestEventDuelManager.java @@ -17,13 +17,6 @@ */ package forge.quest; -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Random; - import forge.Singletons; import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences.DifficultyPrefs; @@ -34,6 +27,9 @@ import forge.util.maps.MapOfLists; import forge.util.storage.IStorage; import forge.util.storage.StorageBase; +import java.io.File; +import java.util.*; + /** * QuestEventManager. * diff --git a/forge-gui/src/main/java/forge/quest/QuestRewardCard.java b/forge-gui/src/main/java/forge/quest/QuestRewardCard.java index 47f58cb06a5..5f92bac330a 100644 --- a/forge-gui/src/main/java/forge/quest/QuestRewardCard.java +++ b/forge-gui/src/main/java/forge/quest/QuestRewardCard.java @@ -1,16 +1,15 @@ package forge.quest; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicate; import com.google.common.base.Predicates; - import forge.Singletons; import forge.card.CardRules; -import forge.item.PaperCard; import forge.item.IPaperCard; import forge.item.InventoryItem; +import forge.item.PaperCard; + +import java.util.ArrayList; +import java.util.List; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/quest/QuestRewardCardChooser.java b/forge-gui/src/main/java/forge/quest/QuestRewardCardChooser.java index 21d78dd7c3a..54fb1f06aa1 100644 --- a/forge-gui/src/main/java/forge/quest/QuestRewardCardChooser.java +++ b/forge-gui/src/main/java/forge/quest/QuestRewardCardChooser.java @@ -1,18 +1,17 @@ package forge.quest; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import forge.Singletons; +import forge.item.InventoryItem; +import forge.item.PaperCard; +import forge.util.ItemPool; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; - -import forge.Singletons; -import forge.item.PaperCard; -import forge.item.InventoryItem; -import forge.util.ItemPool; - /** * Resolves a card chooser InventoryItem into a CardPrinted. * The initial version includes "duplicate", other type may be added later. diff --git a/forge-gui/src/main/java/forge/quest/QuestRewardCardDuplicate.java b/forge-gui/src/main/java/forge/quest/QuestRewardCardDuplicate.java index 4d1d034e7a7..21754582bc3 100644 --- a/forge-gui/src/main/java/forge/quest/QuestRewardCardDuplicate.java +++ b/forge-gui/src/main/java/forge/quest/QuestRewardCardDuplicate.java @@ -1,14 +1,14 @@ package forge.quest; +import forge.Singletons; +import forge.item.PaperCard; +import forge.util.ItemPool; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import forge.Singletons; -import forge.item.PaperCard; -import forge.util.ItemPool; - /** * Allows the player to choose a duplicate copy of a currently owned card. * diff --git a/forge-gui/src/main/java/forge/quest/QuestRewardCardFiltered.java b/forge-gui/src/main/java/forge/quest/QuestRewardCardFiltered.java index 917b4967647..7bc82bd2db6 100644 --- a/forge-gui/src/main/java/forge/quest/QuestRewardCardFiltered.java +++ b/forge-gui/src/main/java/forge/quest/QuestRewardCardFiltered.java @@ -1,15 +1,14 @@ package forge.quest; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; +import forge.Singletons; +import forge.item.PaperCard; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; - -import forge.Singletons; -import forge.item.PaperCard; - /** * Allows the player to choose a card from a predicate-filtered list of cards. * diff --git a/forge-gui/src/main/java/forge/quest/QuestUtil.java b/forge-gui/src/main/java/forge/quest/QuestUtil.java index 72fad7a9a2a..578b5ddae91 100644 --- a/forge-gui/src/main/java/forge/quest/QuestUtil.java +++ b/forge-gui/src/main/java/forge/quest/QuestUtil.java @@ -17,18 +17,18 @@ */ package forge.quest; -import java.util.ArrayList; -import java.util.List; - import forge.Singletons; +import forge.card.CardDb.SetPreference; import forge.card.CardEdition; import forge.card.CardRules; -import forge.card.CardDb.SetPreference; import forge.game.card.Card; -import forge.item.PaperToken; import forge.item.IPaperCard; +import forge.item.PaperToken; import forge.quest.bazaar.QuestPetController; +import java.util.ArrayList; +import java.util.List; + /** *

* QuestUtil class. diff --git a/forge-gui/src/main/java/forge/quest/QuestUtilCards.java b/forge-gui/src/main/java/forge/quest/QuestUtilCards.java index fa9198b3b9d..f262fdd9873 100644 --- a/forge-gui/src/main/java/forge/quest/QuestUtilCards.java +++ b/forge-gui/src/main/java/forge/quest/QuestUtilCards.java @@ -17,36 +17,17 @@ */ package forge.quest; -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; - -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.Singletons; -import forge.card.BoosterSlots; -import forge.card.CardEdition; -import forge.card.CardRarity; -import forge.card.ICardDatabase; -import forge.card.MagicColor; -import forge.card.UnOpenedProduct; +import forge.card.*; import forge.deck.Deck; import forge.deck.DeckSection; import forge.game.GameFormat; -import forge.item.BoosterPack; -import forge.item.PaperCard; -import forge.item.FatPack; -import forge.item.IPaperCard; -import forge.item.InventoryItem; -import forge.item.SealedProduct; -import forge.item.PreconDeck; -import forge.item.TournamentPack; +import forge.item.*; import forge.properties.ForgePreferences.FPref; import forge.quest.bazaar.QuestItemType; import forge.quest.data.GameFormatQuest; @@ -57,6 +38,11 @@ import forge.quest.data.QuestPreferences.QPref; import forge.util.Aggregates; import forge.util.ItemPool; import forge.util.MyRandom; +import org.apache.commons.lang3.tuple.Pair; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map.Entry; /** * This is a helper class to execute operations on QuestData. It has been diff --git a/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java b/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java index de4c63e39f4..19e16b9c7bb 100644 --- a/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java +++ b/forge-gui/src/main/java/forge/quest/QuestUtilUnlockSets.java @@ -17,19 +17,9 @@ */ package forge.quest; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.tuple.ImmutablePair; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import forge.Singletons; import forge.card.CardEdition; import forge.card.UnOpenedProduct; @@ -40,6 +30,9 @@ import forge.item.PaperCard; import forge.item.SealedProduct; import forge.quest.io.ReadPriceList; import forge.util.storage.IStorage; +import org.apache.commons.lang3.tuple.ImmutablePair; + +import java.util.*; /** * This is a helper class for unlocking new sets during a format-limited diff --git a/forge-gui/src/main/java/forge/quest/QuestWorld.java b/forge-gui/src/main/java/forge/quest/QuestWorld.java index 0f7d7ce6d44..2f41afb9e17 100644 --- a/forge-gui/src/main/java/forge/quest/QuestWorld.java +++ b/forge-gui/src/main/java/forge/quest/QuestWorld.java @@ -17,15 +17,14 @@ */ package forge.quest; +import com.google.common.base.Function; +import forge.quest.data.GameFormatQuest; +import forge.util.storage.StorageReaderFile; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.google.common.base.Function; - -import forge.quest.data.GameFormatQuest; -import forge.util.storage.StorageReaderFile; - /** * This function holds the "world info" for the current quest. * diff --git a/forge-gui/src/main/java/forge/quest/SellRules.java b/forge-gui/src/main/java/forge/quest/SellRules.java index 83d5ca7aeb2..d796b14c0b5 100644 --- a/forge-gui/src/main/java/forge/quest/SellRules.java +++ b/forge-gui/src/main/java/forge/quest/SellRules.java @@ -17,11 +17,11 @@ */ package forge.quest; -import java.util.List; - import forge.quest.data.QuestAchievements; import forge.util.FileSection; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestBazaarManager.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestBazaarManager.java index 134a4f48cbb..af8620edd95 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestBazaarManager.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestBazaarManager.java @@ -17,35 +17,21 @@ */ package forge.quest.bazaar; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeMap; -import java.util.TreeSet; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; - import com.thoughtworks.xstream.XStream; - import forge.Singletons; import forge.quest.QuestController; import forge.quest.data.QuestAssets; import forge.util.IgnoringXStream; import forge.util.XmlUtil; +import org.w3c.dom.*; +import org.xml.sax.SAXException; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import java.io.File; +import java.io.IOException; +import java.util.*; /** *

diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestItemBasic.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestItemBasic.java index c257e774470..6cfb21cb38c 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestItemBasic.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestItemBasic.java @@ -17,14 +17,12 @@ */ package forge.quest.bazaar; -import org.apache.commons.lang3.StringUtils; - import com.thoughtworks.xstream.annotations.XStreamAsAttribute; - import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.QuestIcons; import forge.gui.toolbox.FSkin.SkinIcon; import forge.quest.data.QuestAssets; +import org.apache.commons.lang3.StringUtils; /** *

diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestItemType.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestItemType.java index 658c1696dfc..97e91328ed5 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestItemType.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestItemType.java @@ -18,7 +18,6 @@ package forge.quest.bazaar; import com.thoughtworks.xstream.annotations.XStreamAlias; - import forge.quest.data.QuestItemCondition; /** diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java index b05a334352c..1a6fb5c52e8 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetController.java @@ -17,18 +17,17 @@ */ package forge.quest.bazaar; -import java.util.ArrayList; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; - import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinIcon; import forge.item.PaperToken; import forge.properties.NewConstants; import forge.quest.data.QuestAssets; +import java.util.ArrayList; +import java.util.List; + /** *

* Abstract QuestPetAbstract class. diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStats.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStats.java index 74f9efc66c2..6386c021db8 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStats.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStats.java @@ -1,17 +1,16 @@ package forge.quest.bazaar; -import java.io.File; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; - import forge.card.CardEdition; import forge.card.CardRules; import forge.item.PaperToken; import forge.properties.NewConstants; import forge.util.FileUtil; +import java.io.File; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStorage.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStorage.java index 971c12d1cdd..bf3e623c73f 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStorage.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestPetStorage.java @@ -1,27 +1,24 @@ package forge.quest.bazaar; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - +import com.thoughtworks.xstream.XStream; +import forge.quest.data.QuestAssets; +import forge.util.IgnoringXStream; +import forge.util.XmlUtil; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import com.thoughtworks.xstream.XStream; - -import forge.quest.data.QuestAssets; -import forge.util.IgnoringXStream; -import forge.util.XmlUtil; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java b/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java index aab74324ddf..59bdeab9fa4 100644 --- a/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java +++ b/forge-gui/src/main/java/forge/quest/bazaar/QuestStallDefinition.java @@ -17,14 +17,13 @@ */ package forge.quest.bazaar; -import java.util.ArrayList; -import java.util.List; - import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; - import forge.gui.toolbox.FSkin.QuestIcons; +import java.util.ArrayList; +import java.util.List; + /** *

* QuestStallDefinition class. diff --git a/forge-gui/src/main/java/forge/quest/data/GameFormatQuest.java b/forge-gui/src/main/java/forge/quest/data/GameFormatQuest.java index af9a329de61..073bdbcfe12 100644 --- a/forge-gui/src/main/java/forge/quest/data/GameFormatQuest.java +++ b/forge-gui/src/main/java/forge/quest/data/GameFormatQuest.java @@ -17,15 +17,14 @@ */ package forge.quest.data; -import java.util.ArrayList; -import java.util.List; - import com.google.common.base.Predicate; - import forge.Singletons; import forge.card.CardEdition; import forge.game.GameFormat; +import java.util.ArrayList; +import java.util.List; + /** * This is an alternate game format type, the main difference is that this diff --git a/forge-gui/src/main/java/forge/quest/data/QuestAchievements.java b/forge-gui/src/main/java/forge/quest/data/QuestAchievements.java index 7354ce786b6..6185be731ee 100644 --- a/forge-gui/src/main/java/forge/quest/data/QuestAchievements.java +++ b/forge-gui/src/main/java/forge/quest/data/QuestAchievements.java @@ -1,11 +1,11 @@ package forge.quest.data; -import java.util.ArrayList; -import java.util.List; - import forge.Singletons; import forge.quest.data.QuestPreferences.DifficultyPrefs; +import java.util.ArrayList; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/quest/data/QuestAssets.java b/forge-gui/src/main/java/forge/quest/data/QuestAssets.java index 996d4800691..524e2ea621c 100644 --- a/forge-gui/src/main/java/forge/quest/data/QuestAssets.java +++ b/forge-gui/src/main/java/forge/quest/data/QuestAssets.java @@ -17,14 +17,10 @@ */ package forge.quest.data; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Map; - import forge.Singletons; import forge.deck.Deck; -import forge.item.PaperCard; import forge.item.InventoryItem; +import forge.item.PaperCard; import forge.quest.QuestDeckMap; import forge.quest.QuestMode; import forge.quest.QuestUtilCards; @@ -32,6 +28,10 @@ import forge.quest.bazaar.QuestItemType; import forge.quest.data.QuestPreferences.QPref; import forge.util.ItemPool; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; + /** */ public class QuestAssets { diff --git a/forge-gui/src/main/java/forge/quest/data/QuestData.java b/forge-gui/src/main/java/forge/quest/data/QuestData.java index 377081cca2f..895506a1ca4 100644 --- a/forge-gui/src/main/java/forge/quest/data/QuestData.java +++ b/forge-gui/src/main/java/forge/quest/data/QuestData.java @@ -17,16 +17,16 @@ */ package forge.quest.data; -import java.io.File; -import java.util.HashMap; -import java.util.Map; - import forge.Singletons; import forge.game.GameFormat; import forge.properties.NewConstants; import forge.quest.QuestMode; import forge.quest.io.QuestDataIO; +import java.io.File; +import java.util.HashMap; +import java.util.Map; + //when you create QuestDataOld and AFTER you copy the AI decks over //you have to call one of these two methods below //see Gui_QuestOptions for more details diff --git a/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java b/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java index 78e39aa9e24..dd4f0d78479 100644 --- a/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java +++ b/forge-gui/src/main/java/forge/quest/data/QuestPreferences.java @@ -17,11 +17,11 @@ */ package forge.quest.data; -import java.io.Serializable; - import forge.properties.NewConstants; import forge.properties.PreferencesStore; +import java.io.Serializable; + @SuppressWarnings("serial") public class QuestPreferences extends PreferencesStore implements Serializable { /** diff --git a/forge-gui/src/main/java/forge/quest/gui/ViewItem.java b/forge-gui/src/main/java/forge/quest/gui/ViewItem.java index 6f2e08dd6e6..d16643c5bab 100644 --- a/forge-gui/src/main/java/forge/quest/gui/ViewItem.java +++ b/forge-gui/src/main/java/forge/quest/gui/ViewItem.java @@ -1,10 +1,5 @@ package forge.quest.gui; -import java.awt.Font; - -import javax.swing.SwingUtilities; - -import net.miginfocom.swing.MigLayout; import forge.Command; import forge.Singletons; import forge.gui.bazaar.VBazaarUI; @@ -14,6 +9,10 @@ import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FTextArea; import forge.quest.bazaar.IQuestBazaarItem; import forge.quest.data.QuestAssets; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; /** An update-able panel instance representing a single item. */ @SuppressWarnings("serial") diff --git a/forge-gui/src/main/java/forge/quest/gui/ViewStall.java b/forge-gui/src/main/java/forge/quest/gui/ViewStall.java index 31a8f7c092c..80c4e2cfe7b 100644 --- a/forge-gui/src/main/java/forge/quest/gui/ViewStall.java +++ b/forge-gui/src/main/java/forge/quest/gui/ViewStall.java @@ -17,20 +17,6 @@ */ package forge.quest.gui; -import java.awt.Component; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JPanel; -import javax.swing.JTextPane; -import javax.swing.ScrollPaneConstants; -import javax.swing.SwingConstants; -import javax.swing.border.Border; -import javax.swing.text.SimpleAttributeSet; -import javax.swing.text.StyleConstants; -import javax.swing.text.StyledDocument; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.gui.bazaar.VBazaarUI; import forge.gui.toolbox.FLabel; @@ -41,6 +27,16 @@ import forge.quest.QuestController; import forge.quest.bazaar.IQuestBazaarItem; import forge.quest.bazaar.QuestStallDefinition; import forge.quest.data.QuestAssets; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import javax.swing.border.Border; +import javax.swing.text.SimpleAttributeSet; +import javax.swing.text.StyleConstants; +import javax.swing.text.StyledDocument; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; /** *

diff --git a/forge-gui/src/main/java/forge/quest/io/QuestChallengeReader.java b/forge-gui/src/main/java/forge/quest/io/QuestChallengeReader.java index 999a846e8c2..430193092a1 100644 --- a/forge-gui/src/main/java/forge/quest/io/QuestChallengeReader.java +++ b/forge-gui/src/main/java/forge/quest/io/QuestChallengeReader.java @@ -1,11 +1,5 @@ package forge.quest.io; -import java.io.File; -import java.io.FilenameFilter; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - import forge.ImageKeys; import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; @@ -17,6 +11,12 @@ import forge.util.FileUtil; import forge.util.TextUtil; import forge.util.storage.StorageReaderFolder; +import java.io.File; +import java.io.FilenameFilter; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + public class QuestChallengeReader extends StorageReaderFolder { public QuestChallengeReader(File deckDir0) { super(deckDir0, QuestEventChallenge.FN_GET_ID); diff --git a/forge-gui/src/main/java/forge/quest/io/QuestDataIO.java b/forge-gui/src/main/java/forge/quest/io/QuestDataIO.java index b282b36b7ea..6c8c4c32465 100644 --- a/forge-gui/src/main/java/forge/quest/io/QuestDataIO.java +++ b/forge-gui/src/main/java/forge/quest/io/QuestDataIO.java @@ -17,13 +17,36 @@ */ package forge.quest.io; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.StringReader; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.converters.Converter; +import com.thoughtworks.xstream.converters.MarshallingContext; +import com.thoughtworks.xstream.converters.UnmarshallingContext; +import com.thoughtworks.xstream.io.HierarchicalStreamReader; +import com.thoughtworks.xstream.io.HierarchicalStreamWriter; +import forge.Singletons; +import forge.card.CardEdition; +import forge.deck.CardPool; +import forge.deck.Deck; +import forge.deck.DeckSection; +import forge.error.BugReporter; +import forge.item.*; +import forge.properties.NewConstants; +import forge.quest.QuestController; +import forge.quest.QuestMode; +import forge.quest.bazaar.QuestItemType; +import forge.quest.data.*; +import forge.util.IgnoringXStream; +import forge.util.ItemPool; +import forge.util.XmlUtil; +import org.apache.commons.lang3.StringUtils; +import org.w3c.dom.*; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import java.io.*; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.EnumMap; @@ -33,51 +56,6 @@ import java.util.Map.Entry; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -import org.apache.commons.lang3.StringUtils; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.converters.Converter; -import com.thoughtworks.xstream.converters.MarshallingContext; -import com.thoughtworks.xstream.converters.UnmarshallingContext; -import com.thoughtworks.xstream.io.HierarchicalStreamReader; -import com.thoughtworks.xstream.io.HierarchicalStreamWriter; - -import forge.Singletons; -import forge.card.CardEdition; -import forge.deck.CardPool; -import forge.deck.Deck; -import forge.deck.DeckSection; -import forge.error.BugReporter; -import forge.item.BoosterPack; -import forge.item.PaperCard; -import forge.item.FatPack; -import forge.item.InventoryItem; -import forge.item.PreconDeck; -import forge.item.TournamentPack; -import forge.properties.NewConstants; -import forge.quest.QuestController; -import forge.quest.QuestMode; -import forge.quest.bazaar.QuestItemType; -import forge.quest.data.GameFormatQuest; -import forge.quest.data.QuestAchievements; -import forge.quest.data.QuestAssets; -import forge.quest.data.QuestData; -import forge.quest.data.QuestItemCondition; -import forge.util.IgnoringXStream; -import forge.util.ItemPool; -import forge.util.XmlUtil; - /** *

* QuestDataIO class. diff --git a/forge-gui/src/main/java/forge/quest/io/QuestDuelReader.java b/forge-gui/src/main/java/forge/quest/io/QuestDuelReader.java index 7921781039c..e3f4a868486 100644 --- a/forge-gui/src/main/java/forge/quest/io/QuestDuelReader.java +++ b/forge-gui/src/main/java/forge/quest/io/QuestDuelReader.java @@ -1,10 +1,5 @@ package forge.quest.io; -import java.io.File; -import java.io.FilenameFilter; -import java.util.List; -import java.util.Map; - import forge.ImageKeys; import forge.deck.io.DeckSerializer; import forge.deck.io.DeckStorage; @@ -15,6 +10,11 @@ import forge.util.FileSection; import forge.util.FileUtil; import forge.util.storage.StorageReaderFolder; +import java.io.File; +import java.io.FilenameFilter; +import java.util.List; +import java.util.Map; + public class QuestDuelReader extends StorageReaderFolder { public QuestDuelReader(File deckDir0) { super(deckDir0, QuestEvent.FN_GET_NAME); diff --git a/forge-gui/src/main/java/forge/quest/io/ReadPriceList.java b/forge-gui/src/main/java/forge/quest/io/ReadPriceList.java index c0e42477980..9f0b1498720 100644 --- a/forge-gui/src/main/java/forge/quest/io/ReadPriceList.java +++ b/forge-gui/src/main/java/forge/quest/io/ReadPriceList.java @@ -17,18 +17,17 @@ */ package forge.quest.io; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; - import com.esotericsoftware.minlog.Log; - import forge.card.MagicColor; import forge.properties.NewConstants; import forge.util.FileUtil; import forge.util.MyRandom; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + /** *

* ReadPriceList class. diff --git a/forge-gui/src/main/java/forge/sound/AltSoundSystem.java b/forge-gui/src/main/java/forge/sound/AltSoundSystem.java index 6457f9a0144..aef20bef2f0 100755 --- a/forge-gui/src/main/java/forge/sound/AltSoundSystem.java +++ b/forge-gui/src/main/java/forge/sound/AltSoundSystem.java @@ -1,15 +1,10 @@ package forge.sound; +import javax.sound.sampled.*; import java.io.File; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import javax.sound.sampled.AudioFormat; -import javax.sound.sampled.AudioInputStream; -import javax.sound.sampled.AudioSystem; -import javax.sound.sampled.DataLine; -import javax.sound.sampled.SourceDataLine; -import javax.sound.sampled.UnsupportedAudioFileException; /** * diff --git a/forge-gui/src/main/java/forge/sound/AudioClip.java b/forge-gui/src/main/java/forge/sound/AudioClip.java index d07e5a24178..fc4e768c0c7 100644 --- a/forge-gui/src/main/java/forge/sound/AudioClip.java +++ b/forge-gui/src/main/java/forge/sound/AudioClip.java @@ -19,18 +19,11 @@ package forge.sound; +import javax.sound.sampled.*; import java.io.File; import java.io.IOException; import java.util.MissingResourceException; -import javax.sound.sampled.AudioFormat; -import javax.sound.sampled.AudioInputStream; -import javax.sound.sampled.AudioSystem; -import javax.sound.sampled.Clip; -import javax.sound.sampled.DataLine; -import javax.sound.sampled.LineUnavailableException; -import javax.sound.sampled.UnsupportedAudioFileException; - /** diff --git a/forge-gui/src/main/java/forge/sound/EventVisualizer.java b/forge-gui/src/main/java/forge/sound/EventVisualizer.java index 237b7c2d8de..548e72f3c03 100644 --- a/forge-gui/src/main/java/forge/sound/EventVisualizer.java +++ b/forge-gui/src/main/java/forge/sound/EventVisualizer.java @@ -1,29 +1,7 @@ package forge.sound; -import java.util.Collection; - import forge.game.card.Card; -import forge.game.event.GameEventBlockersDeclared; -import forge.game.event.GameEventCardChangeZone; -import forge.game.event.GameEventCardDamaged; -import forge.game.event.GameEventCardDestroyed; -import forge.game.event.GameEventCardAttachment; -import forge.game.event.GameEventCardPhased; -import forge.game.event.GameEventCardRegenerated; -import forge.game.event.GameEventCardSacrificed; -import forge.game.event.GameEventCardCounters; -import forge.game.event.GameEventGameOutcome; -import forge.game.event.GameEventTurnEnded; -import forge.game.event.GameEvent; -import forge.game.event.GameEventFlipCoin; -import forge.game.event.GameEventLandPlayed; -import forge.game.event.GameEventPlayerLivesChanged; -import forge.game.event.GameEventPlayerPoisoned; -import forge.game.event.GameEventCardTapped; -import forge.game.event.GameEventShuffle; -import forge.game.event.GameEventSpellResolved; -import forge.game.event.GameEventTokenCreated; -import forge.game.event.IGameEventVisitor; +import forge.game.event.*; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gui.events.IUiEventVisitor; @@ -32,6 +10,8 @@ import forge.gui.events.UiEventBlockerAssigned; import forge.net.FServer; import forge.util.maps.MapOfLists; +import java.util.Collection; + /** * This class is in charge of converting any forge.game.event.Event to a SoundEffectType. * diff --git a/forge-gui/src/main/java/forge/sound/SoundSystem.java b/forge-gui/src/main/java/forge/sound/SoundSystem.java index f695220b0ec..fb2ad393368 100644 --- a/forge-gui/src/main/java/forge/sound/SoundSystem.java +++ b/forge-gui/src/main/java/forge/sound/SoundSystem.java @@ -1,16 +1,15 @@ package forge.sound; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Map; - import com.google.common.eventbus.Subscribe; - import forge.Singletons; import forge.game.event.GameEvent; import forge.gui.events.UiEvent; import forge.properties.ForgePreferences.FPref; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Map; + /** * Manages playback of all sounds for the client. * diff --git a/forge-gui/src/main/java/forge/util/AwtUtil.java b/forge-gui/src/main/java/forge/util/AwtUtil.java index c3ce012fb7f..2d225f3c595 100644 --- a/forge-gui/src/main/java/forge/util/AwtUtil.java +++ b/forge-gui/src/main/java/forge/util/AwtUtil.java @@ -1,7 +1,6 @@ package forge.util; -import java.awt.Component; -import java.awt.Container; +import java.awt.*; import java.util.ArrayList; public class AwtUtil { diff --git a/forge-gui/src/main/java/forge/util/HttpUtil.java b/forge-gui/src/main/java/forge/util/HttpUtil.java index 0e198efc33d..2c7a53642b3 100644 --- a/forge-gui/src/main/java/forge/util/HttpUtil.java +++ b/forge-gui/src/main/java/forge/util/HttpUtil.java @@ -17,19 +17,14 @@ */ package forge.util; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; +import forge.Constant.Preferences; + +import java.io.*; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.util.Collection; -import forge.Constant.Preferences; - public class HttpUtil { private static final String BOUNDARY = "--7d021a37605f0"; diff --git a/forge-gui/src/main/java/forge/util/IgnoringXStream.java b/forge-gui/src/main/java/forge/util/IgnoringXStream.java index 4e8331a2df8..d0ff70919ac 100644 --- a/forge-gui/src/main/java/forge/util/IgnoringXStream.java +++ b/forge-gui/src/main/java/forge/util/IgnoringXStream.java @@ -1,11 +1,11 @@ package forge.util; -import java.util.ArrayList; -import java.util.List; - import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.mapper.MapperWrapper; +import java.util.ArrayList; +import java.util.List; + /** * TODO: Write javadoc for this type. * diff --git a/forge-gui/src/main/java/forge/util/LineReader.java b/forge-gui/src/main/java/forge/util/LineReader.java index 76b5663b2bf..6ff608db007 100644 --- a/forge-gui/src/main/java/forge/util/LineReader.java +++ b/forge-gui/src/main/java/forge/util/LineReader.java @@ -21,11 +21,8 @@ package forge.util; * TODO: Write javadoc for this type. * */ -import java.io.BufferedReader; -import java.io.Closeable; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; + +import java.io.*; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; diff --git a/forge-gui/src/main/java/forge/util/NameGenerator.java b/forge-gui/src/main/java/forge/util/NameGenerator.java index 4f4d0a000f2..9afa734cad9 100644 --- a/forge-gui/src/main/java/forge/util/NameGenerator.java +++ b/forge-gui/src/main/java/forge/util/NameGenerator.java @@ -1,13 +1,13 @@ /** Random name generator for Forge. */ package forge.util; +import org.apache.commons.lang3.ArrayUtils; + import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Random; -import org.apache.commons.lang3.ArrayUtils; - /** * @author Marc * diff --git a/forge-gui/src/main/java/forge/util/XmlUtil.java b/forge-gui/src/main/java/forge/util/XmlUtil.java index 33aec1ca9ef..29efd1f9f76 100644 --- a/forge-gui/src/main/java/forge/util/XmlUtil.java +++ b/forge-gui/src/main/java/forge/util/XmlUtil.java @@ -17,7 +17,7 @@ */ package forge.util; -import java.io.StringWriter; +import org.w3c.dom.Node; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; @@ -25,8 +25,7 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; - -import org.w3c.dom.Node; +import java.io.StringWriter; /** * TODO: Write javadoc for this type. diff --git a/forge-gui/src/main/java/forge/view/ButtonUtil.java b/forge-gui/src/main/java/forge/view/ButtonUtil.java index 91dc3f2f17b..e32dcafafdd 100644 --- a/forge-gui/src/main/java/forge/view/ButtonUtil.java +++ b/forge-gui/src/main/java/forge/view/ButtonUtil.java @@ -17,12 +17,12 @@ */ package forge.view; -import javax.swing.JButton; - import forge.FThreads; import forge.gui.SOverlayUtils; import forge.gui.match.VMatchUI; +import javax.swing.*; + /** * Manages match UI OK/Cancel button enabling and focus */ diff --git a/forge-gui/src/main/java/forge/view/CardReaderExperiments.java b/forge-gui/src/main/java/forge/view/CardReaderExperiments.java index 262108b681e..423f85bc7d2 100644 --- a/forge-gui/src/main/java/forge/view/CardReaderExperiments.java +++ b/forge-gui/src/main/java/forge/view/CardReaderExperiments.java @@ -1,21 +1,17 @@ package forge.view; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import forge.CardStorageReader; import forge.card.CardRules; import forge.properties.NewConstants; import forge.util.FileUtil; +import java.io.*; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public class CardReaderExperiments { //utility functions to parse all cards and perform certain actions on each card diff --git a/forge-gui/src/main/java/forge/view/FDialog.java b/forge-gui/src/main/java/forge/view/FDialog.java index 82865f2bb15..eff8eeabd9b 100644 --- a/forge-gui/src/main/java/forge/view/FDialog.java +++ b/forge-gui/src/main/java/forge/view/FDialog.java @@ -1,36 +1,5 @@ package forge.view; -import java.awt.Component; -import java.awt.Container; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.GraphicsDevice; -import java.awt.GraphicsEnvironment; -import java.awt.Image; -import java.awt.KeyEventDispatcher; -import java.awt.KeyboardFocusManager; -import java.awt.Point; -import java.awt.PopupMenu; -import java.awt.RenderingHints; -import java.awt.Toolkit; -import java.awt.GraphicsDevice.WindowTranslucency; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; -import java.awt.event.WindowEvent; -import java.awt.event.WindowFocusListener; -import java.awt.geom.RoundRectangle2D; -import java.util.Stack; - -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.SwingUtilities; - -import net.miginfocom.swing.MigLayout; import forge.Singletons; import forge.gui.toolbox.FMouseAdapter; import forge.gui.toolbox.FPanel; @@ -38,6 +7,14 @@ import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinnedDialog; import forge.util.OperatingSystem; +import net.miginfocom.swing.MigLayout; + +import javax.swing.*; +import java.awt.*; +import java.awt.GraphicsDevice.WindowTranslucency; +import java.awt.event.*; +import java.awt.geom.RoundRectangle2D; +import java.util.Stack; @SuppressWarnings("serial") public class FDialog extends SkinnedDialog implements ITitleBarOwner, KeyEventDispatcher { diff --git a/forge-gui/src/main/java/forge/view/FFrame.java b/forge-gui/src/main/java/forge/view/FFrame.java index f0bf19c0fe3..5168233aa36 100644 --- a/forge-gui/src/main/java/forge/view/FFrame.java +++ b/forge-gui/src/main/java/forge/view/FFrame.java @@ -1,24 +1,5 @@ package forge.view; -import java.awt.Color; -import java.awt.Cursor; -import java.awt.Dimension; -import java.awt.Frame; -import java.awt.Image; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.event.WindowStateListener; - -import javax.swing.BorderFactory; -import javax.swing.JRootPane; -import javax.swing.SwingUtilities; -import javax.swing.border.Border; - import forge.Singletons; import forge.gui.framework.SDisplayUtil; import forge.gui.framework.SResizingUtil; @@ -30,6 +11,11 @@ import forge.gui.toolbox.FSkin.SkinnedFrame; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import javax.swing.border.Border; +import java.awt.*; +import java.awt.event.*; + @SuppressWarnings("serial") public class FFrame extends SkinnedFrame implements ITitleBarOwner { private static final int borderThickness = 3; diff --git a/forge-gui/src/main/java/forge/view/FNavigationBar.java b/forge-gui/src/main/java/forge/view/FNavigationBar.java index 967b964351e..9fffe785331 100644 --- a/forge-gui/src/main/java/forge/view/FNavigationBar.java +++ b/forge-gui/src/main/java/forge/view/FNavigationBar.java @@ -1,28 +1,5 @@ package forge.view; -import java.awt.BasicStroke; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.MouseInfo; -import java.awt.Rectangle; -import java.awt.RenderingHints; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.ArrayList; - -import javax.swing.Icon; -import javax.swing.ImageIcon; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.SpringLayout; -import javax.swing.SwingUtilities; -import javax.swing.Timer; -import javax.swing.border.EmptyBorder; - import forge.Singletons; import forge.gui.framework.FScreen; import forge.gui.framework.ILocalRepaint; @@ -36,6 +13,15 @@ import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.properties.ForgePreferences.FPref; import forge.util.ReflectionUtil; +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.ArrayList; + @SuppressWarnings("serial") public class FNavigationBar extends FTitleBarBase { diff --git a/forge-gui/src/main/java/forge/view/FTitleBar.java b/forge-gui/src/main/java/forge/view/FTitleBar.java index c68aaa75855..24b24d979b9 100644 --- a/forge-gui/src/main/java/forge/view/FTitleBar.java +++ b/forge-gui/src/main/java/forge/view/FTitleBar.java @@ -1,15 +1,11 @@ package forge.view; -import java.awt.Dimension; -import java.awt.Image; - -import javax.swing.ImageIcon; -import javax.swing.JOptionPane; -import javax.swing.SpringLayout; - import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinnedLabel; +import javax.swing.*; +import java.awt.*; + @SuppressWarnings("serial") public class FTitleBar extends FTitleBarBase { private static final FSkin.SkinFont skinFont = FSkin.getFont(12); diff --git a/forge-gui/src/main/java/forge/view/FTitleBarBase.java b/forge-gui/src/main/java/forge/view/FTitleBarBase.java index 6964e600ab7..e1cd133cf08 100644 --- a/forge-gui/src/main/java/forge/view/FTitleBarBase.java +++ b/forge-gui/src/main/java/forge/view/FTitleBarBase.java @@ -1,21 +1,5 @@ package forge.view; -import java.awt.BasicStroke; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.RenderingHints; -import java.awt.Toolkit; -import java.awt.Window; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowEvent; - -import javax.swing.SpringLayout; -import javax.swing.SwingUtilities; - import forge.gui.framework.ILocalRepaint; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.Colors; @@ -23,6 +7,12 @@ import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.gui.toolbox.FSkin.SkinnedMenuBar; +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowEvent; + @SuppressWarnings("serial") public abstract class FTitleBarBase extends SkinnedMenuBar { protected static final int visibleHeight = 27; diff --git a/forge-gui/src/main/java/forge/view/FView.java b/forge-gui/src/main/java/forge/view/FView.java index 591e3e3727a..3bff88c9ee5 100644 --- a/forge-gui/src/main/java/forge/view/FView.java +++ b/forge-gui/src/main/java/forge/view/FView.java @@ -1,35 +1,6 @@ package forge.view; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import java.util.ArrayList; -import java.util.Deque; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -import javax.swing.JLayeredPane; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JTextArea; -import javax.swing.SwingUtilities; -import javax.swing.WindowConstants; -import javax.swing.border.EmptyBorder; -import javax.swing.border.LineBorder; - -import net.miginfocom.swing.MigLayout; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.collect.Lists; - import forge.Singletons; import forge.control.RestartUtil; import forge.gui.FNetOverlay; @@ -37,26 +8,26 @@ import forge.gui.ImportDialog; import forge.gui.SOverlayUtils; import forge.gui.bazaar.VBazaarUI; import forge.gui.deckeditor.VDeckEditorUI; -import forge.gui.framework.DragCell; -import forge.gui.framework.EDocID; -import forge.gui.framework.FScreen; -import forge.gui.framework.SLayoutConstants; -import forge.gui.framework.SLayoutIO; +import forge.gui.framework.*; import forge.gui.home.VHomeUI; import forge.gui.match.TargetingOverlay; import forge.gui.match.VMatchUI; -import forge.gui.toolbox.CardFaceSymbols; -import forge.gui.toolbox.FAbsolutePositioner; -import forge.gui.toolbox.FButton; -import forge.gui.toolbox.FLabel; -import forge.gui.toolbox.FOverlay; -import forge.gui.toolbox.FPanel; -import forge.gui.toolbox.FProgressBar; -import forge.gui.toolbox.FScrollPane; -import forge.gui.toolbox.FSkin; +import forge.gui.toolbox.*; import forge.gui.toolbox.FSkin.SkinnedLayeredPane; import forge.properties.NewConstants; import forge.util.BuildInfo; +import net.miginfocom.swing.MigLayout; +import org.apache.commons.lang3.StringUtils; + +import javax.swing.*; +import javax.swing.border.EmptyBorder; +import javax.swing.border.LineBorder; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; +import java.util.*; +import java.util.List; public enum FView { SINGLETON_INSTANCE; diff --git a/forge-gui/src/main/java/forge/view/ITitleBarOwner.java b/forge-gui/src/main/java/forge/view/ITitleBarOwner.java index 05c33af2265..c408ca36f1f 100644 --- a/forge-gui/src/main/java/forge/view/ITitleBarOwner.java +++ b/forge-gui/src/main/java/forge/view/ITitleBarOwner.java @@ -1,8 +1,7 @@ package forge.view; -import java.awt.Image; - -import javax.swing.JMenuBar; +import javax.swing.*; +import java.awt.*; public interface ITitleBarOwner { boolean isMinimized(); diff --git a/forge-gui/src/main/java/forge/view/SplashFrame.java b/forge-gui/src/main/java/forge/view/SplashFrame.java index 22be1ccbf51..55d8c4bb01b 100644 --- a/forge-gui/src/main/java/forge/view/SplashFrame.java +++ b/forge-gui/src/main/java/forge/view/SplashFrame.java @@ -17,24 +17,6 @@ */ package forge.view; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.event.ActionEvent; -import java.awt.event.MouseAdapter; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.KeyStroke; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import javax.swing.UIManager; - import forge.gui.toolbox.FProgressBar; import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinIcon; @@ -42,6 +24,11 @@ import forge.gui.toolbox.FSkin.SkinnedLabel; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; + /** * Shows the splash frame as the application starts. */ diff --git a/forge-gui/src/main/java/forge/view/arcane/CardArea.java b/forge-gui/src/main/java/forge/view/arcane/CardArea.java index 361d7ae6847..37d4d6a71ac 100644 --- a/forge-gui/src/main/java/forge/view/arcane/CardArea.java +++ b/forge-gui/src/main/java/forge/view/arcane/CardArea.java @@ -17,22 +17,14 @@ */ package forge.view.arcane; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Insets; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.event.MouseEvent; - -import javax.swing.JFrame; -import javax.swing.JLayeredPane; -import javax.swing.SwingUtilities; - import forge.gui.toolbox.FScrollPane; import forge.view.arcane.util.Animation; import forge.view.arcane.util.CardPanelMouseListener; +import javax.swing.*; +import java.awt.*; +import java.awt.event.MouseEvent; + /** *

diff --git a/forge-gui/src/main/java/forge/view/arcane/CardPanel.java b/forge-gui/src/main/java/forge/view/arcane/CardPanel.java index 75cf7398f0d..aca1a8fd518 100644 --- a/forge-gui/src/main/java/forge/view/arcane/CardPanel.java +++ b/forge-gui/src/main/java/forge/view/arcane/CardPanel.java @@ -17,23 +17,6 @@ */ package forge.view.arcane; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.RenderingHints; -import java.awt.event.ComponentAdapter; -import java.awt.event.ComponentEvent; -import java.awt.image.BufferedImage; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.JRootPane; -import javax.swing.SwingUtilities; - import forge.ImageCache; import forge.Singletons; import forge.card.CardCharacteristicName; @@ -50,6 +33,14 @@ import forge.gui.toolbox.IDisposable; import forge.properties.ForgePreferences.FPref; import forge.view.arcane.util.OutlinedLabel; +import javax.swing.*; +import java.awt.*; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.image.BufferedImage; +import java.util.ArrayList; +import java.util.List; + /** *

* CardPanel class. diff --git a/forge-gui/src/main/java/forge/view/arcane/CardPanelContainer.java b/forge-gui/src/main/java/forge/view/arcane/CardPanelContainer.java index a073dd4feb7..1360c4d41b6 100644 --- a/forge-gui/src/main/java/forge/view/arcane/CardPanelContainer.java +++ b/forge-gui/src/main/java/forge/view/arcane/CardPanelContainer.java @@ -17,18 +17,6 @@ */ package forge.view.arcane; -import java.awt.Dimension; -import java.awt.Rectangle; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionListener; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; -import java.util.ArrayList; -import java.util.List; - -import javax.swing.SwingUtilities; - import forge.Constant; import forge.FThreads; import forge.game.card.Card; @@ -38,6 +26,12 @@ import forge.gui.toolbox.FSkin.SkinnedPanel; import forge.gui.toolbox.special.CardZoomer; import forge.view.arcane.util.CardPanelMouseListener; +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; +import java.util.ArrayList; +import java.util.List; + /** * Manages mouse events and common functionality for CardPanel containing * components. diff --git a/forge-gui/src/main/java/forge/view/arcane/HandArea.java b/forge-gui/src/main/java/forge/view/arcane/HandArea.java index 31d12a4798c..4e1127d9c0e 100644 --- a/forge-gui/src/main/java/forge/view/arcane/HandArea.java +++ b/forge-gui/src/main/java/forge/view/arcane/HandArea.java @@ -17,12 +17,12 @@ */ package forge.view.arcane; -import java.awt.event.MouseEvent; - import forge.gui.match.CMatchUI; import forge.gui.match.controllers.CPrompt; import forge.gui.toolbox.FScrollPane; +import java.awt.event.MouseEvent; + /** *

diff --git a/forge-gui/src/main/java/forge/view/arcane/PlayArea.java b/forge-gui/src/main/java/forge/view/arcane/PlayArea.java index a8e021444f1..16fe41aad50 100644 --- a/forge-gui/src/main/java/forge/view/arcane/PlayArea.java +++ b/forge-gui/src/main/java/forge/view/arcane/PlayArea.java @@ -17,14 +17,6 @@ */ package forge.view.arcane; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Rectangle; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import forge.FThreads; import forge.game.card.Card; import forge.gui.match.CMatchUI; @@ -33,6 +25,12 @@ import forge.gui.toolbox.FScrollPane; import forge.view.arcane.util.Animation; import forge.view.arcane.util.CardPanelMouseListener; +import java.awt.*; +import java.awt.event.MouseEvent; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + /** *

* PlayArea class. diff --git a/forge-gui/src/main/java/forge/view/arcane/ScaledImagePanel.java b/forge-gui/src/main/java/forge/view/arcane/ScaledImagePanel.java index 1f1bdee194e..40e13b9148f 100644 --- a/forge-gui/src/main/java/forge/view/arcane/ScaledImagePanel.java +++ b/forge-gui/src/main/java/forge/view/arcane/ScaledImagePanel.java @@ -17,12 +17,10 @@ */ package forge.view.arcane; -import java.awt.Dimension; -import java.awt.Graphics; +import javax.swing.*; +import java.awt.*; import java.awt.image.BufferedImage; -import javax.swing.JPanel; - /** *

* ScaledImagePanel class. diff --git a/forge-gui/src/main/java/forge/view/arcane/ViewPanel.java b/forge-gui/src/main/java/forge/view/arcane/ViewPanel.java index ff1e6ddbc95..afff5bb62dc 100644 --- a/forge-gui/src/main/java/forge/view/arcane/ViewPanel.java +++ b/forge-gui/src/main/java/forge/view/arcane/ViewPanel.java @@ -17,9 +17,8 @@ */ package forge.view.arcane; -import java.awt.BorderLayout; - -import javax.swing.JPanel; +import javax.swing.*; +import java.awt.*; /** *

diff --git a/forge-gui/src/main/java/forge/view/arcane/util/Animation.java b/forge-gui/src/main/java/forge/view/arcane/util/Animation.java index 97140d95359..31781f53cb3 100644 --- a/forge-gui/src/main/java/forge/view/arcane/util/Animation.java +++ b/forge-gui/src/main/java/forge/view/arcane/util/Animation.java @@ -17,18 +17,13 @@ */ package forge.view.arcane.util; -import java.awt.Container; -import java.awt.EventQueue; -import java.awt.Frame; -import java.awt.Point; +import forge.view.arcane.CardPanel; + +import javax.swing.*; +import java.awt.*; import java.util.Timer; import java.util.TimerTask; -import javax.swing.JLayeredPane; -import javax.swing.SwingUtilities; - -import forge.view.arcane.CardPanel; - /** *

diff --git a/forge-gui/src/main/java/forge/view/arcane/util/CardPanelMouseAdapter.java b/forge-gui/src/main/java/forge/view/arcane/util/CardPanelMouseAdapter.java index 3094ffc7f4c..fb79db51c7a 100644 --- a/forge-gui/src/main/java/forge/view/arcane/util/CardPanelMouseAdapter.java +++ b/forge-gui/src/main/java/forge/view/arcane/util/CardPanelMouseAdapter.java @@ -1,9 +1,9 @@ package forge.view.arcane.util; -import java.awt.event.MouseEvent; - import forge.view.arcane.CardPanel; +import java.awt.event.MouseEvent; + public abstract class CardPanelMouseAdapter implements CardPanelMouseListener { @Override public void mouseOver(CardPanel panel, MouseEvent evt) { diff --git a/forge-gui/src/main/java/forge/view/arcane/util/CardPanelMouseListener.java b/forge-gui/src/main/java/forge/view/arcane/util/CardPanelMouseListener.java index 283b64ad287..3fe4c9898c2 100644 --- a/forge-gui/src/main/java/forge/view/arcane/util/CardPanelMouseListener.java +++ b/forge-gui/src/main/java/forge/view/arcane/util/CardPanelMouseListener.java @@ -18,10 +18,10 @@ package forge.view.arcane.util; -import java.awt.event.MouseEvent; - import forge.view.arcane.CardPanel; +import java.awt.event.MouseEvent; + /** *

CardPanelMouseListener interface.

* diff --git a/forge-gui/src/main/java/forge/view/arcane/util/OutlinedLabel.java b/forge-gui/src/main/java/forge/view/arcane/util/OutlinedLabel.java index d27ca408adc..8fe89fde018 100644 --- a/forge-gui/src/main/java/forge/view/arcane/util/OutlinedLabel.java +++ b/forge-gui/src/main/java/forge/view/arcane/util/OutlinedLabel.java @@ -17,12 +17,8 @@ */ package forge.view.arcane.util; -import java.awt.AlphaComposite; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.RenderingHints; +import javax.swing.*; +import java.awt.*; import java.awt.font.FontRenderContext; import java.awt.font.LineBreakMeasurer; import java.awt.font.TextAttribute; @@ -32,8 +28,6 @@ import java.text.AttributedString; import java.text.BreakIterator; import java.util.Locale; -import javax.swing.JLabel; - /** *

* GlowText class. diff --git a/forge-gui/src/test/java/forge/BoosterDraft1Test.java b/forge-gui/src/test/java/forge/BoosterDraft1Test.java index d2765a8b056..be33900f72d 100644 --- a/forge-gui/src/test/java/forge/BoosterDraft1Test.java +++ b/forge-gui/src/test/java/forge/BoosterDraft1Test.java @@ -1,10 +1,9 @@ package forge; -import org.testng.annotations.Test; - import forge.deck.CardPool; import forge.limited.BoosterDraft; import forge.limited.LimitedPoolType; +import org.testng.annotations.Test; /** * Unit test for simple App. diff --git a/forge-gui/src/test/java/forge/BoosterDraftTest.java b/forge-gui/src/test/java/forge/BoosterDraftTest.java index 32cc6728e9a..003d6d747c6 100644 --- a/forge-gui/src/test/java/forge/BoosterDraftTest.java +++ b/forge-gui/src/test/java/forge/BoosterDraftTest.java @@ -1,9 +1,5 @@ package forge; -import java.util.List; - -import org.testng.annotations.Test; - import forge.card.BoosterGenerator; import forge.deck.CardPool; import forge.deck.Deck; @@ -11,6 +7,9 @@ import forge.game.card.Card; import forge.item.PaperCard; import forge.item.SealedProduct; import forge.limited.IBoosterDraft; +import org.testng.annotations.Test; + +import java.util.List; /** *

diff --git a/forge-gui/src/test/java/forge/GuiDownloadPicturesLQTest.java b/forge-gui/src/test/java/forge/GuiDownloadPicturesLQTest.java index 311bbbc411b..81fd17cba35 100644 --- a/forge-gui/src/test/java/forge/GuiDownloadPicturesLQTest.java +++ b/forge-gui/src/test/java/forge/GuiDownloadPicturesLQTest.java @@ -1,8 +1,7 @@ package forge; -import org.testng.annotations.Test; - import forge.gui.download.GuiDownloadPicturesLQ; +import org.testng.annotations.Test; /** * Created by IntelliJ IDEA. User: dhudson diff --git a/forge-gui/src/test/java/forge/GuiDownloadSetPicturesLQTest.java b/forge-gui/src/test/java/forge/GuiDownloadSetPicturesLQTest.java index 5f0e95ddeb4..755b6297b6f 100644 --- a/forge-gui/src/test/java/forge/GuiDownloadSetPicturesLQTest.java +++ b/forge-gui/src/test/java/forge/GuiDownloadSetPicturesLQTest.java @@ -1,8 +1,7 @@ package forge; -import org.testng.annotations.Test; - import forge.gui.download.GuiDownloadSetPicturesLQ; +import org.testng.annotations.Test; /** * Created by IntelliJ IDEA. User: dhudson diff --git a/forge-gui/src/test/java/forge/GuiProgressBarWindowTest.java b/forge-gui/src/test/java/forge/GuiProgressBarWindowTest.java index 5ea68d03131..7dfaaba0a74 100644 --- a/forge-gui/src/test/java/forge/GuiProgressBarWindowTest.java +++ b/forge-gui/src/test/java/forge/GuiProgressBarWindowTest.java @@ -1,11 +1,10 @@ package forge; -import javax.swing.WindowConstants; - +import forge.gui.GuiProgressBarWindow; import org.testng.Assert; import org.testng.annotations.Test; -import forge.gui.GuiProgressBarWindow; +import javax.swing.*; /** * Created by IntelliJ IDEA. User: dhudson diff --git a/forge-gui/src/test/java/forge/PanelTest.java b/forge-gui/src/test/java/forge/PanelTest.java index 86985968732..d751d240a4e 100644 --- a/forge-gui/src/test/java/forge/PanelTest.java +++ b/forge-gui/src/test/java/forge/PanelTest.java @@ -1,15 +1,10 @@ package forge; -import java.awt.Color; -import java.awt.Rectangle; - -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JPanel; - +import forge.error.BugReporter; import org.testng.annotations.Test; -import forge.error.BugReporter; +import javax.swing.*; +import java.awt.*; /** *

diff --git a/forge-gui/src/test/java/forge/RunTest.java b/forge-gui/src/test/java/forge/RunTest.java index 67a8dfceb66..118037139df 100644 --- a/forge-gui/src/test/java/forge/RunTest.java +++ b/forge-gui/src/test/java/forge/RunTest.java @@ -1,9 +1,8 @@ package forge; -import org.testng.annotations.Test; - import forge.game.card.Card; import forge.game.combat.CombatUtil; +import org.testng.annotations.Test; /** *

diff --git a/forge-gui/src/test/java/forge/deck/generate/Generate2ColorDeckTest.java b/forge-gui/src/test/java/forge/deck/generate/Generate2ColorDeckTest.java index 428fe152189..a0259529f6f 100644 --- a/forge-gui/src/test/java/forge/deck/generate/Generate2ColorDeckTest.java +++ b/forge-gui/src/test/java/forge/deck/generate/Generate2ColorDeckTest.java @@ -1,13 +1,12 @@ package forge.deck.generate; -import org.testng.Assert; -import org.testng.annotations.Test; - import forge.Singletons; import forge.card.CardDb; import forge.deck.generation.DeckGenerator2Color; import forge.item.PaperCard; import forge.util.ItemPool; +import org.testng.Assert; +import org.testng.annotations.Test; /** * Created by IntelliJ IDEA. User: dhudson diff --git a/forge-gui/src/test/java/forge/deck/generate/Generate3ColorDeckTest.java b/forge-gui/src/test/java/forge/deck/generate/Generate3ColorDeckTest.java index c7022590e95..de3e6fdb2c1 100644 --- a/forge-gui/src/test/java/forge/deck/generate/Generate3ColorDeckTest.java +++ b/forge-gui/src/test/java/forge/deck/generate/Generate3ColorDeckTest.java @@ -1,12 +1,11 @@ package forge.deck.generate; -import org.testng.Assert; -import org.testng.annotations.Test; - import forge.Singletons; import forge.card.CardDb; import forge.deck.CardPool; import forge.deck.generation.DeckGenerator3Color; +import org.testng.Assert; +import org.testng.annotations.Test; /** * Created by IntelliJ IDEA. User: dhudson diff --git a/forge-gui/src/test/java/forge/deck/generate/Generate5ColorDeckTest.java b/forge-gui/src/test/java/forge/deck/generate/Generate5ColorDeckTest.java index e1b71c18f33..f228c87de79 100644 --- a/forge-gui/src/test/java/forge/deck/generate/Generate5ColorDeckTest.java +++ b/forge-gui/src/test/java/forge/deck/generate/Generate5ColorDeckTest.java @@ -1,12 +1,11 @@ package forge.deck.generate; -import org.testng.Assert; -import org.testng.annotations.Test; - import forge.Singletons; import forge.card.CardDb; import forge.deck.CardPool; import forge.deck.generation.DeckGenerator5Color; +import org.testng.Assert; +import org.testng.annotations.Test; /** * Created by IntelliJ IDEA. User: dhudson diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/BaseGameSimulationTest.java b/forge-gui/src/test/java/forge/gamesimulationtests/BaseGameSimulationTest.java index 2419cb966e9..a7a97e21338 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/BaseGameSimulationTest.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/BaseGameSimulationTest.java @@ -1,14 +1,5 @@ package forge.gamesimulationtests; -import javax.imageio.ImageIO; - -import org.powermock.api.mockito.PowerMockito; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.testng.PowerMockTestCase; -import org.testng.Assert; -import org.testng.IObjectFactory; -import org.testng.annotations.ObjectFactory; - import forge.ImageCache; import forge.Singletons; import forge.gamesimulationtests.util.CardDatabaseHelper; @@ -18,6 +9,14 @@ import forge.gamesimulationtests.util.player.PlayerSpecificationHandler; import forge.gamesimulationtests.util.playeractions.testactions.AssertAction; import forge.model.FModel; import forge.properties.ForgePreferences; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.testng.PowerMockTestCase; +import org.testng.Assert; +import org.testng.IObjectFactory; +import org.testng.annotations.ObjectFactory; + +import javax.imageio.ImageIO; @PrepareForTest( value = { FModel.class, Singletons.class, ImageCache.class, ImageIO.class } ) public class BaseGameSimulationTest extends PowerMockTestCase { diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/comprehensiverules/ComprehensiveRulesSection103.java b/forge-gui/src/test/java/forge/gamesimulationtests/comprehensiverules/ComprehensiveRulesSection103.java index ee72492d248..f7e25f40c46 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/comprehensiverules/ComprehensiveRulesSection103.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/comprehensiverules/ComprehensiveRulesSection103.java @@ -1,7 +1,5 @@ package forge.gamesimulationtests.comprehensiverules; -import org.testng.annotations.Test; - import forge.game.phase.PhaseType; import forge.gamesimulationtests.BaseGameSimulationTest; import forge.gamesimulationtests.util.GameWrapper; @@ -14,6 +12,7 @@ import forge.gamesimulationtests.util.playeractions.PlayerActions; import forge.gamesimulationtests.util.playeractions.testactions.CardAssertAction; import forge.gamesimulationtests.util.playeractions.testactions.EndTestAction; import forge.gamesimulationtests.util.playeractions.testactions.PlayerAssertAction; +import org.testng.annotations.Test; public class ComprehensiveRulesSection103 extends BaseGameSimulationTest { @Test diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/comprehensiverules/ComprehensiveRulesSection104.java b/forge-gui/src/test/java/forge/gamesimulationtests/comprehensiverules/ComprehensiveRulesSection104.java index 6509bb6a6ca..0cfd9c447c8 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/comprehensiverules/ComprehensiveRulesSection104.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/comprehensiverules/ComprehensiveRulesSection104.java @@ -1,7 +1,5 @@ package forge.gamesimulationtests.comprehensiverules; -import org.testng.annotations.Test; - import forge.game.phase.PhaseType; import forge.gamesimulationtests.BaseGameSimulationTest; import forge.gamesimulationtests.util.GameWrapper; @@ -9,15 +7,11 @@ import forge.gamesimulationtests.util.card.CardSpecificationBuilder; import forge.gamesimulationtests.util.gamestate.GameStateSpecificationBuilder; import forge.gamesimulationtests.util.player.PlayerSpecification; import forge.gamesimulationtests.util.player.PlayerSpecificationBuilder; -import forge.gamesimulationtests.util.playeractions.ActionPreCondition; -import forge.gamesimulationtests.util.playeractions.ActivateAbilityAction; -import forge.gamesimulationtests.util.playeractions.CastSpellFromHandAction; -import forge.gamesimulationtests.util.playeractions.DeclareAttackersAction; -import forge.gamesimulationtests.util.playeractions.DeclareBlockersAction; -import forge.gamesimulationtests.util.playeractions.PlayerActions; +import forge.gamesimulationtests.util.playeractions.*; import forge.gamesimulationtests.util.playeractions.testactions.CardAssertAction; import forge.gamesimulationtests.util.playeractions.testactions.EndTestAction; import forge.gamesimulationtests.util.playeractions.testactions.PlayerAssertAction; +import org.testng.annotations.Test; public class ComprehensiveRulesSection104 extends BaseGameSimulationTest { @Test diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/GameWrapper.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/GameWrapper.java index 5a7b360d514..bb41fe33023 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/GameWrapper.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/GameWrapper.java @@ -1,22 +1,8 @@ package forge.gamesimulationtests.util; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - import forge.Singletons; import forge.deck.Deck; -import forge.game.Game; -import forge.game.GameLog; -import forge.game.GameLogEntry; -import forge.game.GameLogEntryType; -import forge.game.GameLogFormatter; -import forge.game.GameRules; -import forge.game.GameStage; -import forge.game.GameType; -import forge.game.Match; +import forge.game.*; import forge.game.card.Card; import forge.game.event.GameEventGameFinished; import forge.game.player.Player; @@ -35,6 +21,8 @@ import forge.gamesimulationtests.util.playeractions.PlayerActions; import forge.item.PaperCard; import forge.properties.ForgePreferences.FPref; +import java.util.*; + public class GameWrapper { private final List players; private final GameStateSpecification initialGameStateSpecification; diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java index 85ac58215fa..1c9099896c7 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java @@ -1,15 +1,14 @@ package forge.gamesimulationtests.util; -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; - import forge.game.Game; import forge.game.player.LobbyPlayer; import forge.game.player.Player; import forge.game.player.PlayerController; import forge.gamesimulationtests.util.playeractions.PlayerActions; +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; /** * Default harmless implementation for tests. diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java index d3a77ac0e67..d3d9d682f64 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java @@ -1,20 +1,8 @@ package forge.gamesimulationtests.util; -import java.awt.event.MouseEvent; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; - import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Multimap; - import forge.ai.ComputerUtil; import forge.ai.ComputerUtilMana; import forge.ai.ability.ChangeZoneAi; @@ -40,17 +28,12 @@ import forge.game.cost.CostPart; import forge.game.cost.CostPartMana; import forge.game.cost.PaymentDecision; import forge.game.mana.Mana; -import forge.gui.player.HumanPlay; import forge.game.player.LobbyPlayer; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; import forge.game.player.PlayerController; import forge.game.replacement.ReplacementEffect; -import forge.game.spellability.AbilitySub; -import forge.game.spellability.Spell; -import forge.game.spellability.SpellAbility; -import forge.game.spellability.SpellAbilityStackInstance; -import forge.game.spellability.TargetChoices; +import forge.game.spellability.*; import forge.game.trigger.Trigger; import forge.game.trigger.WrappedAbility; import forge.game.zone.ZoneType; @@ -58,13 +41,15 @@ import forge.gamesimulationtests.util.card.CardSpecification; import forge.gamesimulationtests.util.card.CardSpecificationHandler; import forge.gamesimulationtests.util.player.PlayerSpecification; import forge.gamesimulationtests.util.player.PlayerSpecificationHandler; -import forge.gamesimulationtests.util.playeractions.ActivateAbilityAction; -import forge.gamesimulationtests.util.playeractions.CastSpellFromHandAction; -import forge.gamesimulationtests.util.playeractions.DeclareAttackersAction; -import forge.gamesimulationtests.util.playeractions.DeclareBlockersAction; -import forge.gamesimulationtests.util.playeractions.PlayerActions; +import forge.gamesimulationtests.util.playeractions.*; +import forge.gui.player.HumanPlay; import forge.item.PaperCard; import forge.util.MyRandom; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + +import java.awt.event.MouseEvent; +import java.util.*; /** * Default harmless implementation for tests. diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java index 3248503dab7..8db50727e65 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/SpecificationHandler.java @@ -1,12 +1,11 @@ package forge.gamesimulationtests.util; +import com.google.common.collect.Iterables; +import org.apache.commons.lang3.StringUtils; + import java.util.ArrayList; import java.util.Collection; -import org.apache.commons.lang3.StringUtils; - -import com.google.common.collect.Iterables; - public abstract class SpecificationHandler> { public final TYPE find( Collection items, final SPECIFICATION specification ) { return find( items, specification, IntegerConstraint.ONE ); diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/card/CardSpecificationBuilder.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/card/CardSpecificationBuilder.java index 359665a469b..63670f23675 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/card/CardSpecificationBuilder.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/card/CardSpecificationBuilder.java @@ -1,9 +1,8 @@ package forge.gamesimulationtests.util.card; -import org.apache.commons.lang3.StringUtils; - import forge.game.zone.ZoneType; import forge.gamesimulationtests.util.player.PlayerSpecification; +import org.apache.commons.lang3.StringUtils; public class CardSpecificationBuilder { private final String name; diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/card/CardSpecificationHandler.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/card/CardSpecificationHandler.java index 0983452eab4..ca0a7162967 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/card/CardSpecificationHandler.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/card/CardSpecificationHandler.java @@ -1,7 +1,5 @@ package forge.gamesimulationtests.util.card; -import java.util.List; - import forge.game.Game; import forge.game.card.Card; import forge.gamesimulationtests.util.IntegerConstraint; @@ -9,6 +7,8 @@ import forge.gamesimulationtests.util.SpecificationHandler; import forge.gamesimulationtests.util.player.PlayerSpecification; import forge.gamesimulationtests.util.player.PlayerSpecificationHandler; +import java.util.List; + public class CardSpecificationHandler extends SpecificationHandler { public static final CardSpecificationHandler INSTANCE = new CardSpecificationHandler(); diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecification.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecification.java index a437d0bfb0d..b84ebd05ec6 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecification.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecification.java @@ -1,12 +1,12 @@ package forge.gamesimulationtests.util.gamestate; +import forge.gamesimulationtests.util.card.CardSpecification; +import forge.gamesimulationtests.util.player.PlayerSpecification; + import java.util.Collection; import java.util.List; import java.util.Map; -import forge.gamesimulationtests.util.card.CardSpecification; -import forge.gamesimulationtests.util.player.PlayerSpecification; - public class GameStateSpecification { private final List cards; private final Map playerFacts; diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecificationBuilder.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecificationBuilder.java index 76819fb6b60..2ad376bf5c1 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecificationBuilder.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/gamestate/GameStateSpecificationBuilder.java @@ -1,16 +1,12 @@ package forge.gamesimulationtests.util.gamestate; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import forge.gamesimulationtests.util.card.CardSpecification; import forge.gamesimulationtests.util.card.CardSpecificationBuilder; import forge.gamesimulationtests.util.player.PlayerSpecification; import forge.gamesimulationtests.util.player.PlayerSpecificationBuilder; +import java.util.*; + public class GameStateSpecificationBuilder { private final List cards; private final Map playerFacts; diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/ActivateAbilityAction.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/ActivateAbilityAction.java index 4a9eadfdb3d..39294020d6e 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/ActivateAbilityAction.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/ActivateAbilityAction.java @@ -1,7 +1,5 @@ package forge.gamesimulationtests.util.playeractions; -import java.util.List; - import forge.game.Game; import forge.game.card.Card; import forge.game.player.Player; @@ -10,6 +8,8 @@ import forge.gamesimulationtests.util.card.CardSpecification; import forge.gamesimulationtests.util.card.CardSpecificationHandler; import forge.gamesimulationtests.util.player.PlayerSpecification; +import java.util.List; + //TODO: almost everything (picking the right ability to activate, choosing targets, paying costs, ...) public class ActivateAbilityAction extends BasePlayerAction { private final CardSpecification cardWithAbility; diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/CastSpellFromHandAction.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/CastSpellFromHandAction.java index cc3d9852e80..6dad052bfc3 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/CastSpellFromHandAction.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/CastSpellFromHandAction.java @@ -1,7 +1,5 @@ package forge.gamesimulationtests.util.playeractions; -import java.util.List; - import forge.game.Game; import forge.game.card.Card; import forge.game.player.Player; @@ -9,6 +7,8 @@ import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; import forge.gamesimulationtests.util.player.PlayerSpecification; +import java.util.List; + /** * TODO: better rules compliance (sorcery speed stuff, paying mana, ...) */ diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareAttackersAction.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareAttackersAction.java index 9d904bbaa15..bf1018476ec 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareAttackersAction.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareAttackersAction.java @@ -1,11 +1,11 @@ package forge.gamesimulationtests.util.playeractions; -import java.util.HashMap; -import java.util.Map; - import forge.gamesimulationtests.util.card.CardSpecification; import forge.gamesimulationtests.util.player.PlayerSpecification; +import java.util.HashMap; +import java.util.Map; + public class DeclareAttackersAction extends BasePlayerAction { private final Map playerAttackAssignments; private final Map planeswalkerAttackAssignments; diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareBlockersAction.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareBlockersAction.java index fd22a919f3a..959052a34c1 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareBlockersAction.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/DeclareBlockersAction.java @@ -2,7 +2,6 @@ package forge.gamesimulationtests.util.playeractions; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; - import forge.gamesimulationtests.util.card.CardSpecification; import forge.gamesimulationtests.util.player.PlayerSpecification; diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/PlayerActions.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/PlayerActions.java index 1622d0d9628..3117868ea82 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/PlayerActions.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/PlayerActions.java @@ -1,15 +1,14 @@ package forge.gamesimulationtests.util.playeractions; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; - -import org.apache.commons.lang3.StringUtils; - import forge.game.Game; import forge.game.player.Player; import forge.gamesimulationtests.util.player.PlayerSpecificationHandler; import forge.gamesimulationtests.util.playeractions.testactions.TestAction; +import org.apache.commons.lang3.StringUtils; + +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; public class PlayerActions { private final List playerActions; diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/testactions/CardAssertAction.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/testactions/CardAssertAction.java index 31f8ad07ebb..a4d1b619ab0 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/testactions/CardAssertAction.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/testactions/CardAssertAction.java @@ -1,13 +1,12 @@ package forge.gamesimulationtests.util.playeractions.testactions; -import org.testng.Assert; - import forge.game.Game; import forge.game.card.Card; import forge.gamesimulationtests.util.IntegerConstraint; import forge.gamesimulationtests.util.card.CardSpecification; import forge.gamesimulationtests.util.card.CardSpecificationBuilder; import forge.gamesimulationtests.util.card.CardSpecificationHandler; +import org.testng.Assert; public class CardAssertAction extends AssertAction { private final CardSpecification cardRequirements; diff --git a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/testactions/PlayerAssertAction.java b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/testactions/PlayerAssertAction.java index 4bd78a6f125..a48afc75dc1 100644 --- a/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/testactions/PlayerAssertAction.java +++ b/forge-gui/src/test/java/forge/gamesimulationtests/util/playeractions/testactions/PlayerAssertAction.java @@ -1,13 +1,12 @@ package forge.gamesimulationtests.util.playeractions.testactions; -import org.testng.Assert; - import forge.game.Game; import forge.game.player.Player; import forge.gamesimulationtests.util.IntegerConstraint; import forge.gamesimulationtests.util.player.PlayerSpecification; import forge.gamesimulationtests.util.player.PlayerSpecificationBuilder; import forge.gamesimulationtests.util.player.PlayerSpecificationHandler; +import org.testng.Assert; public class PlayerAssertAction extends AssertAction { private final PlayerSpecification playerRequirements; diff --git a/forge-gui/src/test/java/forge/gui/ListChooserTest.java b/forge-gui/src/test/java/forge/gui/ListChooserTest.java index da5703b8c6a..945058620db 100644 --- a/forge-gui/src/test/java/forge/gui/ListChooserTest.java +++ b/forge-gui/src/test/java/forge/gui/ListChooserTest.java @@ -1,9 +1,9 @@ package forge.gui; -import java.util.Arrays; - import org.testng.annotations.Test; +import java.util.Arrays; + /** * Created by IntelliJ IDEA. User: dhudson */ diff --git a/forge-gui/src/test/java/forge/gui/game/CardDetailPanelTest.java b/forge-gui/src/test/java/forge/gui/game/CardDetailPanelTest.java index f8e6b000e5a..9463e0937c5 100644 --- a/forge-gui/src/test/java/forge/gui/game/CardDetailPanelTest.java +++ b/forge-gui/src/test/java/forge/gui/game/CardDetailPanelTest.java @@ -1,10 +1,9 @@ package forge.gui.game; +import forge.gui.CardDetailPanel; import org.testng.Assert; import org.testng.annotations.Test; -import forge.gui.CardDetailPanel; - /** * Created by IntelliJ IDEA. User: dhudson */ diff --git a/forge-gui/src/test/java/forge/item/DeckHintsTest.java b/forge-gui/src/test/java/forge/item/DeckHintsTest.java index 1094578f265..ebfa7b405e8 100644 --- a/forge-gui/src/test/java/forge/item/DeckHintsTest.java +++ b/forge-gui/src/test/java/forge/item/DeckHintsTest.java @@ -1,18 +1,16 @@ package forge.item; -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.Assert; - -import org.testng.annotations.Test; - import forge.card.CardRarity; import forge.card.CardRules; import forge.card.DeckHints; import forge.properties.NewConstants; import forge.util.FileUtil; +import junit.framework.Assert; +import org.testng.annotations.Test; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; /** * Tests for DeckHints. diff --git a/forge-gui/src/test/java/forge/model/FModelTest.java b/forge-gui/src/test/java/forge/model/FModelTest.java index 894fbc4f5af..8400b2e737d 100644 --- a/forge-gui/src/test/java/forge/model/FModelTest.java +++ b/forge-gui/src/test/java/forge/model/FModelTest.java @@ -1,15 +1,14 @@ package forge.model; -import java.io.FileNotFoundException; -import java.io.IOException; - +import forge.properties.ForgePreferences; +import forge.util.BuildInfo; import org.testng.Assert; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import forge.properties.ForgePreferences; -import forge.util.BuildInfo; +import java.io.FileNotFoundException; +import java.io.IOException; /** * Tests FModel. diff --git a/forge-net/src/main/java/forge/net/protocol/ClientProtocolJson.java b/forge-net/src/main/java/forge/net/protocol/ClientProtocolJson.java index ac566ccdbe4..7e9348bfe12 100644 --- a/forge-net/src/main/java/forge/net/protocol/ClientProtocolJson.java +++ b/forge-net/src/main/java/forge/net/protocol/ClientProtocolJson.java @@ -1,26 +1,14 @@ package forge.net.protocol; -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.lang3.StringUtils; - import com.google.gson.Gson; import com.google.gson.JsonParseException; - -import forge.net.protocol.toclient.AuthResultPacketClt; -import forge.net.protocol.toclient.ChatPacketClt; -import forge.net.protocol.toclient.EchoPacketClt; -import forge.net.protocol.toclient.ErrorIncorrectPacketClt; -import forge.net.protocol.toclient.ErrorNoStateForPacketClt; -import forge.net.protocol.toclient.IPacketClt; -import forge.net.protocol.toclient.WelcomePacketClt; -import forge.net.protocol.toserver.AuthorizePacketSrv; -import forge.net.protocol.toserver.ChatPacketSrv; -import forge.net.protocol.toserver.EchoPacketSrv; -import forge.net.protocol.toserver.IPacketSrv; -import forge.net.protocol.toserver.IncorrectPacketSrv; +import forge.net.protocol.toclient.*; +import forge.net.protocol.toserver.*; import forge.util.TextUtil; +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; /** * The expected incoming message format is: /{opcode} {json-object}, where opcode is a string among keys of headerToClassInbound