diff --git a/.gitattributes b/.gitattributes index 52e9fd3d0da..da8057e909a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11443,6 +11443,8 @@ src/main/java/forge/util/IItemSerializer.java -text src/main/java/forge/util/IStorage.java -text src/main/java/forge/util/IStorageView.java -text src/main/java/forge/util/MyRandom.java svneol=native#text/plain +src/main/java/forge/util/Predicate.java -text +src/main/java/forge/util/PredicateString.java -text src/main/java/forge/util/StorageImmediatelySerialized.java svneol=native#text/plain src/main/java/forge/util/StorageReaderFile.java -text src/main/java/forge/util/StorageReaderFolder.java -text @@ -11522,9 +11524,6 @@ src/main/java/net/slightlymagic/braids/util/progress_monitor/BaseProgressMonitor src/main/java/net/slightlymagic/braids/util/progress_monitor/BraidsProgressMonitor.java svneol=native#text/plain src/main/java/net/slightlymagic/braids/util/progress_monitor/StderrProgressMonitor.java svneol=native#text/plain src/main/java/net/slightlymagic/braids/util/progress_monitor/package-info.java svneol=native#text/plain -src/main/java/net/slightlymagic/maxmtg/Predicate.java -text -src/main/java/net/slightlymagic/maxmtg/PredicateString.java -text -src/main/java/net/slightlymagic/maxmtg/package-info.java svneol=native#text/plain src/main/java/tree/properties/PropertyElement.java svneol=native#text/plain src/main/java/tree/properties/PropertyType.java svneol=native#text/plain src/main/java/tree/properties/TreeProperties.java svneol=native#text/plain diff --git a/src/main/java/forge/CardUtil.java b/src/main/java/forge/CardUtil.java index 1305df107ba..f40e3761074 100644 --- a/src/main/java/forge/CardUtil.java +++ b/src/main/java/forge/CardUtil.java @@ -27,7 +27,6 @@ import java.util.Random; import java.util.Set; -import net.slightlymagic.maxmtg.Predicate; import org.apache.commons.lang3.StringUtils; @@ -41,6 +40,7 @@ import forge.item.CardPrinted; import forge.properties.ForgeProps; import forge.properties.NewConstants; import forge.util.MyRandom; +import forge.util.Predicate; /** *

