From 3e6d4ecc0cab66ea902aa402cf4f8d13ea5528de Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sat, 9 Mar 2013 06:50:53 +0000 Subject: [PATCH] A hardcode to use cards from 6ED whenever S00 card is not found --- src/main/java/forge/ImageLoader.java | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/main/java/forge/ImageLoader.java b/src/main/java/forge/ImageLoader.java index 62a5d975e03..34358255317 100644 --- a/src/main/java/forge/ImageLoader.java +++ b/src/main/java/forge/ImageLoader.java @@ -32,14 +32,14 @@ final class ImageLoader extends CacheLoader { path = ForgeProps.getFile(NewConstants.IMAGE_BASE); } - File file = null; - boolean isPng = filename.endsWith(".png"); - final String fName = isPng || filename.endsWith(".jpg") ? filename : filename + ".jpg"; - file = new File(path, fName); - if (!file.exists()) { - // DEBUG - //System.out.println("File not found, no image created: " - //+ file); + File file = makeImageFile(path, filename); + boolean fileExists = file.exists(); + if (!fileExists && filename.startsWith("S00") ) { + file = makeImageFile(path, filename.replace("S00", "6ED")); + fileExists = file.exists(); + } + if (!fileExists ) { + //System.out.println("File not found, no image created: " + file); return null; } final BufferedImage image = getImage(file); @@ -47,6 +47,18 @@ final class ImageLoader extends CacheLoader { return image; } + /** + * TODO: Write javadoc for this method. + * @param path + * @param filename + * @return + */ + private File makeImageFile(File path, String filename) { + boolean isPng = filename.endsWith(".png"); + final String fName = isPng || filename.endsWith(".jpg") ? filename : filename + ".jpg"; + return new File(path, fName); + } + /** *

* getImage.