Forming phrase from a camelCase or underscore.

rapidoid · Feb 23, 2017 · 7b816bf · 7b816bf
1 parent ccfdee7
commit 7b816bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/Str.java b/rapidoid-commons/src/main/java/org/rapidoid/commons/Str.java
@@ -64,8 +64,9 @@ public static String[] camelSplit(String s) {
 		return CAMEL_SPLITTER_PATTERN.split(s);
 	}
 
-	public static String camelPhrase(String s) {
-		return capitalized(U.join(" ", camelSplit(s)).toLowerCase());
+	public static String phrase(String s) {
+		String[] parts = s.contains("_") ? s.split("_") : camelSplit(s);
+		return capitalized(U.join(" ", parts).toLowerCase());
 	}
 
 	public static String replace(String s, String[][] repls) {

diff --git a/rapidoid-gui/src/main/java/org/rapidoid/model/impl/BeanProperty.java b/rapidoid-gui/src/main/java/org/rapidoid/model/impl/BeanProperty.java
@@ -93,7 +93,8 @@ static String pretty(String prop) {
 		if (prop.equals("id")) {
 			return "ID";
 		}
-		return Str.camelPhrase(prop);
+
+		return Str.phrase(prop);
 	}
 
 	@Override