disband forge.card package in gui module

forge-gui/src/main/java/forge/card/package-info.java

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

forge-gui/src/main/java/forge/game/limited/BoosterDraft.java

@@ -34,7 +34,6 @@ import org.apache.commons.lang3.ArrayUtils;
 import com.google.common.base.Supplier;
 import forge.Constant.Preferences;
 import forge.Singletons;
-import forge.card.CardBlock;
 import forge.card.CardEdition;
 import forge.card.IUnOpenedProduct;
 import forge.card.UnOpenedProduct;
@@ -44,6 +43,7 @@ import forge.gui.GuiChoose;
 import forge.item.PaperCard;
 import forge.item.IPaperCard;
 import forge.item.SealedProduct;
+import forge.model.CardBlock;
 import forge.properties.NewConstants;
 import forge.util.FileUtil;
 import forge.util.HttpUtil;

forge-gui/src/main/java/forge/game/limited/SealedCardPoolGenerator.java

@@ -27,15 +27,15 @@ import javax.swing.JOptionPane;
 import org.apache.commons.lang3.ArrayUtils;
 
 import forge.Singletons;
-import forge.card.CardBlock;
 import forge.card.CardEdition;
 import forge.card.IUnOpenedProduct;
-import forge.card.UnOpenedMeta;
 import forge.card.UnOpenedProduct;
 import forge.deck.CardPool;
 import forge.gui.GuiChoose;
 import forge.item.PaperCard;
 import forge.item.SealedProduct;
+import forge.model.CardBlock;
+import forge.model.UnOpenedMeta;
 import forge.util.FileUtil;
 import forge.util.ItemPool;
 import forge.util.TextUtil;

forge-gui/src/main/java/forge/model/CardBlock.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 forge.card;
+package forge.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,6 +28,10 @@ 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.card.CardEdition.Collection;
 import forge.item.PaperCard;
 import forge.item.IPaperCard;
 import forge.util.TextUtil;

forge-gui/src/main/java/forge/model/FModel.java

@@ -28,7 +28,6 @@ import forge.Constant;
 import forge.Constant.Preferences;
 import forge.Singletons;
 import forge.ai.AiProfileUtil;
-import forge.card.CardBlock;
 import forge.card.CardType;
 import forge.error.ExceptionHandler;
 import forge.game.GameFormat;
@@ -279,7 +278,7 @@ public class FModel {
     }
 
 
-    /** @return {@link forge.util.storage.IStorage}<{@link forge.card.CardBlock}> */
+    /** @return {@link forge.util.storage.IStorage}<{@link forge.model.CardBlock}> */
     public IStorage<CardBlock> getBlocks() {
         return blocks;
     }    
@@ -335,7 +334,7 @@ public class FModel {
         this.gauntletData = data0;
     }
 
-    /** @return {@link forge.util.storage.IStorage}<{@link forge.card.CardBlock}> */
+    /** @return {@link forge.util.storage.IStorage}<{@link forge.model.CardBlock}> */
     public IStorage<CardBlock> getFantasyBlocks() {
         return fantasyBlocks;
     }

forge-gui/src/main/java/forge/model/MetaSet.java

@@ -16,13 +16,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package forge.card;
+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.game.limited.CustomLimited;
 import forge.item.PaperCard;
 import forge.item.IPaperCard;

forge-gui/src/main/java/forge/model/UnOpenedMeta.java

@@ -16,12 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package forge.card;
+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;