From ed48547f36c2f2db7a79fddaa007e2b5a42f3f71 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Tue, 28 Jan 2014 03:50:28 +0000 Subject: [PATCH] very minor tweaks --- .../forge/gui/home/sanctioned/VSubmenuConstructed.java | 8 +++----- .../main/java/forge/gui/match/controllers/CDetail.java | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java index c803f842eca..ae0af94bd05 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java @@ -68,7 +68,7 @@ import forge.gui.toolbox.FSkin; import forge.gui.toolbox.FSkin.SkinColor; import forge.gui.toolbox.FSkin.SkinImage; import forge.gui.toolbox.FTextField; -import forge.item.IPaperCard; + import forge.item.PaperCard; import forge.properties.ForgePreferences; import forge.properties.ForgePreferences.FPref; @@ -515,8 +515,6 @@ public enum VSubmenuConstructed implements IVSubmenu { addHandlersToVariantsControls(); updateVariantControlsVisibility(); - - } private final FMouseAdapter radioMouseAdapter = new FMouseAdapter() { @@ -1004,8 +1002,8 @@ public enum VSubmenuConstructed implements IVSubmenu { CardDetailPanel cdp = vgdAvatarDetails.get(index); if (obj instanceof PaperCard) { - pp.setVanguardButtonText(((IPaperCard) obj).getName()); - cdp.setCard(Card.getCardForUi((IPaperCard) obj)); + pp.setVanguardButtonText(((PaperCard) obj).getName()); + cdp.setCard(Card.getCardForUi((PaperCard) obj)); cdp.setVisible(true); refreshPanels(false, true); } else { diff --git a/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java b/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java index 3578aea292a..9b66e095972 100644 --- a/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java +++ b/forge-gui/src/main/java/forge/gui/match/controllers/CDetail.java @@ -45,13 +45,11 @@ public enum CDetail implements ICDoc { * @param c   Card object */ public void showCard(final Card c) { - if (null == c) { - return; - } view.getLblFlipcard().setVisible(c != null && (c.isDoubleFaced() || c.isFlipCard() || c.isFaceDown() && Singletons.getControl().mayShowCard(c))); view.getPnlDetail().setCard(c); - view.getParentCell().repaintSelf(); + if( view.getParentCell() != null) + view.getParentCell().repaintSelf(); } public void showCard(InventoryItem item) {