From 0303b3433910c94d2d615f0a93e3b48ab4469fab Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Thu, 23 May 2013 13:37:34 +0000 Subject: [PATCH] moved quest gui to quest package --- .gitattributes | 6 +++--- src/main/java/forge/{gui/bazaar => quest/gui}/ViewItem.java | 2 +- .../java/forge/{gui/bazaar => quest/gui}/ViewStall.java | 2 +- .../java/forge/{gui/bazaar => quest/gui}/package-info.java | 2 +- src/main/java/forge/view/ViewBazaarUI.java | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/forge/{gui/bazaar => quest/gui}/ViewItem.java (96%) rename src/main/java/forge/{gui/bazaar => quest/gui}/ViewStall.java (99%) rename src/main/java/forge/{gui/bazaar => quest/gui}/package-info.java (67%) diff --git a/.gitattributes b/.gitattributes index 34695bf1392..41a8bf1e177 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14310,9 +14310,6 @@ src/main/java/forge/gui/MultiLineLabelUI.java svneol=native#text/plain src/main/java/forge/gui/SOverlayUtils.java -text src/main/java/forge/gui/UnsortedListModel.java -text src/main/java/forge/gui/WrapLayout.java -text -src/main/java/forge/gui/bazaar/ViewItem.java -text -src/main/java/forge/gui/bazaar/ViewStall.java svneol=native#text/plain -src/main/java/forge/gui/bazaar/package-info.java svneol=native#text/plain src/main/java/forge/gui/deckeditor/CDeckEditorUI.java -text src/main/java/forge/gui/deckeditor/DeckImport.java -text src/main/java/forge/gui/deckeditor/MenuCommon.java svneol=native#text/plain @@ -14589,6 +14586,9 @@ src/main/java/forge/quest/data/QuestData.java svneol=native#text/plain src/main/java/forge/quest/data/QuestItemCondition.java -text src/main/java/forge/quest/data/QuestPreferences.java svneol=native#text/plain src/main/java/forge/quest/data/package-info.java svneol=native#text/plain +src/main/java/forge/quest/gui/ViewItem.java -text +src/main/java/forge/quest/gui/ViewStall.java svneol=native#text/plain +src/main/java/forge/quest/gui/package-info.java svneol=native#text/plain src/main/java/forge/quest/io/PreconReader.java -text src/main/java/forge/quest/io/QuestChallengeReader.java -text src/main/java/forge/quest/io/QuestDataIO.java svneol=native#text/plain diff --git a/src/main/java/forge/gui/bazaar/ViewItem.java b/src/main/java/forge/quest/gui/ViewItem.java similarity index 96% rename from src/main/java/forge/gui/bazaar/ViewItem.java rename to src/main/java/forge/quest/gui/ViewItem.java index 0a18d85da70..8d2d9402705 100644 --- a/src/main/java/forge/gui/bazaar/ViewItem.java +++ b/src/main/java/forge/quest/gui/ViewItem.java @@ -1,4 +1,4 @@ -package forge.gui.bazaar; +package forge.quest.gui; import java.awt.Font; diff --git a/src/main/java/forge/gui/bazaar/ViewStall.java b/src/main/java/forge/quest/gui/ViewStall.java similarity index 99% rename from src/main/java/forge/gui/bazaar/ViewStall.java rename to src/main/java/forge/quest/gui/ViewStall.java index 1f9c384c008..7ec41d8dd95 100644 --- a/src/main/java/forge/gui/bazaar/ViewStall.java +++ b/src/main/java/forge/quest/gui/ViewStall.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 forge.gui.bazaar; +package forge.quest.gui; import java.awt.Component; import java.util.ArrayList; diff --git a/src/main/java/forge/gui/bazaar/package-info.java b/src/main/java/forge/quest/gui/package-info.java similarity index 67% rename from src/main/java/forge/gui/bazaar/package-info.java rename to src/main/java/forge/quest/gui/package-info.java index 6a39bc8dcc1..8c278440ddc 100644 --- a/src/main/java/forge/gui/bazaar/package-info.java +++ b/src/main/java/forge/quest/gui/package-info.java @@ -1,3 +1,3 @@ /** Views (as in model-view-controller) for Forge. */ -package forge.gui.bazaar; +package forge.quest.gui; diff --git a/src/main/java/forge/view/ViewBazaarUI.java b/src/main/java/forge/view/ViewBazaarUI.java index 33673fcca3d..c66c867afe3 100644 --- a/src/main/java/forge/view/ViewBazaarUI.java +++ b/src/main/java/forge/view/ViewBazaarUI.java @@ -7,11 +7,11 @@ import javax.swing.SwingUtilities; import net.miginfocom.swing.MigLayout; import forge.Command; import forge.control.ControlBazaarUI; -import forge.gui.bazaar.ViewStall; import forge.gui.toolbox.FLabel; import forge.gui.toolbox.FPanel; import forge.gui.toolbox.FSkin; import forge.quest.bazaar.QuestBazaarManager; +import forge.quest.gui.ViewStall; /** Lays out containers and borders for resizeable layout and @@ -95,7 +95,7 @@ public class ViewBazaarUI extends FPanel { /** * TODO: Write javadoc for this method. - * @return {@link forge.gui.bazaar.ViewStall} + * @return {@link forge.quest.gui.ViewStall} */ public ViewStall getPnlSingleStall() { return this.pnlSingleStall;