From 5b43fd1dd0a4f3ee1908a458d2f70ab3efbe9b13 Mon Sep 17 00:00:00 2001 From: Vir4030 Date: Thu, 21 Aug 2014 21:43:18 -0500 Subject: [PATCH 1/2] convert cardcast white cards into pyx format capitalize the first letter and add a period if there's no punctuation at the end of the card --- .../cah/cardcast/CardcastService.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/net/socialgamer/cah/cardcast/CardcastService.java b/src/net/socialgamer/cah/cardcast/CardcastService.java index a311c63..e95c39c 100644 --- a/src/net/socialgamer/cah/cardcast/CardcastService.java +++ b/src/net/socialgamer/cah/cardcast/CardcastService.java @@ -99,6 +99,16 @@ public class CardcastService { return soft.get(); } + private static String sanitizeWhite(final String input) { + final StringBuilder sb = new StringBuilder(); + sb.append(input.substring(0, 1).toUpperCase()); + sb.append(input.substring(1)); + if (Character.isLetterOrDigit(input.charAt(input.length() - 1))) { + sb.append('.'); + } + return sb.toString(); + } + public CardcastDeck loadSet(final String setId) { if (!validIdPattern.matcher(setId).matches()) { return null; @@ -170,7 +180,20 @@ public class CardcastService { // The white cards should only ever have one element in text, but let's be safe. final List strs = new ArrayList(texts.size()); for (final Object o : texts) { - strs.add((String) o); + final String cardCastString = (String) o; + final StringBuilder pyxString = new StringBuilder(); + + // Cardcast's recommended format is to not capitalize the first letter + pyxString.append(cardCastString.substring(0, 1).toUpperCase()); + pyxString.append(cardCastString.substring(1)); + + // Cardcast's recommended format is to not include a period + if (Character.isLetterOrDigit(cardCastString.charAt(cardCastString.length() - 1))) { + pyxString.append('.'); + } + + // Cardcast's white cards are now formatted consistently with pyx cards + strs.add(pyxString.toString()); } final String text = StringUtils.join(strs, ""); final CardcastWhiteCard card = new CardcastWhiteCard(cardIdProvider.get(), text, setId); From 05325c01bc6758dccc9028b244c99240a1dcb9cd Mon Sep 17 00:00:00 2001 From: Vir4030 Date: Thu, 21 Aug 2014 22:02:20 -0500 Subject: [PATCH 2/2] convert cardcast white cards into pyx format capitalize the first letter and add a period if there's no punc --- src/net/socialgamer/cah/cardcast/CardcastService.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/net/socialgamer/cah/cardcast/CardcastService.java b/src/net/socialgamer/cah/cardcast/CardcastService.java index e95c39c..9dc942f 100644 --- a/src/net/socialgamer/cah/cardcast/CardcastService.java +++ b/src/net/socialgamer/cah/cardcast/CardcastService.java @@ -99,16 +99,6 @@ public class CardcastService { return soft.get(); } - private static String sanitizeWhite(final String input) { - final StringBuilder sb = new StringBuilder(); - sb.append(input.substring(0, 1).toUpperCase()); - sb.append(input.substring(1)); - if (Character.isLetterOrDigit(input.charAt(input.length() - 1))) { - sb.append('.'); - } - return sb.toString(); - } - public CardcastDeck loadSet(final String setId) { if (!validIdPattern.matcher(setId).matches()) { return null;