external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

route all capitalize calls through a new method

Browse Source
This commit is contained in:
Ryan1729
2019-10-06 01:33:52 -06:00
parent 70986149ef
commit 6808be7a42
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java
View File

@@ -28,8 +28,8 @@ import forge.properties.ForgeConstants;
import forge.properties.ForgePreferences; import forge.properties.ForgePreferences;
import forge.properties.ForgePreferences.FPref; import forge.properties.ForgePreferences.FPref;
import forge.util.OperatingSystem; import forge.util.OperatingSystem;
import forge.util.WordUtil;
import forge.view.FView; import forge.view.FView;
import org.apache.commons.lang3.text.WordUtils;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import javax.swing.*; import javax.swing.*;
@@ -1084,7 +1084,7 @@ public class FSkin {
allSkins = new ArrayList<>(); allSkins = new ArrayList<>();
final List<String> skinDirectoryNames = getSkinDirectoryNames(); final List<String> skinDirectoryNames = getSkinDirectoryNames();
for (String skinDirectoryName : skinDirectoryNames) { for (String skinDirectoryName : skinDirectoryNames) {
allSkins.add(WordUtils.capitalize(skinDirectoryName.replace('_', ' '))); allSkins.add(WordUtil.capitalize(skinDirectoryName.replace('_', ' ')));
} }
Collections.sort(allSkins); Collections.sort(allSkins);
} }

4
forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java
View File

@@ -12,8 +12,8 @@ import forge.game.*;
import forge.properties.ForgeConstants; import forge.properties.ForgeConstants;
import forge.tournament.system.*; import forge.tournament.system.*;
import forge.util.TextUtil; import forge.util.TextUtil;
import forge.util.WordUtil;
import forge.util.storage.IStorage; import forge.util.storage.IStorage;
import org.apache.commons.lang3.text.WordUtils;
import org.apache.commons.lang3.time.StopWatch; import org.apache.commons.lang3.time.StopWatch;
import forge.deck.Deck; import forge.deck.Deck;
@@ -75,7 +75,7 @@ public class SimulateMatch {
GameType type = GameType.Constructed; GameType type = GameType.Constructed;
if (params.containsKey("f")) { 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); GameRules rules = new GameRules(type);

4
forge-gui-mobile/src/forge/assets/FSkin.java
View File

@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang3.text.WordUtils; import forge.util.WordUtil;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
@@ -101,7 +101,7 @@ public class FSkin {
allSkins = new ArrayList<>(); allSkins = new ArrayList<>();
final List<String> skinDirectoryNames = getSkinDirectoryNames(); final List<String> skinDirectoryNames = getSkinDirectoryNames();
for (final String skinDirectoryName : skinDirectoryNames) { for (final String skinDirectoryName : skinDirectoryNames) {
allSkins.add(WordUtils.capitalize(skinDirectoryName.replace('_', ' '))); allSkins.add(WordUtil.capitalize(skinDirectoryName.replace('_', ' ')));
} }
Collections.sort(allSkins); Collections.sort(allSkins);
} }

11
forge-gui/src/main/java/forge/util/WordUtil.java Normal file
View File

@@ -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() {}
}