From c54cc4dfe6ded29138afe75b0a62753d79651f2d Mon Sep 17 00:00:00 2001 From: myk Date: Wed, 13 Mar 2013 14:29:10 +0000 Subject: [PATCH] ensure TokenEffect-generated tokens have correctly formed filenames --- .../java/forge/card/ability/effects/TokenEffect.java | 2 +- src/main/java/forge/item/CardToken.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/forge/card/ability/effects/TokenEffect.java b/src/main/java/forge/card/ability/effects/TokenEffect.java index 20c036b046e..4fdc7426cb3 100644 --- a/src/main/java/forge/card/ability/effects/TokenEffect.java +++ b/src/main/java/forge/card/ability/effects/TokenEffect.java @@ -67,7 +67,7 @@ public class TokenEffect extends SpellAbilityEffect { } if (mapParams.hasParam("TokenImage")) { - image = mapParams.getParam("TokenImage"); + image = CardToken.makeTokenFileName(mapParams.getParam("TokenImage")); } else { image = ""; } diff --git a/src/main/java/forge/item/CardToken.java b/src/main/java/forge/item/CardToken.java index a904480f963..9dbadce4d28 100644 --- a/src/main/java/forge/item/CardToken.java +++ b/src/main/java/forge/item/CardToken.java @@ -16,11 +16,9 @@ public class CardToken implements InventoryItemFromSet, IPaperCard { private String imageFileName; private CardRules card; - private static String toTokenFilename(final String in) { - final StringBuffer out = new StringBuffer(); - - out.append(ImageCache.TOKEN_PREFIX); - + // takes a string of the form " " such as: "B 0 0 Germ" + public static String makeTokenFileName(String in) { + StringBuffer out = new StringBuffer(ImageCache.TOKEN_PREFIX); char c; for (int i = 0; i < in.length(); i++) { c = in.charAt(i); @@ -40,7 +38,7 @@ public class CardToken implements InventoryItemFromSet, IPaperCard { public static String makeTokenFileName(String colors, String power, String toughness, String name) { StringBuilder fileName = new StringBuilder(); fileName.append(colors).append('_').append(power).append('_').append(toughness).append('_').append(name); - return toTokenFilename(fileName.toString()); + return makeTokenFileName(fileName.toString()); } public CardToken(final CardRules c, CardEdition edition0, final String imageFileName) {