external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

*Moved common functionality of Trigger and ReplacementEffect into base class.

Browse Source
This commit is contained in:
Hellfish
2014-02-09 13:56:04 +00:00
parent e9da0ec519
commit a54a0ba985
808 changed files with 3451 additions and 6003 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
forge-core/src/main/java/forge/CardStorageReader.java
View File

@@ -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;
/**
* <p>

8
forge-core/src/main/java/forge/StaticData.java
View File

@@ -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

19
forge-core/src/main/java/forge/card/BoosterGenerator.java
View File

@@ -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.*;
/**
* <p>

27
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -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 = "+";

27
forge-core/src/main/java/forge/card/CardEdition.java
View File

@@ -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;
/**

11
forge-core/src/main/java/forge/card/CardFace.java
View File

@@ -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

9
forge-core/src/main/java/forge/card/CardRules.java
View File

@@ -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

7
forge-core/src/main/java/forge/card/CardRulesPredicates.java
View File

@@ -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.

4
forge-core/src/main/java/forge/card/CardType.java
View File

@@ -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;
/**
* <p>
* Immutable Card type. Can be built only from parsing a string.

7
forge-core/src/main/java/forge/card/ColorSet.java
View File

@@ -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;
/**
* <p>CardColor class.</p>
* <p>Represents a set of any number of colors out of 5 possible in the game</p>

9
forge-core/src/main/java/forge/card/DeckHints.java
View File

@@ -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.

9
forge-core/src/main/java/forge/card/ICardDatabase.java
View File

@@ -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> {
PaperCard getCard(String cardName);
PaperCard getCard(String cardName, String edition);

5
forge-core/src/main/java/forge/card/IUnOpenedProduct.java
View File

@@ -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.
*

4
forge-core/src/main/java/forge/card/MagicColor.java
View File

@@ -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.
*

15
forge-core/src/main/java/forge/card/PrintSheet.java
View File

@@ -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.

18
forge-core/src/main/java/forge/card/UnOpenedProduct.java
View File

@@ -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 {

17
forge-core/src/main/java/forge/deck/CardPool.java
View File

@@ -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.

15
forge-core/src/main/java/forge/deck/Deck.java
View File

@@ -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;
/**

4
forge-core/src/main/java/forge/deck/DeckBase.java
View File

@@ -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.
*

18
forge-core/src/main/java/forge/deck/DeckFormat.java
View File

@@ -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. :)
*/

4
forge-core/src/main/java/forge/deck/DeckGroup.java
View File

@@ -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.
*

13
forge-core/src/main/java/forge/deck/DeckRecognizer.java
View File

@@ -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;
/**
* <p>

9
forge-core/src/main/java/forge/deck/generation/DeckGenerator2Color.java
View File

@@ -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;
/**
* <p>

8
forge-core/src/main/java/forge/deck/generation/DeckGenerator3Color.java
View File

@@ -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;
/**
* <p>

8
forge-core/src/main/java/forge/deck/generation/DeckGenerator5Color.java
View File

@@ -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;
/**
* <p>

21
forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java
View File

@@ -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;
/**
* <p>

8
forge-core/src/main/java/forge/deck/generation/DeckGeneratorMonoColor.java
View File

@@ -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;
/**
* <p>

9
forge-core/src/main/java/forge/deck/io/DeckFileHeader.java
View File

@@ -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.

15
forge-core/src/main/java/forge/deck/io/DeckSerializer.java
View File

@@ -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 {

12
forge-core/src/main/java/forge/deck/io/DeckStorage.java
View File

@@ -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.
*/

1
forge-core/src/main/java/forge/item/BoosterPack.java
View File

@@ -19,7 +19,6 @@
package forge.item;
import com.google.common.base.Function;
import forge.StaticData;
import forge.card.CardEdition;
import forge.util.MyRandom;

12
forge-core/src/main/java/forge/item/FatPack.java
View File

@@ -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<CardEdition, FatPack> FN_FROM_SET = new Function<CardEdition, FatPack>() {

15
forge-core/src/main/java/forge/item/IPaperCard.java
View File

@@ -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 {

1
forge-core/src/main/java/forge/item/PaperCard.java
View File

@@ -18,7 +18,6 @@
package forge.item;
import com.google.common.base.Function;
import forge.card.CardRarity;
import forge.card.CardRules;

4
forge-core/src/main/java/forge/item/PaperToken.java
View File

@@ -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;

11
forge-core/src/main/java/forge/item/PreconDeck.java
View File

@@ -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.
*

14
forge-core/src/main/java/forge/item/SealedProduct.java
View File

@@ -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;

5
forge-core/src/main/java/forge/item/TournamentPack.java
View File

@@ -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. */

11
forge-core/src/main/java/forge/util/Aggregates.java
View File

@@ -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.
*

4
forge-core/src/main/java/forge/util/CollectionSuppliers.java
View File

@@ -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.
*

13
forge-core/src/main/java/forge/util/FileUtil.java
View File

@@ -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;
/**
* <p>
* FileUtil class.

12
forge-core/src/main/java/forge/util/ItemPool.java
View File

@@ -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;
/**
* <p>
* ItemPool class.

7
forge-core/src/main/java/forge/util/ItemPoolSorter.java
View File

@@ -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;
/**
* <p>

9
forge-core/src/main/java/forge/util/Lang.java
View File

@@ -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.

3
forge-core/src/main/java/forge/util/PredicateString.java
View File

@@ -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.

9
forge-core/src/main/java/forge/util/TextUtil.java
View File

@@ -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.
*

6
forge-core/src/main/java/forge/util/ThreadUtil.java
View File

@@ -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 {

4
forge-core/src/main/java/forge/util/maps/EnumMapOfLists.java
View File

@@ -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<K extends Enum<K>, V> extends EnumMap<K, Collection<V>> implements MapOfLists<K, V> {
private final Supplier<? extends Collection<V>> factory;

4
forge-core/src/main/java/forge/util/maps/HashMapOfLists.java
View File

@@ -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<K, V> extends HashMap<K, Collection<V>> implements MapOfLists<K, V> {
private final Supplier<? extends Collection<V>> factory;

5
forge-core/src/main/java/forge/util/storage/IStorage.java
View File

@@ -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.
*

9
forge-core/src/main/java/forge/util/storage/StorageBase.java
View File

@@ -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.*;
/**
* <p>
* StorageBase class.

5
forge-core/src/main/java/forge/util/storage/StorageImmediatelySerialized.java
View File

@@ -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;
/**
* <p>
* StorageImmediatelySerialized class.

4
forge-core/src/main/java/forge/util/storage/StorageNestedFolders.java
View File

@@ -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<T> extends StorageBase<IStorage<T>> {
private final File thisFolder;

5
forge-core/src/main/java/forge/util/storage/StorageReaderBase.java
View File

@@ -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<T> implements IItemReader<T> {
protected final Function<? super T, String> keySelector;
public StorageReaderBase(final Function<? super T, String> keySelector0) {

10
forge-core/src/main/java/forge/util/storage/StorageReaderFile.java
View File

@@ -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.
*

10
forge-core/src/main/java/forge/util/storage/StorageReaderFileSections.java
View File

@@ -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.
*

11
forge-core/src/main/java/forge/util/storage/StorageReaderFolder.java
View File

@@ -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