moved a few classes to core module

.gitattributes

@@ -22,7 +22,28 @@ forge-core/.settings/org.eclipse.core.resources.prefs -text
 forge-core/.settings/org.eclipse.jdt.core.prefs -text
 forge-core/.settings/org.eclipse.m2e.core.prefs -text
 forge-core/pom.xml -text
+forge-core/src/main/java/forge/Constant.java svneol=native#text/plain
+forge-core/src/main/java/forge/card/AggregationMethod.java -text
+forge-core/src/main/java/forge/card/CardCharacteristicName.java -text
+forge-core/src/main/java/forge/card/CardCoreType.java -text
 forge-core/src/main/java/forge/card/CardRarity.java -text
+forge-core/src/main/java/forge/card/CardSplitType.java -text
+forge-core/src/main/java/forge/card/CardSuperType.java -text
+forge-core/src/main/java/forge/card/CardType.java -text
+forge-core/src/main/java/forge/card/ColorSet.java -text
+forge-core/src/main/java/forge/card/ICardCharacteristics.java -text
+forge-core/src/main/java/forge/card/ICardFace.java -text
+forge-core/src/main/java/forge/card/ICardRawAbilites.java -text
+forge-core/src/main/java/forge/card/MagicColor.java -text
+forge-core/src/main/java/forge/card/mana/IParserManaCost.java -text
+forge-core/src/main/java/forge/card/mana/ManaAtom.java -text
+forge-core/src/main/java/forge/card/mana/ManaCost.java -text
+forge-core/src/main/java/forge/card/mana/ManaCostParser.java -text
+forge-core/src/main/java/forge/card/mana/ManaCostShard.java -text
+forge-core/src/main/java/forge/card/mana/package-info.java svneol=native#text/plain
+forge-core/src/main/java/forge/package-info.java -text
+forge-core/src/main/java/forge/util/BinaryUtil.java -text
+forge-core/src/main/java/forge/util/package-info.java -text
 forge-gui/.classpath -text
 forge-gui/.project -text
 forge-gui/.settings/org.eclipse.core.resources.prefs -text
@@ -14577,7 +14598,6 @@ forge-gui/src/main/html/js/jquery/jquery-1.9.1.min.js -text
 forge-gui/src/main/html/js/observable.js -text
 forge-gui/src/main/html/js/socket.js -text
 forge-gui/src/main/java/forge/Card.java svneol=native#text/plain
-forge-gui/src/main/java/forge/CardCharacteristicName.java -text
 forge-gui/src/main/java/forge/CardColor.java svneol=native#text/plain
 forge-gui/src/main/java/forge/CardDamageHistory.java -text
 forge-gui/src/main/java/forge/CardKeywords.java svneol=native#text/plain
@@ -14588,7 +14608,6 @@ forge-gui/src/main/java/forge/CardType.java svneol=native#text/plain
 forge-gui/src/main/java/forge/CardUtil.java svneol=native#text/plain
 forge-gui/src/main/java/forge/ColorChanger.java -text
 forge-gui/src/main/java/forge/Command.java svneol=native#text/plain
-forge-gui/src/main/java/forge/Constant.java svneol=native#text/plain
 forge-gui/src/main/java/forge/CounterType.java svneol=native#text/plain
 forge-gui/src/main/java/forge/FThreads.java -text
 forge-gui/src/main/java/forge/GameEntity.java -text
@@ -14602,32 +14621,22 @@ forge-gui/src/main/java/forge/ImageLoader.java -text
 forge-gui/src/main/java/forge/Singletons.java svneol=native#text/plain
 forge-gui/src/main/java/forge/StaticEffect.java svneol=native#text/plain
 forge-gui/src/main/java/forge/StaticEffects.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/AggregationMethod.java -text
 forge-gui/src/main/java/forge/card/BoosterGenerator.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/CardAiHints.java -text
 forge-gui/src/main/java/forge/card/CardBlock.java -text
 forge-gui/src/main/java/forge/card/CardCharacteristics.java -text
-forge-gui/src/main/java/forge/card/CardCoreType.java -text
 forge-gui/src/main/java/forge/card/CardDb.java -text
 forge-gui/src/main/java/forge/card/CardEdition.java -text
 forge-gui/src/main/java/forge/card/CardFace.java -text
 forge-gui/src/main/java/forge/card/CardRules.java -text
 forge-gui/src/main/java/forge/card/CardRulesPredicates.java -text
 forge-gui/src/main/java/forge/card/CardRulesReader.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/CardSplitType.java -text
