From 6808be7a42ebccdd99e5c197d5ca7fe92d633899 Mon Sep 17 00:00:00 2001
From: Ryan1729 <ryan1729@gmail.com>
Date: Sun, 6 Oct 2019 01:33:52 -0600
Subject: [PATCH] route all `capitalize` calls through a new method

---
 .../src/main/java/forge/toolbox/FSkin.java            |  4 ++--
 .../src/main/java/forge/view/SimulateMatch.java       |  4 ++--
 forge-gui-mobile/src/forge/assets/FSkin.java          |  4 ++--
 forge-gui/src/main/java/forge/util/WordUtil.java      | 11 +++++++++++
 4 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 forge-gui/src/main/java/forge/util/WordUtil.java

diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
index f7e658da7ae..722c862906b 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
@@ -28,8 +28,8 @@ import forge.properties.ForgeConstants;
 import forge.properties.ForgePreferences;
 import forge.properties.ForgePreferences.FPref;
 import forge.util.OperatingSystem;
+import forge.util.WordUtil;
 import forge.view.FView;
-import org.apache.commons.lang3.text.WordUtils;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
@@ -1084,7 +1084,7 @@ public class FSkin {
                 allSkins = new ArrayList<>();
                 final List<String> skinDirectoryNames = getSkinDirectoryNames();
                 for (String skinDirectoryName : skinDirectoryNames) {
-                    allSkins.add(WordUtils.capitalize(skinDirectoryName.replace('_', ' ')));
+                    allSkins.add(WordUtil.capitalize(skinDirectoryName.replace('_', ' ')));
                 }
                 Collections.sort(allSkins);
             }
diff --git a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
index c5b9f0fad36..a680839fcb4 100644
--- a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
+++ b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
@@ -12,8 +12,8 @@ import forge.game.*;
 import forge.properties.ForgeConstants;
 import forge.tournament.system.*;
 import forge.util.TextUtil;
+import forge.util.WordUtil;
 import forge.util.storage.IStorage;
-import org.apache.commons.lang3.text.WordUtils;
 import org.apache.commons.lang3.time.StopWatch;
 
 import forge.deck.Deck;
@@ -75,7 +75,7 @@ public class SimulateMatch {
 
         GameType type = GameType.Constructed;
         if (params.containsKey("f")) {
-            type = GameType.valueOf(WordUtils.capitalize(params.get("f").get(0)));
+            type = GameType.valueOf(WordUtil.capitalize(params.get("f").get(0)));
         }
 
         GameRules rules = new GameRules(type);
diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
index 9ed94ee43c3..c783993411b 100644
--- a/forge-gui-mobile/src/forge/assets/FSkin.java
+++ b/forge-gui-mobile/src/forge/assets/FSkin.java
@@ -6,7 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.text.WordUtils;
+import forge.util.WordUtil;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
@@ -101,7 +101,7 @@ public class FSkin {
                     allSkins = new ArrayList<>();
                     final List<String> skinDirectoryNames = getSkinDirectoryNames();
                     for (final String skinDirectoryName : skinDirectoryNames) {
-                        allSkins.add(WordUtils.capitalize(skinDirectoryName.replace('_', ' ')));
+                        allSkins.add(WordUtil.capitalize(skinDirectoryName.replace('_', ' ')));
                     }
                     Collections.sort(allSkins);
                 }
diff --git a/forge-gui/src/main/java/forge/util/WordUtil.java b/forge-gui/src/main/java/forge/util/WordUtil.java
new file mode 100644
index 00000000000..4022c50acea
--- /dev/null
+++ b/forge-gui/src/main/java/forge/util/WordUtil.java
@@ -0,0 +1,11 @@
+package forge.util;
+
+import org.apache.commons.lang3.text.WordUtils;
+
+public class WordUtil {
+    public static String capitalize(String str) {
+        return WordUtils.capitalize(str);
+    }
+
+    private WordUtil() {}
+}