Predicates moved to utils

.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

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

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.

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

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

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

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

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.

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.

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

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

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;
 

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

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

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

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

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.

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.

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

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

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

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;

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

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 <http://www.gnu.org/licenses/>.
  */
-package net.slightlymagic.maxmtg;
+package forge.util;
 
 import java.util.ArrayList;
 import java.util.Hashtable;

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 <http://www.gnu.org/licenses/>.
  */
-package net.slightlymagic.maxmtg;
+package forge.util;
 
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/net/slightlymagic/maxmtg/package-info.java

@@ -1,3 +0,0 @@
-/** Forge Card Game. */
-package net.slightlymagic.maxmtg;
-