From 38d5a50b2377410911ee98ff7f827443c618c89a Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail.com>
Date: Fri, 4 Oct 2013 12:35:53 +0400
Subject: [PATCH] Issue #329: displaying a token image only from the same set,
 displaying magic card back image otherwise.

---
 .../plugins/card/dl/sources/DirectLinksForDownload.java  | 6 ++++--
 .../java/org/mage/plugins/card/images/ImageCache.java    | 5 +++++
 .../java/org/mage/plugins/card/utils/CardImageUtils.java | 9 +++++++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/DirectLinksForDownload.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/DirectLinksForDownload.java
index a0bcd861caa..b458e2777e6 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/DirectLinksForDownload.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/DirectLinksForDownload.java
@@ -29,13 +29,15 @@ public class DirectLinksForDownload implements Iterable<DownloadJob> {
 
     private static final Map<String, String> directLinks = new LinkedHashMap<String, String>();
 
+    public static final String cardbackFilename = "cardback.jpg";
+
     static {
-        directLinks.put("cardback.jpg", backsideUrl);
+        directLinks.put(cardbackFilename, backsideUrl);
     }
 
     private static final String DEFAULT_IMAGES_PATH =  File.separator + "default";
     private static final File DEFAULT_OUT_DIR = new File("plugins" + File.separator + "images" + DEFAULT_IMAGES_PATH);
-    private static File outDir  = DEFAULT_OUT_DIR;
+    public static File outDir  = DEFAULT_OUT_DIR;
 
     public DirectLinksForDownload(String path) {
         if (path == null) {
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
index 3c3ece92f8c..0fd8ad97436 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
@@ -11,11 +11,13 @@ import mage.client.dialog.PreferencesDialog;
 import mage.view.CardView;
 import org.apache.log4j.Logger;
 import org.mage.plugins.card.constants.Constants;
+import org.mage.plugins.card.dl.sources.DirectLinksForDownload;
 import org.mage.plugins.card.utils.CardImageUtils;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
+import java.io.File;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -77,6 +79,9 @@ public class ImageCache {
                         if (collectorId == 0) {
                             info.setToken(true);
                             path = CardImageUtils.generateTokenImagePath(info);
+                            if (path == null) {
+                                path = DirectLinksForDownload.outDir + File.separator + DirectLinksForDownload.cardbackFilename;
+                            }
                         } else {
                             path = CardImageUtils.generateImagePath(info);
                         }
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
index f893c9cff9b..157554e14a9 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
@@ -1,9 +1,12 @@
 package org.mage.plugins.card.utils;
 
 import de.schlichtherle.truezip.file.TFile;
+
+import java.io.File;
 import java.util.HashMap;
 import mage.client.constants.Constants;
 import mage.client.dialog.PreferencesDialog;
+import org.mage.plugins.card.dl.sources.DirectLinksForDownload;
 import org.mage.plugins.card.images.CardDownloadData;
 import org.mage.plugins.card.properties.SettingsManager;
 
@@ -11,6 +14,7 @@ public class CardImageUtils {
 
     private static HashMap<CardDownloadData, String> pathCache = new HashMap<CardDownloadData, String>();
 
+
     /**
      *
      * @return String if image exists, else null
@@ -23,10 +27,11 @@ public class CardImageUtils {
             String filePath = getTokenImagePath(card);
             TFile file = new TFile(filePath);
 
-            if (!file.exists()) {
+            // Issue #329
+            /*if (!file.exists()) {
                 filePath = searchForCardImage(card);
                 file = new TFile(filePath);
-            }
+            }*/
 
             if (file.exists()) {
                 pathCache.put(card, filePath);