From 7b816bf4623c0c8665968ced03a10f6a9575d06f Mon Sep 17 00:00:00 2001 From: nmihajlovski Date: Thu, 23 Feb 2017 14:48:09 +0100 Subject: [PATCH] Forming phrase from a camelCase or underscore. --- rapidoid-commons/src/main/java/org/rapidoid/commons/Str.java | 5 +++-- .../src/main/java/org/rapidoid/model/impl/BeanProperty.java | 3 ++- 2 files changed, 5 insertions(+), 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 index 1a59a21f41..8c2a96ee9e 100644 --- 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 index 290da4d6e9..d65e2e4f7d 100644 --- 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