From ebeef30a8e6dd61c72c1831ed1aa8cfeb6c4e542 Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Tue, 25 Sep 2012 02:31:50 +0000 Subject: [PATCH] Renamed forge.view.bazaar to forge.gui.bazaar for consistency. --- .gitattributes | 6 +++--- src/main/java/forge/control/bazaar/ControlStall.java | 6 +++--- src/main/java/forge/{view => gui}/bazaar/ViewItem.java | 2 +- src/main/java/forge/{view => gui}/bazaar/ViewStall.java | 2 +- src/main/java/forge/{view => gui}/bazaar/package-info.java | 2 +- src/main/java/forge/gui/home/quest/VSubmenuChallenges.java | 6 ++++-- src/main/java/forge/view/ViewBazaarUI.java | 4 ++-- 7 files changed, 15 insertions(+), 13 deletions(-) rename src/main/java/forge/{view => gui}/bazaar/ViewItem.java (96%) rename src/main/java/forge/{view => gui}/bazaar/ViewStall.java (99%) rename src/main/java/forge/{view => gui}/bazaar/package-info.java (67%) diff --git a/.gitattributes b/.gitattributes index 6a3b0148c13..358e34c54ef 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12324,6 +12324,9 @@ src/main/java/forge/gui/MultiPhaseProgressMonitorWithETA.java svneol=native#text 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 @@ -12594,9 +12597,6 @@ src/main/java/forge/view/arcane/util/GlowText.java svneol=native#text/plain src/main/java/forge/view/arcane/util/ImageUtil.java svneol=native#text/plain src/main/java/forge/view/arcane/util/UI.java svneol=native#text/plain src/main/java/forge/view/arcane/util/package-info.java svneol=native#text/plain -src/main/java/forge/view/bazaar/ViewItem.java -text -src/main/java/forge/view/bazaar/ViewStall.java svneol=native#text/plain -src/main/java/forge/view/bazaar/package-info.java svneol=native#text/plain src/main/java/forge/view/package-info.java svneol=native#text/plain src/main/java/net/slightlymagic/braids/BaseProgressMonitor.java svneol=native#text/plain src/main/java/net/slightlymagic/braids/BraidsProgressMonitor.java svneol=native#text/plain diff --git a/src/main/java/forge/control/bazaar/ControlStall.java b/src/main/java/forge/control/bazaar/ControlStall.java index d8f4938ef35..2aec995c314 100644 --- a/src/main/java/forge/control/bazaar/ControlStall.java +++ b/src/main/java/forge/control/bazaar/ControlStall.java @@ -1,6 +1,6 @@ package forge.control.bazaar; -import forge.view.bazaar.ViewStall; +import forge.gui.bazaar.ViewStall; /** * TODO: Write javadoc for this type. @@ -9,12 +9,12 @@ import forge.view.bazaar.ViewStall; public class ControlStall { private final ViewStall view; - /** @param v0   {@link forge.view.bazaar.ViewStall} */ + /** @param v0   {@link forge.gui.bazaar.ViewStall} */ public ControlStall(ViewStall v0) { this.view = v0; } - /** @return {@link forge.view.bazaar.ViewStall} */ + /** @return {@link forge.gui.bazaar.ViewStall} */ public ViewStall getView() { return view; } diff --git a/src/main/java/forge/view/bazaar/ViewItem.java b/src/main/java/forge/gui/bazaar/ViewItem.java similarity index 96% rename from src/main/java/forge/view/bazaar/ViewItem.java rename to src/main/java/forge/gui/bazaar/ViewItem.java index 686e98ebe74..df86c538a3c 100644 --- a/src/main/java/forge/view/bazaar/ViewItem.java +++ b/src/main/java/forge/gui/bazaar/ViewItem.java @@ -1,4 +1,4 @@ -package forge.view.bazaar; +package forge.gui.bazaar; import java.awt.Font; diff --git a/src/main/java/forge/view/bazaar/ViewStall.java b/src/main/java/forge/gui/bazaar/ViewStall.java similarity index 99% rename from src/main/java/forge/view/bazaar/ViewStall.java rename to src/main/java/forge/gui/bazaar/ViewStall.java index 9987b0eb1b3..439603624c1 100644 --- a/src/main/java/forge/view/bazaar/ViewStall.java +++ b/src/main/java/forge/gui/bazaar/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.view.bazaar; +package forge.gui.bazaar; import java.awt.Component; import java.util.ArrayList; diff --git a/src/main/java/forge/view/bazaar/package-info.java b/src/main/java/forge/gui/bazaar/package-info.java similarity index 67% rename from src/main/java/forge/view/bazaar/package-info.java rename to src/main/java/forge/gui/bazaar/package-info.java index 0654bb67d3f..6a39bc8dcc1 100644 --- a/src/main/java/forge/view/bazaar/package-info.java +++ b/src/main/java/forge/gui/bazaar/package-info.java @@ -1,3 +1,3 @@ /** Views (as in model-view-controller) for Forge. */ -package forge.view.bazaar; +package forge.gui.bazaar; diff --git a/src/main/java/forge/gui/home/quest/VSubmenuChallenges.java b/src/main/java/forge/gui/home/quest/VSubmenuChallenges.java index 3ea3a0b09b2..5b04adffc5d 100644 --- a/src/main/java/forge/gui/home/quest/VSubmenuChallenges.java +++ b/src/main/java/forge/gui/home/quest/VSubmenuChallenges.java @@ -71,7 +71,7 @@ public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet, IVDoc { .fontSize(15).build(); private final FLabel lblTitle = new FLabel.Builder() .text("Title Hasn't Been Set Yet").fontAlign(SwingConstants.CENTER) - .fontSize(16).build(); + .fontSize(18).build(); private final FLabel lblNextChallengeInWins = new FLabel.Builder() .fontSize(15).build(); private final FLabel btnCurrentDeck = new FLabel.Builder() @@ -90,6 +90,8 @@ public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet, IVDoc { pnlTitle.setLayout(new MigLayout("insets 0, gap 0")); pnlTitle.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME2)); pnlTitle.add(lblTitle, "w 100%, h 100%, gap 0 0 0 0"); + pnlTitle.setBorder(null); + pnlTitle.setCornerDiameter(0); populateStats(); populateStart(); @@ -134,7 +136,7 @@ public enum VSubmenuChallenges implements IVSubmenu, IStatsAndPet, IVDoc { parentCell.getBody().removeAll(); parentCell.getBody().setOpaque(false); parentCell.getBody().setLayout(new MigLayout("insets 0, gap 0, wrap")); - parentCell.getBody().add(pnlTitle, "w 94%!, h 30px!, gap 3% 0 15px 15px"); + parentCell.getBody().add(pnlTitle, "w 100%!, h 30px!, gap 0 0 0 0"); parentCell.getBody().add(pnlStats, "w 94%!, gap 3% 0 0 20px"); parentCell.getBody().add(scrChallenges, "w 94%!, pushy, growy, gap 3% 0 0 0"); parentCell.getBody().add(pnlStart, "w 94%, gap 3% 0 15px 5%"); diff --git a/src/main/java/forge/view/ViewBazaarUI.java b/src/main/java/forge/view/ViewBazaarUI.java index 344f11ddc8e..3171a177032 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.view.bazaar.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.view.bazaar.ViewStall} + * @return {@link forge.gui.bazaar.ViewStall} */ public ViewStall getPnlSingleStall() { return this.pnlSingleStall;