Renamed some utils in U.

rapidoid · Jan 24, 2015 · fa4a807 · fa4a807
1 parent bdf9c46
commit fa4a807
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/rapidoid-beany/src/main/java/org/rapidoid/beany/Beany.java b/rapidoid-beany/src/main/java/org/rapidoid/beany/Beany.java
@@ -441,7 +441,7 @@ public int compare(E o1, E o2) {
 				U.must(val2 == null || val2 instanceof Comparable, "The property '%s' (%s) is not comparable!", order,
 						Cls.of((val2)));
 
-				return sign * U.cmp(val1, val2);
+				return sign * U.compare(val1, val2);
 			}
 		};
 		return comparator;

diff --git a/rapidoid-db-impl/src/main/java/org/rapidoid/db/impl/DbColumnImpl.java b/rapidoid-db-impl/src/main/java/org/rapidoid/db/impl/DbColumnImpl.java
@@ -74,7 +74,7 @@ public void deserializeBean(Object serialized) {
 
 	@Override
 	public int compareTo(DbColumn<E> col) {
-		return U.cmp(get(), col.get());
+		return U.compare(get(), col.get());
 	}
 
 }
diff --git a/rapidoid-pages/src/main/java/org/rapidoid/widget/BootstrapWidgets.java b/rapidoid-pages/src/main/java/org/rapidoid/widget/BootstrapWidgets.java
@@ -603,7 +603,7 @@ public static Object display(Object item) {
 			return display(iter.iterator());
 		} else if (item instanceof Object[]) {
 			Object[] arr = (Object[]) item;
-			return display(U.arrayIterator(arr));
+			return display(U.iterator(arr));
 		}
 
 		return isEntity(item) ? a(item).href(urlFor(item)) : Cls.str(item);

diff --git a/rapidoid-u/src/main/java/org/rapidoid/util/U.java b/rapidoid-u/src/main/java/org/rapidoid/util/U.java
@@ -244,7 +244,7 @@ public static <T> T[] array(T... items) {
 		return items;
 	}
 
-	public static <T> Iterator<T> arrayIterator(T[] arr) {
+	public static <T> Iterator<T> iterator(T[] arr) {
 		return Arrays.asList(arr).iterator();
 	}
 
@@ -609,7 +609,7 @@ public static <T> T singleOrNone(Collection<T> coll) {
 	}
 
 	@SuppressWarnings("unchecked")
-	public static <T> int cmp(T val1, T val2) {
+	public static <T> int compare(T val1, T val2) {
 		if (val1 == null && val2 == null) {
 			return 0;
 		} else if (val1 == null) {