From 962a3be9294cc554f9efb19b94979da4ada5c830 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sun, 24 Feb 2013 08:26:29 +0000
Subject: [PATCH] removed Card parameter from CardPicturePanel ctor (there was
 passed null in 4 cases out of 5)

---
 src/main/java/forge/gui/CardListViewer.java               | 2 +-
 src/main/java/forge/gui/CardPicturePanel.java             | 4 +---
 src/main/java/forge/gui/match/QuestWinLoseCardViewer.java | 2 +-
 src/main/java/forge/gui/match/views/VAntes.java           | 4 +++-
 src/main/java/forge/gui/match/views/VPicture.java         | 2 +-
 src/main/java/forge/gui/toolbox/CardViewer.java           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/forge/gui/CardListViewer.java b/src/main/java/forge/gui/CardListViewer.java
index ca2a14afe12..7ed027aaea0 100644
--- a/src/main/java/forge/gui/CardListViewer.java
+++ b/src/main/java/forge/gui/CardListViewer.java
@@ -109,7 +109,7 @@ public class CardListViewer {
         this.list = Collections.unmodifiableList(list);
         this.jList = new JList(new ChooserListModel());
         this.detail = new CardDetailPanel(null);
-        this.picture = new CardPicturePanel(null);
+        this.picture = new CardPicturePanel();
         this.ok = new CloseAction(JOptionPane.OK_OPTION, "OK");
 
         final Object[] options = new Object[] { new JButton(this.ok) };
diff --git a/src/main/java/forge/gui/CardPicturePanel.java b/src/main/java/forge/gui/CardPicturePanel.java
index 9a70777dac5..176707620bb 100644
--- a/src/main/java/forge/gui/CardPicturePanel.java
+++ b/src/main/java/forge/gui/CardPicturePanel.java
@@ -49,7 +49,7 @@ public final class CardPicturePanel extends JPanel implements CardContainer {
     private final ScaledImagePanel panel;
     private BufferedImage currentImage;
 
-    public CardPicturePanel(final Card c) {
+    public CardPicturePanel() {
         super(new BorderLayout());
 
         this.panel = new ScaledImagePanel();
@@ -65,8 +65,6 @@ public final class CardPicturePanel extends JPanel implements CardContainer {
                 CardPicturePanel.this.update();
             }
         });
-
-        this.setCard(c);
     }
 
     public void update() {
diff --git a/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java b/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java
index 0c31d3ee6f7..a8e82045509 100644
--- a/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java
+++ b/src/main/java/forge/gui/match/QuestWinLoseCardViewer.java
@@ -62,7 +62,7 @@ public class QuestWinLoseCardViewer extends FPanel {
         this.list = Collections.unmodifiableList(list);
         this.jList = new FList(new ChooserListModel());
         this.detail = new CardDetailPanel(null);
-        this.picture = new CardPicturePanel(null);
+        this.picture = new CardPicturePanel();
         this.scroller = new FScrollPane(this.jList);
 
         this.setCornerDiameter(20);
diff --git a/src/main/java/forge/gui/match/views/VAntes.java b/src/main/java/forge/gui/match/views/VAntes.java
index bbd85307894..b8fc86f49d0 100644
--- a/src/main/java/forge/gui/match/views/VAntes.java
+++ b/src/main/java/forge/gui/match/views/VAntes.java
@@ -180,7 +180,9 @@ public enum VAntes implements IVDoc<CAntes> {
             setLayout(new MigLayout("gap 0, insets 0, wrap"));
             add(new FLabel.Builder().fontSize(14).text(player.getName())
                     .fontAlign(SwingConstants.CENTER).build(), "w 160px, h 20px");
-            add(new CardPicturePanel(c0), "w 160px, h 230px");
+            CardPicturePanel picPanel = new CardPicturePanel();
+            add(picPanel, "w 160px, h 230px");
+            picPanel.setCard(c0);
         }
 
         /** @return {@link forge.game.player.Player} */
diff --git a/src/main/java/forge/gui/match/views/VPicture.java b/src/main/java/forge/gui/match/views/VPicture.java
index 2a4ca85b62c..fad1ef73157 100644
--- a/src/main/java/forge/gui/match/views/VPicture.java
+++ b/src/main/java/forge/gui/match/views/VPicture.java
@@ -42,7 +42,7 @@ public enum VPicture implements IVDoc<CPicture> {
     private final DragTab tab = new DragTab("Card Picture");
 
     // Top-level containers
-    private final CardPicturePanel pnlPicture = new CardPicturePanel(null);
+    private final CardPicturePanel pnlPicture = new CardPicturePanel();
     private final JLabel lblFlipcard = new JLabel(
             FSkin.getIcon(FSkin.InterfaceIcons.ICO_FLIPCARD));
 
diff --git a/src/main/java/forge/gui/toolbox/CardViewer.java b/src/main/java/forge/gui/toolbox/CardViewer.java
index d0ccfcad03d..01a1ffa7e78 100644
--- a/src/main/java/forge/gui/toolbox/CardViewer.java
+++ b/src/main/java/forge/gui/toolbox/CardViewer.java
@@ -58,7 +58,7 @@ public class CardViewer extends JPanel {
         this.list = Collections.unmodifiableList(list);
         this.jList = new JList(new ChooserListModel());
         this.detail = new CardDetailPanel(null);
-        this.picture = new CardPicturePanel(null);
+        this.picture = new CardPicturePanel();
 
         this.add(new JScrollPane(this.jList));
         this.add(this.picture);