Several minor improvements.

rapidoid · Mar 5, 2015 · a7f2d74 · a7f2d74
1 parent df4923b
commit a7f2d74
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/rapidoid-utils/src/main/java/org/rapidoid/util/UTILS.java b/rapidoid-utils/src/main/java/org/rapidoid/util/UTILS.java
@@ -480,7 +480,7 @@ public static boolean contains(Object arrOrColl, Object value) {
 			Collection<?> coll = (Collection<?>) arrOrColl;
 			return coll.contains(value);
 		} else {
-			throw U.illegalArg("Expected array or collection!");
+			throw U.illegalArg("Expected array or collection, but found: " + U.readable(arrOrColl));
 		}
 	}
 

diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/BootstrapWidgets.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/BootstrapWidgets.java
@@ -62,6 +62,8 @@
 @Since("2.0.0")
 public abstract class BootstrapWidgets extends HTML {
 
+	public static final Tag NOTHING = span(awesome("ban"), " N/A").class_("nothing");
+
 	public static final ButtonWidget SAVE = cmd("^Save");
 
 	public static final ButtonWidget ADD = cmd("^Add");
@@ -456,23 +458,23 @@ public static Tag[] mediaList(List<Object> found) {
 	}
 
 	public static <T> Var<T> providedVar(String name, T defaultValue) {
-		return sessionVar(name, defaultValue);
+		return session(name, defaultValue);
 	}
 
 	public static HttpExchange httpExchange() {
 		return AppCtx.exchange();
 	}
 
-	public static <T> Var<T> sessionVar(String name, T defaultValue) {
+	public static <T> Var<T> session(String name, T defaultValue) {
 		return new SessionVar<T>(httpExchange(), name, defaultValue);
 	}
 
-	public static <T> Var<T> localVar(String name, T defaultValue) {
+	public static <T> Var<T> local(String name, T defaultValue) {
-		return sessionVar(name + ":" + viewId(httpExchange()), defaultValue);
+		return session(name + ":" + viewId(httpExchange()), defaultValue);
 	}
 
-	public static Var<Integer> localVar(String name, int defaultValue, int min, int max) {
+	public static Var<Integer> local(String name, int defaultValue, int min, int max) {
-		Var<Integer> var = sessionVar(name + ":" + viewId(httpExchange()), defaultValue);
+		Var<Integer> var = session(name + ":" + viewId(httpExchange()), defaultValue);
 
 		// TODO put the constraints into the variable implementation
 		Integer pageN = U.limited(min, var.get(), max);
@@ -635,16 +637,12 @@ private static Object display(Iterator<?> it) {
 		}
 
 		if (wrap.isEmpty()) {
-			return span(nothing()).class_("value-line");
+			return span(NOTHING).class_("value-line");
 		}
 
 		return wrap;
 	}
 
-	public static Tag nothing() {
-		return span(awesome("ban"), " N/A").class_("nothing");
-	}
-
 	public static Tag inline(Object... contents) {
 		Tag ctrls = div().class_("form-group");
 

diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/GridWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/widget/GridWidget.java
@@ -65,7 +65,7 @@ protected Tag render() {
 		String currentOrder = orderBy;
 
 		if (ordered) {
-			order = localVar("_order_" + widgetId(), orderBy);
+			order = local("_order_" + widgetId(), orderBy);
 			currentOrder = order.get();
 			slice = slice.orderedBy(currentOrder);
 		}
@@ -74,7 +74,7 @@ protected Tag render() {
 		Var<Integer> pageNumber = null;
 
 		if (paging) {
-			pageNumber = localVar("_page_" + widgetId(), 1, 1, pages);
+			pageNumber = local("_page_" + widgetId(), 1, 1, pages);
 			slice = getPage(slice, pageNumber.get());
 		}