diff --git a/src/main/java/forge/card/BoosterData.java b/src/main/java/forge/card/BoosterData.java index c85cc62917c..f63c768796f 100644 --- a/src/main/java/forge/card/BoosterData.java +++ b/src/main/java/forge/card/BoosterData.java @@ -2,9 +2,9 @@ package forge.card; import forge.item.CardPrinted; import forge.util.FileSection; +import forge.util.Predicate; import forge.util.StorageReaderFile; import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Predicate; /** * The Class BoosterData. diff --git a/src/main/java/forge/card/BoosterGenerator.java b/src/main/java/forge/card/BoosterGenerator.java index 15831847657..437b7324344 100644 --- a/src/main/java/forge/card/BoosterGenerator.java +++ b/src/main/java/forge/card/BoosterGenerator.java @@ -25,11 +25,11 @@ import java.util.Map; import java.util.Map.Entry; import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Predicate; import forge.item.CardDb; import forge.item.CardPrinted; import forge.item.ItemPoolView; import forge.util.MyRandom; +import forge.util.Predicate; /** *

diff --git a/src/main/java/forge/card/CardBlock.java b/src/main/java/forge/card/CardBlock.java index 25333949bfb..a126e05f775 100644 --- a/src/main/java/forge/card/CardBlock.java +++ b/src/main/java/forge/card/CardBlock.java @@ -21,8 +21,8 @@ import java.util.ArrayList; import java.util.List; import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Predicate; import forge.item.CardPrinted; +import forge.util.Predicate; import forge.util.StorageReaderFile; /** diff --git a/src/main/java/forge/card/CardEdition.java b/src/main/java/forge/card/CardEdition.java index c9a7f9382dd..353bef409fa 100644 --- a/src/main/java/forge/card/CardEdition.java +++ b/src/main/java/forge/card/CardEdition.java @@ -18,10 +18,10 @@ package forge.card; import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Predicate; import forge.Singletons; import forge.game.GameFormat; import forge.util.FileSection; +import forge.util.Predicate; import forge.util.StorageReaderFile; /** diff --git a/src/main/java/forge/card/CardRules.java b/src/main/java/forge/card/CardRules.java index 733b9d909fd..06a004015dd 100644 --- a/src/main/java/forge/card/CardRules.java +++ b/src/main/java/forge/card/CardRules.java @@ -24,13 +24,14 @@ import java.util.Map.Entry; import java.util.Set; -import net.slightlymagic.maxmtg.Predicate; -import net.slightlymagic.maxmtg.PredicateString; -import net.slightlymagic.maxmtg.Predicate.ComparableOp; -import net.slightlymagic.maxmtg.Predicate.PredicatesOp; import org.apache.commons.lang3.StringUtils; +import forge.util.Predicate; +import forge.util.PredicateString; +import forge.util.Predicate.ComparableOp; +import forge.util.Predicate.PredicatesOp; + /** *

diff --git a/src/main/java/forge/game/GameFormat.java b/src/main/java/forge/game/GameFormat.java index 2c2f7271acb..04d1472a2d5 100644 --- a/src/main/java/forge/game/GameFormat.java +++ b/src/main/java/forge/game/GameFormat.java @@ -21,9 +21,9 @@ import java.util.Collections; import java.util.List; import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Predicate; import forge.card.CardRules; import forge.item.CardPrinted; +import forge.util.Predicate; /** * TODO: Write javadoc for this type. diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorBase.java b/src/main/java/forge/gui/deckeditor/DeckEditorBase.java index 1e36dbe5150..d62c518c5a3 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorBase.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorBase.java @@ -26,7 +26,6 @@ import javax.swing.JOptionPane; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import net.slightlymagic.maxmtg.Predicate; import forge.Command; import forge.gui.deckeditor.elements.CardPanelBase; @@ -37,6 +36,7 @@ import forge.item.CardPrinted; import forge.item.InventoryItem; import forge.item.ItemPool; import forge.item.ItemPoolView; +import forge.util.Predicate; /** * The Class DeckEditorBase. diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorConstructed.java b/src/main/java/forge/gui/deckeditor/DeckEditorConstructed.java index 7cb4827c1d7..ef07744aed9 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorConstructed.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorConstructed.java @@ -37,7 +37,6 @@ import javax.swing.JLabel; import net.miginfocom.swing.MigLayout; import net.slightlymagic.braids.util.lambda.Lambda0; -import net.slightlymagic.maxmtg.Predicate; import forge.Command; import forge.Singletons; import forge.deck.Deck; @@ -52,6 +51,7 @@ import forge.item.CardDb; import forge.item.CardPrinted; import forge.item.InventoryItem; import forge.item.ItemPool; +import forge.util.Predicate; /** *

diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorLimited.java b/src/main/java/forge/gui/deckeditor/DeckEditorLimited.java index 0bc5af9826c..51b04aac7d5 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorLimited.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorLimited.java @@ -36,7 +36,6 @@ import javax.swing.JLabel; import net.miginfocom.swing.MigLayout; import net.slightlymagic.braids.util.lambda.Lambda0; -import net.slightlymagic.maxmtg.Predicate; import forge.Command; import forge.deck.Deck; import forge.deck.DeckGroup; @@ -50,6 +49,7 @@ import forge.gui.deckeditor.elements.TableView; import forge.item.CardPrinted; import forge.item.InventoryItem; import forge.util.IStorage; +import forge.util.Predicate; /** *

diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java b/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java index c975b2b9f28..080c6018798 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java @@ -32,7 +32,6 @@ import javax.swing.JButton; import javax.swing.JCheckBox; import net.slightlymagic.braids.util.lambda.Lambda0; -import net.slightlymagic.maxmtg.Predicate; import forge.Command; import forge.Constant; import forge.deck.Deck; @@ -48,6 +47,7 @@ import forge.item.CardPrinted; import forge.item.InventoryItem; import forge.item.ItemPool; import forge.quest.data.QuestData; +import forge.util.Predicate; //import forge.quest.data.QuestBoosterPack; diff --git a/src/main/java/forge/gui/deckeditor/DraftingProcess.java b/src/main/java/forge/gui/deckeditor/DraftingProcess.java index 302129193b8..e215b780551 100644 --- a/src/main/java/forge/gui/deckeditor/DraftingProcess.java +++ b/src/main/java/forge/gui/deckeditor/DraftingProcess.java @@ -36,7 +36,6 @@ import javax.swing.JOptionPane; import javax.swing.JTable; import javax.swing.WindowConstants; -import net.slightlymagic.maxmtg.Predicate; import forge.Command; import forge.Constant; @@ -56,6 +55,7 @@ import forge.item.InventoryItem; import forge.item.ItemPoolView; import forge.properties.ForgeProps; import forge.properties.NewConstants.Lang.GuiBoosterDraft; +import forge.util.Predicate; /** *

diff --git a/src/main/java/forge/gui/deckeditor/QuestCardShop.java b/src/main/java/forge/gui/deckeditor/QuestCardShop.java index 765af681030..59168cdd1af 100644 --- a/src/main/java/forge/gui/deckeditor/QuestCardShop.java +++ b/src/main/java/forge/gui/deckeditor/QuestCardShop.java @@ -34,7 +34,6 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Predicate; import forge.Command; import forge.deck.Deck; import forge.error.ErrorViewer; @@ -52,6 +51,7 @@ import forge.item.ItemPoolView; import forge.item.PreconDeck; import forge.quest.ReadPriceList; import forge.quest.data.QuestData; +import forge.util.Predicate; /** *

diff --git a/src/main/java/forge/gui/deckeditor/elements/FilterCheckBoxes.java b/src/main/java/forge/gui/deckeditor/elements/FilterCheckBoxes.java index df26002f969..28f835cab45 100644 --- a/src/main/java/forge/gui/deckeditor/elements/FilterCheckBoxes.java +++ b/src/main/java/forge/gui/deckeditor/elements/FilterCheckBoxes.java @@ -23,10 +23,10 @@ import java.util.List; import javax.swing.JCheckBox; -import net.slightlymagic.maxmtg.Predicate; import forge.card.CardRules; import forge.item.CardPrinted; +import forge.util.Predicate; /** * A structural class for some checkboxes need for a deck editor, contains no diff --git a/src/main/java/forge/gui/deckeditor/elements/FilterNameTypeSetPanel.java b/src/main/java/forge/gui/deckeditor/elements/FilterNameTypeSetPanel.java index b38591300b3..3765d9bdd05 100644 --- a/src/main/java/forge/gui/deckeditor/elements/FilterNameTypeSetPanel.java +++ b/src/main/java/forge/gui/deckeditor/elements/FilterNameTypeSetPanel.java @@ -28,8 +28,6 @@ import javax.swing.JTextField; import javax.swing.event.DocumentListener; import net.miginfocom.swing.MigLayout; -import net.slightlymagic.maxmtg.Predicate; -import net.slightlymagic.maxmtg.PredicateString.StringOp; import org.apache.commons.lang3.StringUtils; @@ -38,6 +36,8 @@ import forge.card.CardRules; import forge.card.CardEdition; import forge.game.GameFormat; import forge.item.CardPrinted; +import forge.util.Predicate; +import forge.util.PredicateString.StringOp; /** * A panel that holds Name, Type, Rules text fields aligned horizontally diff --git a/src/main/java/forge/gui/deckeditor/elements/TableView.java b/src/main/java/forge/gui/deckeditor/elements/TableView.java index ddd6ecef387..926c23dda14 100644 --- a/src/main/java/forge/gui/deckeditor/elements/TableView.java +++ b/src/main/java/forge/gui/deckeditor/elements/TableView.java @@ -30,13 +30,13 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableCellRenderer; -import net.slightlymagic.maxmtg.Predicate; import forge.Constant; import forge.card.CardRules; import forge.item.InventoryItem; import forge.item.ItemPool; import forge.item.ItemPoolView; +import forge.util.Predicate; /** * TableWithCards. diff --git a/src/main/java/forge/item/BoosterPack.java b/src/main/java/forge/item/BoosterPack.java index 4992046585c..536234bd6dc 100644 --- a/src/main/java/forge/item/BoosterPack.java +++ b/src/main/java/forge/item/BoosterPack.java @@ -22,12 +22,12 @@ import java.util.List; import net.slightlymagic.braids.util.UtilFunctions; import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Predicate; import forge.Singletons; import forge.card.BoosterData; import forge.card.BoosterGenerator; import forge.card.CardRules; import forge.card.CardEdition; +import forge.util.Predicate; /** * TODO Write javadoc for this type. diff --git a/src/main/java/forge/item/CardDb.java b/src/main/java/forge/item/CardDb.java index d10fe7dd098..1897d55dfff 100644 --- a/src/main/java/forge/item/CardDb.java +++ b/src/main/java/forge/item/CardDb.java @@ -26,7 +26,6 @@ import java.util.Map.Entry; import java.util.NoSuchElementException; import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Predicate; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; @@ -36,6 +35,7 @@ import forge.Singletons; import forge.card.CardInSet; import forge.card.CardRules; import forge.card.MtgDataParser; +import forge.util.Predicate; /** *

diff --git a/src/main/java/forge/item/CardPrinted.java b/src/main/java/forge/item/CardPrinted.java index 1c0b3cb149a..3c757905809 100644 --- a/src/main/java/forge/item/CardPrinted.java +++ b/src/main/java/forge/item/CardPrinted.java @@ -21,8 +21,6 @@ import java.util.Arrays; import java.util.List; import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Predicate; -import net.slightlymagic.maxmtg.PredicateString; import org.apache.commons.lang3.ArrayUtils; @@ -32,6 +30,8 @@ import forge.CardUtil; import forge.Player; import forge.card.CardRarity; import forge.card.CardRules; +import forge.util.Predicate; +import forge.util.PredicateString; /** *

diff --git a/src/main/java/forge/quest/BoosterUtils.java b/src/main/java/forge/quest/BoosterUtils.java index b3ec2e2843e..d6f488b7e9d 100644 --- a/src/main/java/forge/quest/BoosterUtils.java +++ b/src/main/java/forge/quest/BoosterUtils.java @@ -21,12 +21,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.slightlymagic.maxmtg.Predicate; import forge.card.CardRules; import forge.item.CardDb; import forge.item.CardPrinted; import forge.util.MyRandom; +import forge.util.Predicate; // The BoosterPack generates cards for the Card Pool in Quest Mode /** diff --git a/src/main/java/forge/quest/data/QuestData.java b/src/main/java/forge/quest/data/QuestData.java index a3bdbab72a1..685c3c009bf 100644 --- a/src/main/java/forge/quest/data/QuestData.java +++ b/src/main/java/forge/quest/data/QuestData.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import net.slightlymagic.maxmtg.Predicate; import forge.Singletons; import forge.deck.Deck; @@ -35,6 +34,7 @@ import forge.properties.NewConstants; import forge.quest.data.QuestPreferences.QPref; import forge.quest.data.item.QuestInventory; import forge.quest.data.pet.QuestPetManager; +import forge.util.Predicate; import forge.util.StorageView; import forge.util.IStorage; import forge.util.IStorageView; diff --git a/src/main/java/forge/quest/data/QuestUtilCards.java b/src/main/java/forge/quest/data/QuestUtilCards.java index fe3bd62abdb..c8a9bf8b161 100644 --- a/src/main/java/forge/quest/data/QuestUtilCards.java +++ b/src/main/java/forge/quest/data/QuestUtilCards.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map.Entry; import net.slightlymagic.braids.util.lambda.Lambda1; -import net.slightlymagic.maxmtg.Predicate; import forge.Singletons; import forge.card.BoosterGenerator; import forge.card.CardEdition; @@ -38,6 +37,7 @@ import forge.item.PreconDeck; import forge.quest.BoosterUtils; import forge.quest.data.QuestPreferences.QPref; import forge.util.MyRandom; +import forge.util.Predicate; /** * This is a helper class to execute operations on QuestData. It has been diff --git a/src/main/java/net/slightlymagic/maxmtg/Predicate.java b/src/main/java/forge/util/Predicate.java similarity index 95% rename from src/main/java/net/slightlymagic/maxmtg/Predicate.java rename to src/main/java/forge/util/Predicate.java index e5dce04e24d..b16375ce82d 100644 --- a/src/main/java/net/slightlymagic/maxmtg/Predicate.java +++ b/src/main/java/forge/util/Predicate.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package net.slightlymagic.maxmtg; +package forge.util; import java.util.ArrayList; import java.util.Hashtable; diff --git a/src/main/java/net/slightlymagic/maxmtg/PredicateString.java b/src/main/java/forge/util/PredicateString.java similarity index 95% rename from src/main/java/net/slightlymagic/maxmtg/PredicateString.java rename to src/main/java/forge/util/PredicateString.java index e2d7084b43b..e666ba6478f 100644 --- a/src/main/java/net/slightlymagic/maxmtg/PredicateString.java +++ b/src/main/java/forge/util/PredicateString.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package net.slightlymagic.maxmtg; +package forge.util; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/net/slightlymagic/maxmtg/package-info.java b/src/main/java/net/slightlymagic/maxmtg/package-info.java deleted file mode 100644 index 742c75d51d3..00000000000 --- a/src/main/java/net/slightlymagic/maxmtg/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -/** Forge Card Game. */ -package net.slightlymagic.maxmtg; -