Merged HighlightGrid into Grid.

rapidoid-commons/src/main/resources/rapidoid-classes.txt

@@ -270,7 +270,6 @@ org.rapidoid.gui.GUI
 org.rapidoid.gui.GUIActions
 org.rapidoid.gui.GuiJpaUtil
 org.rapidoid.gui.Highlight
-org.rapidoid.gui.HighlightGrid
 org.rapidoid.gui.HtmlPage
 org.rapidoid.gui.HtmlPageUtils
 org.rapidoid.gui.I18N

rapidoid-gui/src/main/java/org/rapidoid/gui/Grid.java

@@ -51,6 +51,7 @@ public class Grid extends AbstractWidget<Grid> {
 	private volatile String[] columns = {};
 	private volatile Object[] headers = {};
 	private volatile String rowCmd;
+	private volatile String highlightRegex;
 
 	private volatile Mapper<Object, String> toUri;
 
@@ -214,6 +215,11 @@ protected String onClickScript(Item item) {
 	}
 
 	protected TdTag cell(Object value) {
+		if (U.notEmpty(highlightRegex)) {
+			String s = String.valueOf(value);
+			value = GUI.highlight(s, highlightRegex);
+		}
+
 		return td(value);
 	}
 
@@ -290,4 +296,12 @@ public Grid headers(Iterable<?> headers) {
 		return headers(U.array(headers));
 	}
 
+	public String highlightRegex() {
+		return highlightRegex;
+	}
+
+	public Grid highlightRegex(String highlightRegex) {
+		this.highlightRegex = highlightRegex;
+		return this;
+	}
 }