From 5367811a3309e32fb2d22c59b82c6d6b0ac7929d Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sun, 22 Dec 2013 13:08:28 +0000
Subject: [PATCH] moved card prefrences to gui

---
 .gitattributes                                                  | 2 +-
 forge-gui/src/main/java/forge/Singletons.java                   | 2 +-
 .../src/main/java/forge/gui}/CardPreferences.java               | 2 +-
 .../java/forge/gui/toolbox/itemmanager/views/StarRenderer.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename {forge-core/src/main/java/forge/card => forge-gui/src/main/java/forge/gui}/CardPreferences.java (96%)

diff --git a/.gitattributes b/.gitattributes
index 7351e7d26e5..f9bd3463dd5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -28,7 +28,6 @@ forge-core/src/main/java/forge/card/CardCharacteristicName.java -text
 forge-core/src/main/java/forge/card/CardDb.java -text
 forge-core/src/main/java/forge/card/CardEdition.java -text
 forge-core/src/main/java/forge/card/CardFace.java -text
-forge-core/src/main/java/forge/card/CardPreferences.java -text
 forge-core/src/main/java/forge/card/CardRarity.java -text
 forge-core/src/main/java/forge/card/CardRules.java -text
 forge-core/src/main/java/forge/card/CardRulesPredicates.java -text
@@ -15205,6 +15204,7 @@ forge-gui/src/main/java/forge/gui/CardContainer.java svneol=native#text/plain
 forge-gui/src/main/java/forge/gui/CardDetailPanel.java svneol=native#text/plain
 forge-gui/src/main/java/forge/gui/CardListViewer.java -text
 forge-gui/src/main/java/forge/gui/CardPicturePanel.java svneol=native#text/plain
+forge-gui/src/main/java/forge/gui/CardPreferences.java -text
 forge-gui/src/main/java/forge/gui/DualListBox.java -text
 forge-gui/src/main/java/forge/gui/FNetOverlay.java -text
 forge-gui/src/main/java/forge/gui/ForgeAction.java svneol=native#text/plain
diff --git a/forge-gui/src/main/java/forge/Singletons.java b/forge-gui/src/main/java/forge/Singletons.java
index 32273dd9a20..cfbb76e31e4 100644
--- a/forge-gui/src/main/java/forge/Singletons.java
+++ b/forge-gui/src/main/java/forge/Singletons.java
@@ -17,8 +17,8 @@
  */
 package forge;
 
-import forge.card.CardPreferences;
 import forge.control.FControl;
+import forge.gui.CardPreferences;
 import forge.gui.toolbox.FProgressBar;
 import forge.gui.workshop.CardScriptInfo;
 import forge.model.FModel;
diff --git a/forge-core/src/main/java/forge/card/CardPreferences.java b/forge-gui/src/main/java/forge/gui/CardPreferences.java
similarity index 96%
rename from forge-core/src/main/java/forge/card/CardPreferences.java
rename to forge-gui/src/main/java/forge/gui/CardPreferences.java
index 415a0b9c893..89cdbfe8d4a 100644
--- a/forge-core/src/main/java/forge/card/CardPreferences.java
+++ b/forge-gui/src/main/java/forge/gui/CardPreferences.java
@@ -1,4 +1,4 @@
-package forge.card;
+package forge.gui;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
diff --git a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/StarRenderer.java b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/StarRenderer.java
index 6d8f2268cdc..75510fff4c3 100644
--- a/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/StarRenderer.java
+++ b/forge-gui/src/main/java/forge/gui/toolbox/itemmanager/views/StarRenderer.java
@@ -23,7 +23,7 @@ import java.awt.event.MouseEvent;
 
 import javax.swing.JTable;
 
-import forge.card.CardPreferences;
+import forge.gui.CardPreferences;
 import forge.gui.toolbox.FSkin;
 import forge.gui.toolbox.FSkin.SkinImage;
 import forge.item.IPaperCard;