-forge-gui/src/main/java/forge/card/CardSuperType.java -text
-forge-gui/src/main/java/forge/card/CardType.java -text
-forge-gui/src/main/java/forge/card/ColorSet.java -text
 forge-gui/src/main/java/forge/card/DeckHints.java -text
 forge-gui/src/main/java/forge/card/EditionCollection.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/FatPackTemplate.java -text
 forge-gui/src/main/java/forge/card/FormatCollection.java -text
-forge-gui/src/main/java/forge/card/ICardCharacteristics.java -text
 forge-gui/src/main/java/forge/card/ICardDatabase.java -text
-forge-gui/src/main/java/forge/card/ICardFace.java -text
-forge-gui/src/main/java/forge/card/ICardRawAbilites.java -text
 forge-gui/src/main/java/forge/card/IUnOpenedProduct.java -text
-forge-gui/src/main/java/forge/card/MagicColor.java -text
 forge-gui/src/main/java/forge/card/MetaSet.java -text
 forge-gui/src/main/java/forge/card/TriggerReplacementBase.java -text
 forge-gui/src/main/java/forge/card/UnOpenedMeta.java -text
@@ -14897,13 +14906,8 @@ forge-gui/src/main/java/forge/card/cost/CostUntap.java -text
 forge-gui/src/main/java/forge/card/cost/CostUntapType.java -text
 forge-gui/src/main/java/forge/card/cost/PaymentDecision.java -text
 forge-gui/src/main/java/forge/card/cost/package-info.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/mana/IParserManaCost.java -text
 forge-gui/src/main/java/forge/card/mana/Mana.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/mana/ManaAtom.java -text
-forge-gui/src/main/java/forge/card/mana/ManaCost.java -text
 forge-gui/src/main/java/forge/card/mana/ManaCostBeingPaid.java svneol=native#text/plain
-forge-gui/src/main/java/forge/card/mana/ManaCostParser.java -text
-forge-gui/src/main/java/forge/card/mana/ManaCostShard.java -text
 forge-gui/src/main/java/forge/card/mana/ManaPool.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/mana/package-info.java svneol=native#text/plain
 forge-gui/src/main/java/forge/card/package-info.java svneol=native#text/plain
@@ -15562,7 +15566,6 @@ forge-gui/src/main/java/forge/sound/SoundEffectType.java -text
 forge-gui/src/main/java/forge/sound/SoundSystem.java -text
 forge-gui/src/main/java/forge/util/Aggregates.java -text
 forge-gui/src/main/java/forge/util/Base64Coder.java svneol=native#text/plain
-forge-gui/src/main/java/forge/util/BinaryUtil.java -text
 forge-gui/src/main/java/forge/util/ComparableOp.java -text
 forge-gui/src/main/java/forge/util/Expressions.java -text
 forge-gui/src/main/java/forge/util/FileSection.java -text

forge-core/pom.xml

@@ -18,5 +18,10 @@
             <artifactId>guava</artifactId>
             <version>14.0.1</version>
         </dependency>
+        <dependency>
+        	<groupId>org.apache.commons</groupId>
+        	<artifactId>commons-lang3</artifactId>
+        	<version>3.1</version>
+        </dependency>
     </dependencies>
 </project>

forge-core/src/main/java/forge/card/CardCharacteristicName.java

@@ -1,4 +1,4 @@
-package forge;
+package forge.card;
 
 /** 
  * TODO: Write javadoc for this type.

forge-core/src/main/java/forge/card/CardSplitType.java

@@ -1,7 +1,5 @@
 package forge.card;
 
-import forge.CardCharacteristicName;
-
 public enum CardSplitType
 {
     None(AggregationMethod.USE_PRIMARY_FACE, null),

forge-core/src/main/java/forge/card/mana/package-info.java

@@ -0,0 +1,3 @@
+/** Forge Card Game. */
+package forge.card.mana;
+

forge-core/src/main/java/forge/package-info.java

@@ -0,0 +1,8 @@
+/**
+ * 
+ */
+/**
+ * @author Max
+ *
+ */
+package forge;

forge-core/src/main/java/forge/util/package-info.java

@@ -0,0 +1,8 @@
+/**
+ * 
+ */
+/**
+ * @author Max
+ *
+ */
+package forge.util;

forge-gui/src/main/java/forge/Card.java

@@ -42,6 +42,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
 import forge.CardPredicates.Presets;
+import forge.card.CardCharacteristicName;
 import forge.card.CardCharacteristics;
 import forge.card.CardDb;
 import forge.card.CardEdition;
