From 844360fb34b2c0b6e58e7c64759065dac7c30a11 Mon Sep 17 00:00:00 2001 From: leriomaggio Date: Mon, 21 Jun 2021 11:43:01 +0100 Subject: [PATCH] CardEdition.Type now includes new methods for String representation (UI) --- .../src/main/java/forge/card/CardEdition.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java index 80ac4fac5a7..e06f6133d05 100644 --- a/forge-core/src/main/java/forge/card/CardEdition.java +++ b/forge-core/src/main/java/forge/card/CardEdition.java @@ -37,6 +37,7 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; +import forge.util.*; import org.apache.commons.lang3.StringUtils; import com.google.common.base.Function; @@ -52,11 +53,6 @@ import forge.card.CardDb.SetPreference; import forge.deck.CardPool; import forge.item.PaperCard; import forge.item.SealedProduct; -import forge.util.Aggregates; -import forge.util.FileSection; -import forge.util.FileUtil; -import forge.util.IItemReader; -import forge.util.MyRandom; import forge.util.storage.StorageBase; import forge.util.storage.StorageReaderBase; import forge.util.storage.StorageReaderFolder; @@ -105,6 +101,19 @@ public final class CardEdition implements Comparable { return "0"; } } + + public String toString(){ + String[] names = TextUtil.splitWithParenthesis(this.name().toLowerCase(), '_'); + for (int i = 0; i < names.length; i++) + names[i] = TextUtil.capitalize(names[i]); + return TextUtil.join(Arrays.asList(names), " "); + } + + public static Type fromString(String label){ + List names = Arrays.asList(TextUtil.splitWithParenthesis(label.toUpperCase(), ' ')); + String value = TextUtil.join(names, "_"); + return Type.valueOf(value); + } } public enum FoilType {