Skip to content

Commit

Permalink
Moved camelCase utils from U into UTILS.
Browse files Browse the repository at this point in the history
  • Loading branch information
nmihajlovski committed Jan 24, 2015
1 parent fa4a807 commit bca370f
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 19 deletions.
Expand Up @@ -238,7 +238,7 @@ protected int setupMenuItems(String currentUrl, Class<?>[] screens, Object[] men
break; break;
} }


String title = Cls.getFieldValue(scr, "title", U.camelPhrase(name)); String title = Cls.getFieldValue(scr, "title", UTILS.camelPhrase(name));
String url = Apps.screenUrl(scr); String url = Apps.screenUrl(scr);
menuItems[k++] = a(title).href(url); menuItems[k++] = a(title).href(url);


Expand All @@ -250,7 +250,7 @@ protected int setupMenuItems(String currentUrl, Class<?>[] screens, Object[] men
for (int j = 0; j < scaffolding.size(); j++) { for (int j = 0; j < scaffolding.size(); j++) {
Class<?> scaff = scaffolding.get(j); Class<?> scaff = scaffolding.get(j);
String name = English.plural(scaff.getSimpleName()); String name = English.plural(scaff.getSimpleName());
String title = U.camelSplit(name); String title = UTILS.camelSplit(name);
String url = "/" + name.toLowerCase(); String url = "/" + name.toLowerCase();
menuItems[k++] = a(title).href(url); menuItems[k++] = a(title).href(url);


Expand All @@ -262,7 +262,7 @@ protected int setupMenuItems(String currentUrl, Class<?>[] screens, Object[] men
for (; i < screens.length; i++) { for (; i < screens.length; i++) {
Class<?> scr = screens[i]; Class<?> scr = screens[i];
String name = Apps.screenName(scr); String name = Apps.screenName(scr);
String title = Cls.getFieldValue(scr, "title", U.camelPhrase(name)); String title = Cls.getFieldValue(scr, "title", UTILS.camelPhrase(name));
String url = Apps.screenUrl(scr); String url = Apps.screenUrl(scr);
menuItems[k++] = a(title).href(url); menuItems[k++] = a(title).href(url);


Expand Down
Expand Up @@ -24,7 +24,7 @@
import java.lang.reflect.ParameterizedType; import java.lang.reflect.ParameterizedType;


import org.rapidoid.model.Property; import org.rapidoid.model.Property;
import org.rapidoid.util.U; import org.rapidoid.util.UTILS;


public class BeanProperty implements Property { public class BeanProperty implements Property {


Expand Down Expand Up @@ -89,7 +89,7 @@ private static String pretty(String prop) {
if (prop.equals("id")) { if (prop.equals("id")) {
return "ID"; return "ID";
} }
return U.camelPhrase(prop); return UTILS.camelPhrase(prop);
} }


@Override @Override
Expand Down
2 changes: 1 addition & 1 deletion rapidoid-pages/src/main/java/org/rapidoid/pages/Pages.java
Expand Up @@ -97,7 +97,7 @@ public static String defaultPageTitle(Class<?> pageClass) {
pageName = U.mid(pageName, 0, -4); pageName = U.mid(pageName, 0, -4);
} }


return U.camelPhrase(pageName); return UTILS.camelPhrase(pageName);
} }


public static String titleOf(HttpExchange x, Object target) { public static String titleOf(HttpExchange x, Object target) {
Expand Down
13 changes: 0 additions & 13 deletions rapidoid-u/src/main/java/org/rapidoid/util/U.java
Expand Up @@ -38,11 +38,6 @@


public class U { public class U {


// regex taken from
// http://stackoverflow.com/questions/2559759/how-do-i-convert-camelcase-into-human-readable-names-in-java
private static Pattern CAMEL_SPLITTER_PATTERN = Pattern
.compile("(?<=[A-Z])(?=[A-Z][a-z])|(?<=[^A-Z])(?=[A-Z])|(?<=[A-Za-z])(?=[^A-Za-z])");

private U() { private U() {
} }


Expand Down Expand Up @@ -586,14 +581,6 @@ public static int num(String s) {
return Integer.parseInt(s); return Integer.parseInt(s);
} }


public static String camelSplit(String s) {
return CAMEL_SPLITTER_PATTERN.matcher(s).replaceAll(" ");
}

public static String camelPhrase(String s) {
return capitalized(camelSplit(s).toLowerCase());
}

public static int limit(int min, int value, int max) { public static int limit(int min, int value, int max) {
return Math.min(Math.max(min, value), max); return Math.min(Math.max(min, value), max);
} }
Expand Down
13 changes: 13 additions & 0 deletions rapidoid-utils/src/main/java/org/rapidoid/util/UTILS.java
Expand Up @@ -61,6 +61,11 @@ public class UTILS implements Constants {


private static long measureStart; private static long measureStart;


// regex taken from
// http://stackoverflow.com/questions/2559759/how-do-i-convert-camelcase-into-human-readable-names-in-java
private static final Pattern CAMEL_SPLITTER_PATTERN = Pattern
.compile("(?<=[A-Z])(?=[A-Z][a-z])|(?<=[^A-Z])(?=[A-Z])|(?<=[A-Za-z])(?=[^A-Za-z])");

private UTILS() { private UTILS() {
} }


Expand Down Expand Up @@ -716,4 +721,12 @@ public static String fillIn(String template, String placeholder, String value) {
return template.replace("{{" + placeholder + "}}", value); return template.replace("{{" + placeholder + "}}", value);
} }


public static String camelSplit(String s) {
return CAMEL_SPLITTER_PATTERN.matcher(s).replaceAll(" ");
}

public static String camelPhrase(String s) {
return U.capitalized(camelSplit(s).toLowerCase());
}

} }

0 comments on commit bca370f

Please sign in to comment.