Transformed the special ElementGroup component into a regular GUI wid…

…get.
rapidoid · Nov 8, 2016 · 6ce2999 · 6ce2999
1 parent 361dd39
commit 6ce2999
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/GUI.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/GUI.java
@@ -27,9 +27,6 @@
 import org.rapidoid.commons.AnyObj;
 import org.rapidoid.commons.English;
 import org.rapidoid.commons.Str;
-import org.rapidoid.html.ElementGroup;
-import org.rapidoid.timeseries.TimeSeries;
-import org.rapidoid.gui.base.AbstractWidget;
 import org.rapidoid.gui.input.*;
 import org.rapidoid.gui.reqinfo.IReqInfo;
 import org.rapidoid.gui.reqinfo.ReqInfo;
@@ -47,6 +44,7 @@
 import org.rapidoid.model.Property;
 import org.rapidoid.render.Templates;
 import org.rapidoid.security.Role;
+import org.rapidoid.timeseries.TimeSeries;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Msc;
 import org.rapidoid.var.Var;
@@ -614,7 +612,8 @@ private static Object _display(Object item) {
 	private static boolean isBean(Object obj) {
 		return Cls.isBean(obj)
 			&& !(obj instanceof Tag)
-			&& !(obj instanceof AbstractWidget);
+			&& !(obj instanceof TagWidget)
+			&& !(obj instanceof MultiWidget);
 	}
 
 	private static Object display(Iterator<?> it) {
@@ -870,8 +869,11 @@ public static Tag copy(Object... content) {
 	public static boolean isGUI(Object result) {
 		return (result instanceof Tag)
 			|| (result instanceof HtmlPage)
-			|| (result instanceof TagWidget)
-			|| (result instanceof ElementGroup);
+			|| (result instanceof TagWidget);
+	}
+
+	public static MultiWidget multi(Object... elements) {
+		return new MultiWidget(elements);
 	}
 
 }
diff --git a/.../java/org/rapidoid/html/ElementGroup.java → ...in/java/org/rapidoid/gui/MultiWidget.java b/.../java/org/rapidoid/html/ElementGroup.java → ...in/java/org/rapidoid/gui/MultiWidget.java
@@ -1,13 +1,13 @@
-package org.rapidoid.html;
+package org.rapidoid.gui;
 
-import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.gui.base.AbstractWidget;
 import org.rapidoid.html.impl.TagRenderer;
 
 /*
  * #%L
- * rapidoid-html
+ * rapidoid-gui
  * %%
  * Copyright (C) 2014 - 2016 Nikolche Mihajlovski and contributors
  * %%
@@ -27,17 +27,17 @@
 
 @Authors("Nikolche Mihajlovski")
 @Since("4.1.0")
-public class ElementGroup extends RapidoidThing {
+public class MultiWidget extends AbstractWidget {
 
 	private final Object[] elements;
 
-	public ElementGroup(Object[] elements) {
+	public MultiWidget(Object[] elements) {
 		this.elements = elements;
 	}
 
 	@Override
-	public String toString() {
-		return TagRenderer.get().toHTML(elements, null);
+	protected Object render() {
+		return GUI.hardcoded(TagRenderer.get().toHTML(elements, null));
 	}
 
 }
diff --git a/rapidoid-html/src/main/java/org/rapidoid/html/HTML.java b/rapidoid-html/src/main/java/org/rapidoid/html/HTML.java
@@ -52,10 +52,6 @@ public static Tag hardcoded(String content) {
 		return new ConstantTag(content);
 	}
 
-	public static Object multi(Object... elements) {
-		return new ElementGroup(elements);
-	}
-
 	public static ATag a_void(Object... contents) {
 		return a(contents).href("javascript:void(0);");
 	}