@@ -761,7 +762,7 @@ public class Card extends GameEntity implements Comparable<Card> {
      *            a {@link forge.card.trigger.Trigger} object.
      *
      * @param state
-     *            a {@link forge.CardCharacteristicName} object.
+     *            a {@link forge.card.CardCharacteristicName} object.
      */
     public final void removeTrigger(final Trigger t, final CardCharacteristicName state) {
         CardCharacteristics stateCharacteristics = this.getState(state);

forge-gui/src/main/java/forge/CardUtil.java

@@ -22,6 +22,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import forge.card.CardCharacteristicName;
 import forge.card.CardCharacteristics;
 import forge.card.ColorSet;
 import forge.card.MagicColor;

forge-gui/src/main/java/forge/card/ability/AbilityFactory.java

@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 
 import forge.Card;
-import forge.CardCharacteristicName;
+import forge.card.CardCharacteristicName;
 import forge.card.cost.Cost;
 import forge.card.spellability.AbilitySub;
 import forge.card.spellability.SpellAbility;

forge-gui/src/main/java/forge/card/ability/ai/ChangeZoneAi.java

@@ -12,13 +12,13 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardLists;
 import forge.CardPredicates;
 import forge.CardPredicates.Presets;
 import forge.Constant;
 import forge.GameEntity;
 import forge.GameObject;
+import forge.card.CardCharacteristicName;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.ApiType;
 import forge.card.ability.SpellAbilityAi;

forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneAllEffect.java

@@ -5,9 +5,9 @@ import java.util.List;
 import com.google.common.collect.Iterables;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardLists;
 import forge.CardPredicates;
+import forge.card.CardCharacteristicName;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;

forge-gui/src/main/java/forge/card/ability/effects/ChangeZoneEffect.java

@@ -9,13 +9,13 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardLists;
 import forge.CardPredicates;
 import forge.CardUtil;
 import forge.CounterType;
 import forge.GameEntity;
 import forge.Singletons;
+import forge.card.CardCharacteristicName;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.ability.ai.ChangeZoneAi;

forge-gui/src/main/java/forge/card/ability/effects/CloneEffect.java

@@ -6,10 +6,10 @@ import java.util.List;
 import java.util.Map;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardUtil;
 import forge.Command;
 import forge.Singletons;
+import forge.card.CardCharacteristicName;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.cardfactory.CardFactory;

forge-gui/src/main/java/forge/card/ability/effects/CopyPermanentEffect.java

@@ -12,10 +12,10 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardLists;
 import forge.Command;
 import forge.GameEntity;
+import forge.card.CardCharacteristicName;
 import forge.card.CardDb;
 import forge.card.CardRulesPredicates;
 import forge.card.ability.AbilityUtils;

forge-gui/src/main/java/forge/card/ability/effects/DigEffect.java

@@ -7,8 +7,8 @@ import java.util.List;
 import java.util.Random;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardLists;
+import forge.card.CardCharacteristicName;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;

forge-gui/src/main/java/forge/card/ability/effects/MillEffect.java

@@ -3,7 +3,7 @@ package forge.card.ability.effects;
 import java.util.List;
 
 import forge.Card;
-import forge.CardCharacteristicName;
+import forge.card.CardCharacteristicName;
 import forge.card.ability.AbilityUtils;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;

forge-gui/src/main/java/forge/card/ability/effects/PlayEffect.java

@@ -11,7 +11,7 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 
 import forge.Card;
-import forge.CardCharacteristicName;
+import forge.card.CardCharacteristicName;
 import forge.card.CardDb;
 import forge.card.CardRulesPredicates;
 import forge.card.ability.AbilityUtils;

forge-gui/src/main/java/forge/card/ability/effects/SetStateEffect.java

@@ -4,7 +4,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import forge.Card;
-import forge.CardCharacteristicName;
+import forge.card.CardCharacteristicName;
 import forge.card.ability.SpellAbilityEffect;
 import forge.card.spellability.SpellAbility;
 import forge.game.Game;

forge-gui/src/main/java/forge/card/cardfactory/CardFactory.java

@@ -23,10 +23,10 @@ import java.util.List;
 import java.util.Map.Entry;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardColor;
 import forge.CardUtil;
 import forge.ImageCache;
+import forge.card.CardCharacteristicName;
 import forge.card.CardCharacteristics;
 import forge.card.CardDb;
 import forge.card.CardRules;

forge-gui/src/main/java/forge/card/cardfactory/CardFactoryUtil.java

@@ -26,7 +26,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.Lists;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardLists;
 import forge.CardPredicates;
 import forge.CardPredicates.Presets;
@@ -37,6 +36,7 @@ import forge.CounterType;
 import forge.GameEntity;
 import forge.GameLogEntryType;
 import forge.Singletons;
+import forge.card.CardCharacteristicName;
 import forge.card.CardType;
 import forge.card.ColorSet;
 import forge.card.MagicColor;

forge-gui/src/main/java/forge/card/spellability/AbilityTriggered.java

@@ -20,8 +20,8 @@ package forge.card.spellability;
 import java.util.Arrays;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.Command;
+import forge.card.CardCharacteristicName;
 import forge.card.CardCharacteristics;
 import forge.card.mana.ManaCost;
 import forge.card.trigger.ZCTrigger;

forge-gui/src/main/java/forge/game/GameAction.java

@@ -34,7 +34,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardLists;
 import forge.CardPredicates;
 import forge.CardUtil;
@@ -44,6 +43,7 @@ import forge.FThreads;
 import forge.GameEntity;
 import forge.GameLogEntryType;
 import forge.GameObject;
+import forge.card.CardCharacteristicName;
 import forge.card.CardDb;
 import forge.card.CardType;
 import forge.card.TriggerReplacementBase;

forge-gui/src/main/java/forge/gui/CardDetailPanel.java

@@ -38,11 +38,11 @@ import javax.swing.border.EtchedBorder;
 import org.apache.commons.lang3.StringUtils;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardUtil;
 import forge.CounterType;
 import forge.GameEntity;
 import forge.Singletons;
+import forge.card.CardCharacteristicName;
 import forge.card.CardEdition;
 import forge.card.CardType;
 import forge.card.ColorSet;

forge-gui/src/main/java/forge/gui/CardPicturePanel.java

@@ -24,9 +24,9 @@ import java.awt.image.BufferedImage;
 import javax.swing.JPanel;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.ImageCache;
 import forge.Singletons;
+import forge.card.CardCharacteristicName;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.JComponentSkin;
 import forge.gui.toolbox.imaging.FImagePanel;

forge-gui/src/main/java/forge/gui/GuiDisplayUtil.java

@@ -37,11 +37,11 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardLists;
 import forge.CardPredicates;
 import forge.CounterType;
 import forge.Singletons;
+import forge.card.CardCharacteristicName;
 import forge.card.CardDb;
 import forge.card.spellability.AbilityManaPart;
 import forge.card.spellability.SpellAbility;

forge-gui/src/main/java/forge/gui/match/controllers/CPicture.java

@@ -24,9 +24,9 @@ import java.awt.event.MouseWheelListener;
 import javax.swing.JLabel;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardUtil;
 import forge.Command;
+import forge.card.CardCharacteristicName;
 import forge.gui.CardPicturePanel;
 import forge.gui.framework.ICDoc;
 import forge.gui.match.views.VPicture;

forge-gui/src/main/java/forge/gui/match/nonsingleton/ZoneAction.java

@@ -5,8 +5,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.Singletons;
+import forge.card.CardCharacteristicName;
 import forge.card.cardfactory.CardFactory;
 import forge.game.zone.PlayerZone;
 import forge.gui.ForgeAction;

forge-gui/src/main/java/forge/gui/toolbox/imaging/FImageUtil.java

@@ -22,8 +22,8 @@ import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.ImageCache;
+import forge.card.CardCharacteristicName;
 import forge.gui.toolbox.CardFaceSymbols;
 import forge.gui.toolbox.FSkin.ComponentSkin;
 

forge-gui/src/main/java/forge/gui/toolbox/special/CardZoomer.java

@@ -32,8 +32,8 @@ import javax.swing.Timer;
 
 import net.miginfocom.swing.MigLayout;
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CardUtil;
+import forge.card.CardCharacteristicName;
 import forge.gui.SOverlayUtils;
 import forge.gui.toolbox.FOverlay;
 import forge.gui.toolbox.FSkin;

forge-gui/src/main/java/forge/view/arcane/CardPanel.java

@@ -36,10 +36,10 @@ import javax.swing.JRootPane;
 import javax.swing.SwingUtilities;
 
 import forge.Card;
-import forge.CardCharacteristicName;
 import forge.CounterType;
 import forge.ImageCache;
 import forge.Singletons;
+import forge.card.CardCharacteristicName;
 import forge.card.CardEdition;
 import forge.card.mana.ManaCost;
 import forge.game.combat.Combat;