diff --git a/rapidoid-demo/src/main/java/custom/CustomizedPagerWidget.java b/rapidoid-demo/src/main/java/custom/CustomizedPagerWidget.java index 618383d729..6b820408d3 100644 --- a/rapidoid-demo/src/main/java/custom/CustomizedPagerWidget.java +++ b/rapidoid-demo/src/main/java/custom/CustomizedPagerWidget.java @@ -2,7 +2,7 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; -import org.rapidoid.gui.PagerWidget; +import org.rapidoid.gui.Pager; import org.rapidoid.html.Tag; import org.rapidoid.var.Var; @@ -28,7 +28,7 @@ @Authors("Nikolche Mihajlovski") @Since("2.0.0") -public class CustomizedPagerWidget extends PagerWidget { +public class CustomizedPagerWidget extends Pager { public CustomizedPagerWidget(int from, int to, Var pageNumber) { super(from, to, pageNumber); diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java b/rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java index 794f704ed3..abd9f65730 100644 --- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java +++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java @@ -25,7 +25,7 @@ import org.rapidoid.annotation.Transaction; import org.rapidoid.annotation.Controller; import org.rapidoid.app.GUI; -import org.rapidoid.gui.ButtonWidget; +import org.rapidoid.gui.Btn; import org.rapidoid.html.Tag; import org.rapidoid.plugins.db.DB; import org.rapidoid.security.annotation.CanInsert; @@ -47,8 +47,8 @@ public class About extends GUI { public Object content() { Tag mix = h2(a("Enter the mix").href("/mix")); - ButtonWidget tx = btn("Transactional").command("tx"); - ButtonWidget dlg = cmd("Dialog"); + Btn tx = btn("Transactional").command("tx"); + Btn dlg = cmd("Dialog"); return arr(mix, tx, dlg, ADD); } diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java b/rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java index fcb5cef057..168e74039b 100644 --- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java +++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java @@ -4,7 +4,7 @@ import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Controller; import org.rapidoid.app.GUI; -import org.rapidoid.gui.LayoutWidget; +import org.rapidoid.gui.Layout; import org.rapidoid.u.U; /* @@ -45,7 +45,7 @@ public Object content() { Object a8 = radios(U.list("A", "B"), "v2", "A"); Object a9 = checkboxes(U.list("A", "B", "C"), "v3", U.list("A", "C")); - LayoutWidget lay = layout(a1, a2, a3, a4, a5, a6, a7, a8, a9).cols(3); + Layout lay = layout(a1, a2, a3, a4, a5, a6, a7, a8, a9).cols(3); return arr(cmd("abc").warning(), lay, debug()); } diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/gui/HomeScreen.java b/rapidoid-demo/src/main/java/demo/taskplanner/gui/HomeScreen.java index 4f0a299d27..7b4a0df996 100644 --- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/HomeScreen.java +++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/HomeScreen.java @@ -4,9 +4,9 @@ import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Controller; import org.rapidoid.app.GUI; -import org.rapidoid.gui.CardWidget; +import org.rapidoid.gui.Card; import org.rapidoid.gui.FA; -import org.rapidoid.gui.StreamWidget; +import org.rapidoid.gui.VStream; import org.rapidoid.html.Tag; /* @@ -42,11 +42,11 @@ public Object content() { Tag upvote = FA.THUMBS_O_UP; Tag downvote = FA.THUMBS_O_DOWN; - CardWidget card = card(h3("{{it().priority}} priority"), h4("Desc: {{it().description}}")); + Card card = card(h3("{{it().priority}} priority"), h4("Desc: {{it().description}}")); card = card.controls(upvote, "123", downvote, star); card = card.header("{{it().title}}"); - StreamWidget stream = stream(card).cols(3).dataUrl("/task/page/{{page}}"); + VStream stream = stream(card).cols(3).dataUrl("/task/page/{{page}}"); int n = ctx().cookiepack("xy", 0) + 1; ctx().cookiepack().put("xy", n); diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java b/rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java index 00e45240f1..2c332f7210 100644 --- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java +++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java @@ -29,8 +29,8 @@ import org.rapidoid.annotation.Transaction; import org.rapidoid.annotation.Controller; import org.rapidoid.app.GUI; -import org.rapidoid.gui.FormWidget; -import org.rapidoid.gui.GridWidget; +import org.rapidoid.gui.Form; +import org.rapidoid.gui.Grid; import org.rapidoid.html.FieldType; import org.rapidoid.html.Tag; import org.rapidoid.plugins.db.DB; @@ -56,7 +56,7 @@ public class NewTaskScreen extends GUI { public Object content() { Tag caption1 = titleBox("Add new task"); - FormWidget frm = create(task).buttons(ADD, CANCEL); + Form frm = create(task).buttons(ADD, CANCEL); frm.field("description").setType(FieldType.TEXTAREA); frm.add(field(null, null, null, "abcd", null, FieldType.CHECKBOXES, U.list("AA", "b", "cDeF"), true, v2, null)); @@ -66,7 +66,7 @@ public Object content() { // frm.field("comments").setInput(div((Object[]) radios(U.list("a", "bb", "ccc"), v))); Tag caption2 = titleBox("Most recent tasks"); - GridWidget grid = grid(Task.class, "-id", 7, "id", "priority", "title"); + Grid grid = grid(Task.class, "-id", 7, "id", "priority", "title"); return row(col4(caption1, frm), col8(caption2, grid)); } diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/Forms.java b/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/Forms.java index ac2db838d0..19de7df3d3 100644 --- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/Forms.java +++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/Forms.java @@ -24,8 +24,8 @@ import org.rapidoid.annotation.Session; import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Controller; -import org.rapidoid.gui.BootstrapWidgets; -import org.rapidoid.gui.ButtonWidget; +import org.rapidoid.gui.Btn; +import org.rapidoid.gui.base.BootstrapWidgets; import org.rapidoid.html.FieldType; import org.rapidoid.html.FormLayout; import org.rapidoid.html.Tag; @@ -84,7 +84,7 @@ private Tag frm(final FormLayout layout, Var[] vars) { final Object[][] options = { null, null, null, opt1, opt2, opt3, opt4, null, null }; - final ButtonWidget[] buttons = { btn("Save").command("saveIt", vars[0]), cmd("Cancel", vars[0]) }; + final Btn[] buttons = { btn("Save").command("saveIt", vars[0]), cmd("Cancel", vars[0]) }; return div(form_(layout, names, desc, types, options, vars, buttons), ul_li((Object[]) vars)); } diff --git a/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/MixPage.java b/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/MixPage.java index 58b39a9d1a..793522238e 100644 --- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/MixPage.java +++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/MixPage.java @@ -24,9 +24,9 @@ import org.rapidoid.annotation.Session; import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Controller; -import org.rapidoid.gui.BootstrapWidgets; -import org.rapidoid.gui.ButtonWidget; -import org.rapidoid.gui.GridWidget; +import org.rapidoid.gui.Btn; +import org.rapidoid.gui.Grid; +import org.rapidoid.gui.base.BootstrapWidgets; import org.rapidoid.html.Tag; import org.rapidoid.html.tag.ATag; import org.rapidoid.html.tag.FormTag; @@ -56,15 +56,15 @@ public Object content(HttpExchange x) { FormTag formR = navbarForm(false, "Login", arr("user", "pass"), arr("Username", "Password")); - ButtonWidget abc = btn("abc").primary(); + Btn abc = btn("abc").primary(); - ButtonWidget xy = btn("X Z Y").command("xyz").info(); + Btn xy = btn("X Z Y").command("xyz").info(); Items items = Models.mockBeanItems(20, User.class); Tag caption = h1("Manage persons"); - GridWidget table = grid(items, null, 10); + Grid table = grid(items, null, 10); Object[] pageContent = arr(row(col6("Hello world!"), col3(abc, xy)), arr(caption, row(table))); diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/ButtonWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Btn.java similarity index 80% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/ButtonWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Btn.java index c28a223a17..651c0a13b1 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/ButtonWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Btn.java @@ -22,13 +22,14 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractCommand; import org.rapidoid.html.Tag; import org.rapidoid.html.tag.ButtonTag; import org.rapidoid.u.U; @Authors("Nikolche Mihajlovski") @Since("2.3.0") -public class ButtonWidget extends AbstractCommandWidget { +public class Btn extends AbstractCommand { private Object[] contents = {}; @@ -56,32 +57,32 @@ public Object[] contents() { return contents; } - public ButtonWidget contents(Object... contents) { + public Btn contents(Object... contents) { this.contents = contents; return this; } - public ButtonWidget primary() { + public Btn primary() { kind = "primary"; return this; } - public ButtonWidget success() { + public Btn success() { kind = "success"; return this; } - public ButtonWidget info() { + public Btn info() { kind = "info"; return this; } - public ButtonWidget warning() { + public Btn warning() { kind = "warning"; return this; } - public ButtonWidget danger() { + public Btn danger() { kind = "danger"; return this; } @@ -90,7 +91,7 @@ public String kind() { return kind; } - public ButtonWidget kind(String kind) { + public Btn kind(String kind) { this.kind = kind; return this; } @@ -99,7 +100,7 @@ public String linkTo() { return linkTo; } - public ButtonWidget linkTo(String linkTo) { + public Btn linkTo(String linkTo) { this.linkTo = linkTo; return this; } @@ -108,12 +109,12 @@ public String class_() { return class_; } - public ButtonWidget class_(String class_) { + public Btn class_(String class_) { this.class_ = class_; return this; } - public ButtonWidget onClick(Runnable onClickHandler) { + public Btn onClick(Runnable onClickHandler) { setHandler(onClickHandler); return this; } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/CardWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Card.java similarity index 88% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/CardWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Card.java index d9da385a16..5546fa924e 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/CardWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Card.java @@ -22,12 +22,13 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.Tag; import org.rapidoid.u.U; @Authors("Nikolche Mihajlovski") @Since("2.4.0") -public class CardWidget extends AbstractWidget { +public class Card extends AbstractWidget { private Object[] contents = {}; @@ -49,7 +50,7 @@ public Object[] contents() { return contents; } - public CardWidget contents(Object... contents) { + public Card contents(Object... contents) { this.contents = contents; return this; } @@ -58,7 +59,7 @@ public Object[] controls() { return controls; } - public CardWidget controls(Object... controls) { + public Card controls(Object... controls) { this.controls = controls; return this; } @@ -67,7 +68,7 @@ public Object header() { return header; } - public CardWidget header(Object header) { + public Card header(Object header) { this.header = header; return this; } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/DebugWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Debug.java similarity index 91% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/DebugWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Debug.java index 1b634cdd1d..d1fa00e828 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/DebugWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Debug.java @@ -26,18 +26,19 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.u.U; @Authors("Nikolche Mihajlovski") @Since("2.3.1") -public class DebugWidget extends AbstractWidget { +public class Debug extends AbstractWidget { @Override protected Object render() { return multi(sessionPanel(), localPanel()); } - protected PanelWidget sessionPanel() { + protected Panel sessionPanel() { Map visibleAttributes = U.map(); for (Entry e : ctx().session().entrySet()) { @@ -49,7 +50,7 @@ protected PanelWidget sessionPanel() { return panel(grid(visibleAttributes)).header("Session scope"); } - protected PanelWidget localPanel() { + protected Panel localPanel() { Map visibleAttributes = U.map(); for (Entry e : ctx().data().entrySet()) { diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/FA.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/FA.java index cb542d5e46..28bcbf3cd8 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/FA.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/FA.java @@ -2,6 +2,7 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.BootstrapWidgets; import org.rapidoid.html.Tag; /* diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/FormFieldWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Field.java similarity index 97% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/FormFieldWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Field.java index 0931da99a9..e894f6f6f8 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/FormFieldWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Field.java @@ -34,6 +34,7 @@ import org.rapidoid.cls.TypeKind; import org.rapidoid.ctx.Ctx; import org.rapidoid.ctx.Ctxs; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.FieldType; import org.rapidoid.html.FormLayout; import org.rapidoid.html.Tag; @@ -51,7 +52,7 @@ @Authors("Nikolche Mihajlovski") @Since("2.0.0") -public class FormFieldWidget extends AbstractWidget { +public class Field extends AbstractWidget { protected FormMode mode; protected Property prop; @@ -69,7 +70,7 @@ public class FormFieldWidget extends AbstractWidget { protected Tag label; protected Tag input; - public FormFieldWidget(FormMode mode, FormLayout layout, Property prop, String name, String desc, FieldType type, + public Field(FormMode mode, FormLayout layout, Property prop, String name, String desc, FieldType type, Collection options, boolean required, Var var, DataPermissions permissions) { this.mode = U.or(mode, FormMode.EDIT); @@ -84,7 +85,7 @@ public FormFieldWidget(FormMode mode, FormLayout layout, Property prop, String n this.permissions = permissions; } - public FormFieldWidget(FormMode mode, FormLayout layout, Item item, Property prop) { + public Field(FormMode mode, FormLayout layout, Item item, Property prop) { this.mode = U.or(mode, FormMode.EDIT); this.layout = layout; this.prop = prop; diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/FormWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Form.java similarity index 81% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/FormWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Form.java index db9a365025..cfd8c0d601 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/FormWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Form.java @@ -27,6 +27,7 @@ import org.rapidoid.annotation.Since; import org.rapidoid.cls.Cls; import org.rapidoid.ctx.Ctxs; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.FieldType; import org.rapidoid.html.FormLayout; import org.rapidoid.html.Tag; @@ -40,34 +41,34 @@ @Authors("Nikolche Mihajlovski") @Since("2.0.0") -public class FormWidget extends AbstractWidget { +public class Form extends AbstractWidget { protected final Item item; protected final FormMode mode; protected List props; - protected List fields = U.list(); - protected List buttons; + protected List fields = U.list(); + protected List buttons; protected FormLayout layout = FormLayout.VERTICAL; protected boolean hasFields = false; - public FormWidget(FormMode mode, Item item, String... properties) { + public Form(FormMode mode, Item item, String... properties) { this.mode = mode; this.item = item; init(item, properties); } - public FormWidget(FormMode mode, FormLayout layout, String[] fieldNames, String[] fieldLabels, - FieldType[] fieldTypes, Collection[] options, Var[] vars, ButtonWidget[] buttons) { + public Form(FormMode mode, FormLayout layout, String[] fieldNames, String[] fieldLabels, + FieldType[] fieldTypes, Collection[] options, Var[] vars, Btn[] buttons) { this.mode = mode; this.item = null; this.layout = layout; for (int i = 0; i < fieldNames.length; i++) { - fields.add(new FormFieldWidget(mode, layout, null, fieldNames[i], fieldLabels[i], fieldTypes[i], + fields.add(new Field(mode, layout, null, fieldNames[i], fieldLabels[i], fieldTypes[i], options[i], true, vars[i], null)); } @@ -86,37 +87,37 @@ public int fieldIndex(String fieldName) { throw U.rte("Cannot find field '%s'!", fieldName); } - public FormWidget field(String fieldName, FormFieldWidget field) { + public Form field(String fieldName, Field field) { return field(fieldIndex(fieldName), field); } - public FormWidget field(int fieldIndex, FormFieldWidget field) { + public Form field(int fieldIndex, Field field) { this.fields.set(fieldIndex, field); return this; } - public FormFieldWidget field(String fieldName) { + public Field field(String fieldName) { return field(fieldIndex(fieldName)); } - public FormFieldWidget field(int fieldIndex) { + public Field field(int fieldIndex) { return this.fields.get(fieldIndex); } /************************** BUTTONS ********************************/ - public FormWidget buttons(ButtonWidget... buttons) { + public Form buttons(Btn... buttons) { this.buttons = UTILS.withoutNulls(buttons); return this; } - public List buttons() { + public List buttons() { return this.buttons; } /************************** OTHER ********************************/ - public FormWidget add(FormFieldWidget field) { + public Form add(Field field) { if (field.getMode() == null) { field.setMode(mode); } @@ -135,7 +136,7 @@ protected void init(Item item, String... properties) { for (int i = 0; i < propN; i++) { Property prop = props.get(i); - FormFieldWidget field = field(mode, layout, item, prop); + Field field = field(mode, layout, item, prop); fields.add(field); } } @@ -149,7 +150,7 @@ protected void initPermissions() { Object target = item.value(); Class targetClass = Cls.of(target); - for (FormFieldWidget field : fields) { + for (Field field : fields) { if (field.permissions == null) { field.permissions = Secure.getPropertyPermissions(Ctxs.ctx().username(), targetClass, target, field.name); @@ -172,7 +173,7 @@ protected FormTag render() { protected FormTag addFormFields(FormTag form) { for (int i = 0; i < fields.size(); i++) { - FormFieldWidget field = getField(i); + Field field = getField(i); if (field != null) { form = form.append(field); hasFields = true; @@ -190,8 +191,8 @@ protected Tag noFormFields() { return h4("Insufficient permissions!"); } - protected FormFieldWidget getField(int index) { - FormFieldWidget field = fields.get(index); + protected Field getField(int index) { + Field field = fields.get(index); if (field != null) { return field.isFieldAllowed() ? field : null; diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/GridWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Grid.java similarity index 89% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/GridWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Grid.java index 70d5d58e38..2732647e6f 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/GridWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Grid.java @@ -24,6 +24,7 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.Tag; import org.rapidoid.html.tag.TdTag; import org.rapidoid.model.Item; @@ -34,7 +35,7 @@ @Authors("Nikolche Mihajlovski") @Since("2.0.0") -public class GridWidget extends AbstractWidget { +public class Grid extends AbstractWidget { private final Items items; @@ -43,7 +44,7 @@ public class GridWidget extends AbstractWidget { private Object[] columns = {}; private String rowCmd; - public GridWidget(Items items, String sortOrder, int pageSize, String... columns) { + public Grid(Items items, String sortOrder, int pageSize, String... columns) { this.items = items; this.orderBy = sortOrder; this.pageSize = pageSize; @@ -80,16 +81,16 @@ protected Tag render() { Tag header = tableHeader(props, order); Tag body = tableBody(props, slice); - PagerWidget pager = paging ? pager(1, pages, pageNumber) : noPager(); + Pager pager = paging ? pager(1, pages, pageNumber) : noPager(); return fullTable(header, body, pager); } - protected PagerWidget noPager() { + protected Pager noPager() { return null; } - protected Tag fullTable(Tag header, Tag body, PagerWidget pager) { + protected Tag fullTable(Tag header, Tag body, Pager pager) { return row(table_(thead(header), body), pager); } @@ -183,17 +184,17 @@ public Object[] columns() { return columns; } - public GridWidget orderBy(String orderBy) { + public Grid orderBy(String orderBy) { this.orderBy = orderBy; return this; } - public GridWidget pageSize(int pageSize) { + public Grid pageSize(int pageSize) { this.pageSize = pageSize; return this; } - public GridWidget columns(Object... columns) { + public Grid columns(Object... columns) { this.columns = columns; return this; } @@ -202,7 +203,7 @@ public String rowCmd() { return rowCmd; } - public GridWidget rowCmd(String rowCmd) { + public Grid rowCmd(String rowCmd) { this.rowCmd = rowCmd; return this; } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/HighlightWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Highlight.java similarity index 92% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/HighlightWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Highlight.java index 8a5fa941e0..905cd6ca0a 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/HighlightWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Highlight.java @@ -26,17 +26,18 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.Tag; import org.rapidoid.u.U; @Authors("Nikolche Mihajlovski") @Since("2.0.0") -public class HighlightWidget extends AbstractWidget { +public class Highlight extends AbstractWidget { private String text; private String regex; - public HighlightWidget(String text, String regex) { + public Highlight(String text, String regex) { this.text = text; this.regex = regex; } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/HighlightedGridWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/HighlightGrid.java similarity index 85% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/HighlightedGridWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/HighlightGrid.java index cf05df7220..aaadbafb7a 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/HighlightedGridWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/HighlightGrid.java @@ -28,15 +28,15 @@ // TODO use grid decorator instead @Authors("Nikolche Mihajlovski") @Since("2.0.0") -public class HighlightedGridWidget extends GridWidget { +public class HighlightGrid extends Grid { private String regex; - public HighlightedGridWidget(Items items, String sortOrder, int pageSize, String... properties) { + public HighlightGrid(Items items, String sortOrder, int pageSize, String... properties) { super(items, sortOrder, pageSize, properties); } - public GridWidget regex(String regex) { + public Grid regex(String regex) { this.regex = regex; return this; } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/PageWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPage.java similarity index 92% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/PageWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPage.java index b81c68024a..c8c35b6225 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/PageWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPage.java @@ -27,6 +27,7 @@ import org.rapidoid.config.Conf; import org.rapidoid.ctx.Ctx; import org.rapidoid.ctx.Ctxs; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.gui.menu.PageMenu; import org.rapidoid.html.Tag; import org.rapidoid.plugins.Plugins; @@ -38,7 +39,7 @@ @Authors("Nikolche Mihajlovski") @Since("5.0.0") -public class PageWidget extends AbstractWidget { +public class HtmlPage extends AbstractWidget { private static volatile ITemplate PAGE_TEMPLATE; @@ -68,7 +69,7 @@ private static void initTemplates() { private PageMenu menu; - public PageWidget(Object content) { + public HtmlPage(Object content) { this.content = content; } @@ -120,7 +121,7 @@ public String title() { return title; } - public PageWidget title(String title) { + public HtmlPage title(String title) { this.title = title; return this; } @@ -129,7 +130,7 @@ public Object content() { return content; } - public PageWidget content(Object content) { + public HtmlPage content(Object content) { this.content = content; return this; } @@ -138,7 +139,7 @@ public PageMenu menu() { return menu; } - public PageWidget menu(PageMenu menu) { + public HtmlPage menu(PageMenu menu) { this.menu = menu; return this; } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/KeyValueGridWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/KVGrid.java similarity index 68% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/KeyValueGridWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/KVGrid.java index 25b6f9e87a..8879ae8de1 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/KeyValueGridWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/KVGrid.java @@ -25,17 +25,24 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.tag.TableTag; +import org.rapidoid.lambda.Mapper; @Authors("Nikolche Mihajlovski") @Since("2.4.0") -public class KeyValueGridWidget extends AbstractWidget { +public class KVGrid extends AbstractWidget { + + private final String[] headers = { "Key", "Value" }; + + @SuppressWarnings("rawtypes") + private final Mapper[] view = { null, null }; private Map map; @Override protected Object render() { - TableTag tbl = table_(tr(th("Key"), th("Value"))); + TableTag tbl = table_(tr(th(headers[0]), th(headers[1]))); for (Entry e : map.entrySet()) { tbl = tbl.append(tr(td(e.getKey()), td(e.getValue()))); @@ -48,9 +55,19 @@ protected Object render() { return map; } - public KeyValueGridWidget map(Map map) { + public KVGrid map(Map map) { this.map = map; return this; } + public String[] headers() { + return headers; + } + + public KVGrid headers(String keyHeader, String valueHeader) { + this.headers[0] = keyHeader; + this.headers[1] = valueHeader; + return this; + } + } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/LayoutWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Layout.java similarity index 90% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/LayoutWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Layout.java index 76140e08d8..134364d1f9 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/LayoutWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Layout.java @@ -24,12 +24,13 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.Tag; import org.rapidoid.u.U; @Authors("Nikolche Mihajlovski") @Since("2.3.0") -public class LayoutWidget extends AbstractWidget { +public class Layout extends AbstractWidget { private Object[] contents = {}; @@ -65,7 +66,7 @@ public Object[] contents() { return contents; } - public LayoutWidget contents(Object... contents) { + public Layout contents(Object... contents) { this.contents = contents; return this; } @@ -74,7 +75,7 @@ public int cols() { return cols; } - public LayoutWidget cols(int cols) { + public Layout cols(int cols) { this.cols = cols; return this; } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/PagerWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Pager.java similarity index 94% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/PagerWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Pager.java index 696354968a..9dbc439b32 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/PagerWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Pager.java @@ -22,18 +22,19 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.Tag; import org.rapidoid.var.Var; @Authors("Nikolche Mihajlovski") @Since("2.0.0") -public class PagerWidget extends AbstractWidget { +public class Pager extends AbstractWidget { private int from; private int to; private Var pageNumber; - public PagerWidget(int from, int to, Var pageNumber) { + public Pager(int from, int to, Var pageNumber) { this.from = from; this.to = to; this.pageNumber = pageNumber; diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/PanelWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Panel.java similarity index 86% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/PanelWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Panel.java index 154e573ad4..aa5a1f6840 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/PanelWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Panel.java @@ -22,17 +22,18 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.Tag; @Authors("Nikolche Mihajlovski") @Since("2.2.0") -public class PanelWidget extends AbstractWidget { +public class Panel extends AbstractWidget { private Object header; private Object content; private Object footer; - public PanelWidget(Object content) { + public Panel(Object content) { this.content = content; } @@ -48,7 +49,7 @@ public Object header() { return header; } - public PanelWidget header(Object header) { + public Panel header(Object header) { this.header = header; return this; } @@ -57,7 +58,7 @@ public Object content() { return content; } - public PanelWidget content(Object content) { + public Panel content(Object content) { this.content = content; return this; } @@ -66,7 +67,7 @@ public Object footer() { return footer; } - public PanelWidget footer(Object footer) { + public Panel footer(Object footer) { this.footer = footer; return this; } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/SnippetWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/Snippet.java similarity index 96% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/SnippetWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/Snippet.java index 7e3e39b4ec..7ccc0d825a 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/SnippetWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/Snippet.java @@ -22,13 +22,14 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.Tag; import org.rapidoid.lambda.Mapper; import org.rapidoid.u.U; @Authors("Nikolche Mihajlovski") @Since("2.3.0") -public class SnippetWidget extends AbstractWidget { +public class Snippet extends AbstractWidget { private static final String JAVA_KEYWORDS = "abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while"; @@ -44,7 +45,7 @@ public class SnippetWidget extends AbstractWidget { protected String code; - public SnippetWidget(String code) { + public Snippet(String code) { this.code = code; } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/StreamWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/VStream.java similarity index 92% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/StreamWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/VStream.java index d1eaef828b..3eaf58ff55 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/StreamWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/VStream.java @@ -22,12 +22,13 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.base.AbstractWidget; import org.rapidoid.html.Tag; import org.rapidoid.u.U; @Authors("Nikolche Mihajlovski") @Since("2.3.0") -public class StreamWidget extends AbstractWidget { +public class VStream extends AbstractWidget { private Object template; @@ -84,7 +85,7 @@ public Object template() { return template; } - public StreamWidget template(Object template) { + public VStream template(Object template) { this.template = template; return this; } @@ -93,7 +94,7 @@ public String dataUrl() { return dataUrl; } - public StreamWidget dataUrl(String dataUrl) { + public VStream dataUrl(String dataUrl) { this.dataUrl = dataUrl; return this; } @@ -102,7 +103,7 @@ public int cols() { return cols; } - public StreamWidget cols(int cols) { + public VStream cols(int cols) { this.cols = cols; return this; } diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/AbstractCommandWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/base/AbstractCommand.java similarity index 94% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/AbstractCommandWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/base/AbstractCommand.java index 8f15a87b70..f33095d140 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/AbstractCommandWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/base/AbstractCommand.java @@ -1,4 +1,4 @@ -package org.rapidoid.gui; +package org.rapidoid.gui.base; /* * #%L @@ -30,7 +30,7 @@ @Authors("Nikolche Mihajlovski") @Since("4.2.0") -public abstract class AbstractCommandWidget> extends AbstractWidget { +public abstract class AbstractCommand> extends AbstractWidget { private String command; diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/AbstractWidget.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/base/AbstractWidget.java similarity index 98% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/AbstractWidget.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/base/AbstractWidget.java index 51024e3d1c..f4d3a93e3f 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/AbstractWidget.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/base/AbstractWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.gui; +package org.rapidoid.gui.base; /* * #%L diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/BootstrapWidgets.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/base/BootstrapWidgets.java similarity index 83% rename from rapidoid-gui/src/main/java/org/rapidoid/gui/BootstrapWidgets.java rename to rapidoid-gui/src/main/java/org/rapidoid/gui/base/BootstrapWidgets.java index f10b04f406..e9f8ff278e 100644 --- a/rapidoid-gui/src/main/java/org/rapidoid/gui/BootstrapWidgets.java +++ b/rapidoid-gui/src/main/java/org/rapidoid/gui/base/BootstrapWidgets.java @@ -1,4 +1,4 @@ -package org.rapidoid.gui; +package org.rapidoid.gui.base; import java.io.Serializable; import java.util.Collection; @@ -14,6 +14,21 @@ import org.rapidoid.cls.TypeKind; import org.rapidoid.config.Conf; import org.rapidoid.ctx.Ctxs; +import org.rapidoid.gui.Btn; +import org.rapidoid.gui.Card; +import org.rapidoid.gui.Debug; +import org.rapidoid.gui.Field; +import org.rapidoid.gui.Form; +import org.rapidoid.gui.FormMode; +import org.rapidoid.gui.Grid; +import org.rapidoid.gui.Highlight; +import org.rapidoid.gui.KVGrid; +import org.rapidoid.gui.Layout; +import org.rapidoid.gui.HtmlPage; +import org.rapidoid.gui.Pager; +import org.rapidoid.gui.Panel; +import org.rapidoid.gui.Snippet; +import org.rapidoid.gui.VStream; import org.rapidoid.gui.var.ArrayContainerVar; import org.rapidoid.gui.var.CollectionContainerVar; import org.rapidoid.gui.var.EqualityVar; @@ -74,33 +89,33 @@ public abstract class BootstrapWidgets extends HTML { public static final Tag N_A = NOTHING; - public static final ButtonWidget SAVE = cmd("^Save"); + public static final Btn SAVE = cmd("^Save"); - public static final ButtonWidget ADD = cmd("^Add"); + public static final Btn ADD = cmd("^Add"); - public static final ButtonWidget UPDATE = cmd("^Update"); + public static final Btn UPDATE = cmd("^Update"); - public static final ButtonWidget INSERT = cmd("^Insert"); + public static final Btn INSERT = cmd("^Insert"); - public static final ButtonWidget DELETE = cmd("!Delete"); + public static final Btn DELETE = cmd("!Delete"); - public static final ButtonWidget YES_DELETE = cmd("!YesDelete").contents("Yes, delete!"); + public static final Btn YES_DELETE = cmd("!YesDelete").contents("Yes, delete!"); - public static final ButtonWidget REMOVE = cmd("!Remove"); + public static final Btn REMOVE = cmd("!Remove"); - public static final ButtonWidget DESTROY = cmd("!Destroy"); + public static final Btn DESTROY = cmd("!Destroy"); - public static final ButtonWidget YES = cmd("^Yes"); + public static final Btn YES = cmd("^Yes"); - public static final ButtonWidget NO = cmd("No"); + public static final Btn NO = cmd("No"); - public static final ButtonWidget OK = cmd("^OK"); + public static final Btn OK = cmd("^OK"); - public static final ButtonWidget CANCEL = navigate("Cancel"); + public static final Btn CANCEL = navigate("Cancel"); - public static final ButtonWidget BACK = navigate("Back"); + public static final Btn BACK = navigate("Back"); - public static final ButtonWidget EDIT = cmd("^Edit"); + public static final Btn EDIT = cmd("^Edit"); public static TableTag table_(Object... contents) { return table(contents).class_("table table-striped table-hover"); @@ -166,8 +181,8 @@ public static ATag a_awesome(String fontAwesomeIcon, Object... contents) { return a_void(awesome(fontAwesomeIcon), NBSP, contents); } - public static ButtonWidget btn(Object... contents) { - ButtonWidget btn = Cls.customizable(ButtonWidget.class).contents(contents); + public static Btn btn(Object... contents) { + Btn btn = Cls.customizable(Btn.class).contents(contents); for (Object content : contents) { if (content instanceof String) { @@ -351,7 +366,7 @@ public static Tag mid10(Object... contents) { return row(col1(), col10(contents), col1()); } - public static ButtonWidget cmd(String cmd, Object... args) { + public static Btn cmd(String cmd, Object... args) { boolean primary = cmd.startsWith("^"); boolean danger = cmd.startsWith("!"); boolean warning = cmd.startsWith("?"); @@ -362,7 +377,7 @@ public static ButtonWidget cmd(String cmd, Object... args) { String caption = U.capitalized(cmd); - ButtonWidget btn = btn(caption); + Btn btn = btn(caption); if (primary) { btn = btn.primary(); } else if (danger) { @@ -374,13 +389,13 @@ public static ButtonWidget cmd(String cmd, Object... args) { return btn.command(cmd, args); } - public static ButtonWidget navigate(String cmd) { + public static Btn navigate(String cmd) { String caption = U.capitalized(cmd); return btn(caption).linkTo(cmd); } - public static ButtonWidget[] cmds(String... commands) { - ButtonWidget[] cmds = new ButtonWidget[commands.length]; + public static Btn[] cmds(String... commands) { + Btn[] cmds = new Btn[commands.length]; for (int i = 0; i < cmds.length; i++) { cmds[i] = cmd(commands[i]); @@ -397,75 +412,75 @@ public static Tag right(Object... contents) { return span(contents).class_("pull-right"); } - public static PanelWidget panel(Object... contents) { - return Cls.customizable(PanelWidget.class, new Object[] { UTILS.flat(contents) }); + public static Panel panel(Object... contents) { + return Cls.customizable(Panel.class, new Object[] { UTILS.flat(contents) }); } - public static PageWidget page(Object... contents) { - return Cls.customizable(PageWidget.class, new Object[] { UTILS.flat(contents) }); + public static HtmlPage page(Object... contents) { + return Cls.customizable(HtmlPage.class, new Object[] { UTILS.flat(contents) }); } - public static GridWidget grid(Class type, Object[] items, String sortOrder, int pageSize, + public static Grid grid(Class type, Object[] items, String sortOrder, int pageSize, String... properties) { return grid(Models.beanItems(type, items), sortOrder, pageSize, properties); } - public static GridWidget grid(Class type, Iterable items, String sortOrder, int pageSize, + public static Grid grid(Class type, Iterable items, String sortOrder, int pageSize, String... properties) { return grid(type, U.array(items), sortOrder, pageSize, properties); } - public static GridWidget grid(Items items, String sortOrder, int pageSize, String... properties) { - return Cls.customizable(GridWidget.class, items, sortOrder, pageSize, properties); + public static Grid grid(Items items, String sortOrder, int pageSize, String... properties) { + return Cls.customizable(Grid.class, items, sortOrder, pageSize, properties); } - public static KeyValueGridWidget grid(Map map) { - return Cls.customizable(KeyValueGridWidget.class).map(map); + public static KVGrid grid(Map map) { + return Cls.customizable(KVGrid.class).map(map); } - public static PagerWidget pager(int from, int to, Var pageNumber) { - return Cls.customizable(PagerWidget.class, from, to, pageNumber); + public static Pager pager(int from, int to, Var pageNumber) { + return Cls.customizable(Pager.class, from, to, pageNumber); } - public static FormWidget form_(FormLayout layout, String[] fieldsNames, String[] fieldsDesc, - FieldType[] fieldTypes, Object[][] options, Var[] vars, ButtonWidget[] buttons) { - return Cls.customizable(FormWidget.class, layout, fieldsNames, fieldsDesc, fieldTypes, options, vars, buttons); + public static Form form_(FormLayout layout, String[] fieldsNames, String[] fieldsDesc, + FieldType[] fieldTypes, Object[][] options, Var[] vars, Btn[] buttons) { + return Cls.customizable(Form.class, layout, fieldsNames, fieldsDesc, fieldTypes, options, vars, buttons); } - public static FormWidget show(Object bean, String... properties) { + public static Form show(Object bean, String... properties) { return show(Models.item(bean), properties); } - public static FormWidget show(final Item item, String... properties) { + public static Form show(final Item item, String... properties) { // FIXME make fluent and customizable! - return new FormWidget(FormMode.SHOW, item, properties); + return new Form(FormMode.SHOW, item, properties); } - public static FormWidget edit(Object bean, String... properties) { + public static Form edit(Object bean, String... properties) { return edit(Models.item(bean), properties); } - public static FormWidget edit(final Item item, String... properties) { + public static Form edit(final Item item, String... properties) { // FIXME make fluent and customizable! - return new FormWidget(FormMode.EDIT, item, properties); + return new Form(FormMode.EDIT, item, properties); } - public static FormWidget create(Object bean, String... properties) { + public static Form create(Object bean, String... properties) { return create(Models.item(bean), properties); } - public static FormWidget create(final Item item, String... properties) { + public static Form create(final Item item, String... properties) { // FIXME make fluent and customizable! - return new FormWidget(FormMode.CREATE, item, properties); + return new Form(FormMode.CREATE, item, properties); } - public static FormFieldWidget field(FormMode mode, FormLayout layout, Property prop, String name, String desc, + public static Field field(FormMode mode, FormLayout layout, Property prop, String name, String desc, FieldType type, Collection options, boolean required, Var var, DataPermissions permissions) { - return new FormFieldWidget(mode, layout, prop, name, desc, type, options, required, var, permissions); + return new Field(mode, layout, prop, name, desc, type, options, required, var, permissions); } - public static FormFieldWidget field(FormMode mode, FormLayout layout, Item item, Property prop) { - return new FormFieldWidget(mode, layout, item, prop); + public static Field field(FormMode mode, FormLayout layout, Item item, Property prop) { + return new Field(mode, layout, item, prop); } public static Property prop(String name, Calc calc) { @@ -480,7 +495,7 @@ public static Items beanItems(Class beanType, T... beans) { return Models.beanItems(beanType, beans); } - public static GridWidget grid(Class entityType, int pageSize, String... properties) { + public static Grid grid(Class entityType, int pageSize, String... properties) { Iterable all = DB.getAll(entityType); return grid(entityType, all, "", pageSize, properties); } @@ -568,7 +583,7 @@ public static Object highlight(String text) { } public static Object highlight(String text, String regex) { - return Cls.customizable(HighlightWidget.class, text, regex); + return Cls.customizable(Highlight.class, text, regex); } public static InputTag email(Var var) { @@ -780,20 +795,20 @@ public static Tag inline(Object... contents) { return form(ctrls).class_("form-inline"); } - public static LayoutWidget layout(Object... contents) { - return Cls.customizable(LayoutWidget.class).contents(contents); + public static Layout layout(Object... contents) { + return Cls.customizable(Layout.class).contents(contents); } - public static LayoutWidget layout(Iterable contents) { + public static Layout layout(Iterable contents) { return layout(U.array(contents)); } - public static SnippetWidget snippet(String code) { - return new SnippetWidget(code); + public static Snippet snippet(String code) { + return new Snippet(code); } - public static StreamWidget stream(Object ngTemplate) { - return Cls.customizable(StreamWidget.class).template(ngTemplate); + public static VStream stream(Object ngTemplate) { + return Cls.customizable(VStream.class).template(ngTemplate); } public static Object values(Object... values) { @@ -824,8 +839,8 @@ private static boolean hasGUIElements(Object value) { return false; } - public static CardWidget card(Object... contents) { - return Cls.customizable(CardWidget.class).contents(contents); + public static Card card(Object... contents) { + return Cls.customizable(Card.class).contents(contents); } @SuppressWarnings("unchecked") @@ -857,14 +872,14 @@ public static Object i18n(String multiLanguageText, Object... formatArgs) { return new MultiLanguageWidget(multiLanguageText, formatArgs); } - public static ButtonWidget xClose(String cmd) { + public static Btn xClose(String cmd) { Tag sp1 = span(hardcoded("×")).attr("aria-hidden", "true"); Tag sp2 = span("Close").class_("sr-only"); return cmd(cmd).class_("close").contents(sp1, sp2); } - public static DebugWidget debug() { - return Cls.customizable(DebugWidget.class); + public static Debug debug() { + return Cls.customizable(Debug.class); } public static Object box(Object... contents) { diff --git a/rapidoid-gui/src/test/java/org/rapidoid/widget/PagerWidgetTest.java b/rapidoid-gui/src/test/java/org/rapidoid/widget/PagerWidgetTest.java index 46951ffd2a..4481099741 100644 --- a/rapidoid-gui/src/test/java/org/rapidoid/widget/PagerWidgetTest.java +++ b/rapidoid-gui/src/test/java/org/rapidoid/widget/PagerWidgetTest.java @@ -22,8 +22,8 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; -import org.rapidoid.gui.BootstrapWidgets; -import org.rapidoid.gui.PagerWidget; +import org.rapidoid.gui.Pager; +import org.rapidoid.gui.base.BootstrapWidgets; import org.rapidoid.var.Var; @Authors("Nikolche Mihajlovski") @@ -37,7 +37,7 @@ public void testPagerWidget() { Var pageN = BootstrapWidgets.var("page", 3); - PagerWidget pager = BootstrapWidgets.pager(1, 7, pageN); + Pager pager = BootstrapWidgets.pager(1, 7, pageN); print(pager); eq(pageN.get().intValue(), 3); diff --git a/rapidoid-gui/src/test/java/org/rapidoid/widget/PlaygroundWidget.java b/rapidoid-gui/src/test/java/org/rapidoid/widget/PlaygroundWidget.java index 5bda2e405f..be1b7f5ace 100644 --- a/rapidoid-gui/src/test/java/org/rapidoid/widget/PlaygroundWidget.java +++ b/rapidoid-gui/src/test/java/org/rapidoid/widget/PlaygroundWidget.java @@ -22,7 +22,7 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; -import org.rapidoid.gui.BootstrapWidgets; +import org.rapidoid.gui.base.BootstrapWidgets; import org.rapidoid.html.Tag; import org.rapidoid.html.tag.ButtonTag; import org.rapidoid.html.tag.InputTag; diff --git a/rapidoid-gui/src/test/java/org/rapidoid/widget/TableWidgetTest.java b/rapidoid-gui/src/test/java/org/rapidoid/widget/TableWidgetTest.java index ebd5f22acf..6940885d4c 100644 --- a/rapidoid-gui/src/test/java/org/rapidoid/widget/TableWidgetTest.java +++ b/rapidoid-gui/src/test/java/org/rapidoid/widget/TableWidgetTest.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; -import org.rapidoid.gui.BootstrapWidgets; -import org.rapidoid.gui.GridWidget; +import org.rapidoid.gui.Grid; +import org.rapidoid.gui.base.BootstrapWidgets; import org.rapidoid.model.Items; import org.rapidoid.model.Models; @@ -42,7 +42,7 @@ public void testTableWidget() { Items items = Models.beanItemsInfer(john, rambo); - GridWidget table = BootstrapWidgets.grid(items, null, 10); + Grid table = BootstrapWidgets.grid(items, null, 10); print(table); hasRegex(table, "]*?>Name"); diff --git a/rapidoid-web/src/main/java/org/rapidoid/app/AppGUI.java b/rapidoid-web/src/main/java/org/rapidoid/app/AppGUI.java index 4946e0137c..20af2f2c32 100644 --- a/rapidoid-web/src/main/java/org/rapidoid/app/AppGUI.java +++ b/rapidoid-web/src/main/java/org/rapidoid/app/AppGUI.java @@ -5,8 +5,8 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; import org.rapidoid.beany.Beany; -import org.rapidoid.gui.BootstrapWidgets; -import org.rapidoid.gui.GridWidget; +import org.rapidoid.gui.Grid; +import org.rapidoid.gui.base.BootstrapWidgets; import org.rapidoid.lambda.Predicate; import org.rapidoid.model.Items; import org.rapidoid.model.impl.DbItems; @@ -61,28 +61,28 @@ public static Items all(Predicate match) { return all(match, Beany. comparator("id")); } - public static GridWidget grid(Class type, String sortOrder, int pageSize, String... properties) { + public static Grid grid(Class type, String sortOrder, int pageSize, String... properties) { return grid(all(type, sortOrder), sortOrder, pageSize, properties); } - public static GridWidget grid(Class type) { + public static Grid grid(Class type) { return grid(all(type, ""), "", 10); } - public static GridWidget grid(String type) { + public static Grid grid(String type) { return grid(Entities.getEntityType(type)); } - public static GridWidget grid(Predicate match) { + public static Grid grid(Predicate match) { return grid(all(match), "id", 10, new String[0]); } - public static GridWidget grid(Class type, Predicate match, String sortOrder, int pageSize, + public static Grid grid(Class type, Predicate match, String sortOrder, int pageSize, String... properties) { return grid(all(type, match, sortOrder), sortOrder, pageSize, properties); } - public static GridWidget grid(Class type, Predicate match, Comparator orderBy, int pageSize, + public static Grid grid(Class type, Predicate match, Comparator orderBy, int pageSize, String... properties) { return grid(all(type, match, orderBy), null, pageSize, properties); } diff --git a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java index d6c6068802..e4be20d78c 100644 --- a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java +++ b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java @@ -26,7 +26,7 @@ import org.rapidoid.ctx.Ctx; import org.rapidoid.ctx.Ctxs; import org.rapidoid.ctx.Roles; -import org.rapidoid.gui.FormWidget; +import org.rapidoid.gui.Form; import org.rapidoid.html.Tag; import org.rapidoid.security.annotation.DevMode; import org.rapidoid.u.U; @@ -41,7 +41,7 @@ public Object content() { Ctx ctx = Ctxs.ctx(); if (ctx.isLoggedIn()) { Object userDetails = show(ctx.user(), "name", "username", "email"); - FormWidget userRoles = show(U.map("roles", Roles.getRolesFor(ctx.username()))); + Form userRoles = show(U.map("roles", Roles.getRolesFor(ctx.username()))); return row(caption, userDetails, userRoles); } else { return row(caption, h4("Not logged in!")); diff --git a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java index 2f4efc61ba..6000da6bac 100644 --- a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java +++ b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java @@ -22,7 +22,7 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; -import org.rapidoid.gui.FormWidget; +import org.rapidoid.gui.Form; import org.rapidoid.html.Tag; import org.rapidoid.plugins.db.DB; import org.rapidoid.u.U; @@ -41,7 +41,7 @@ public Object content() { this.entity = getEntityById(); Tag caption = h2("Edit " + U.capitalized(ctx().pathSegment(0).substring(4))); - FormWidget form = edit(entity).buttons(SAVE, CANCEL); + Form form = edit(entity).buttons(SAVE, CANCEL); return mid6(caption, form); } diff --git a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/ListEntityScreenGeneric.java b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/ListEntityScreenGeneric.java index 5bdb1e3220..40539cc180 100644 --- a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/ListEntityScreenGeneric.java +++ b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/ListEntityScreenGeneric.java @@ -25,8 +25,8 @@ import org.rapidoid.annotation.Since; import org.rapidoid.cls.Cls; import org.rapidoid.ctx.Ctxs; -import org.rapidoid.gui.ButtonWidget; -import org.rapidoid.gui.GridWidget; +import org.rapidoid.gui.Btn; +import org.rapidoid.gui.Grid; import org.rapidoid.html.Tag; import org.rapidoid.plugins.entities.Entities; import org.rapidoid.security.Secure; @@ -47,10 +47,10 @@ public Object content() { String entityName = Cls.entityName(entityType); Tag caption = titleBox(entityName + " List"); - GridWidget grid = grid(entityType, 10); + Grid grid = grid(entityType, 10); boolean canAdd = Secure.canInsert(Ctxs.ctx().username(), Entities.create(entityType)); - ButtonWidget btnAdd = canAdd ? btn("Add " + entityName).primary().command("Add") : null; + Btn btnAdd = canAdd ? btn("Add " + entityName).primary().command("Add") : null; return row(caption, grid, btnAdd); } diff --git a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java index b68e4343bb..1181982e44 100644 --- a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java +++ b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java @@ -22,7 +22,7 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; -import org.rapidoid.gui.FormWidget; +import org.rapidoid.gui.Form; import org.rapidoid.html.Tag; import org.rapidoid.plugins.db.DB; import org.rapidoid.plugins.entities.Entities; @@ -41,7 +41,7 @@ public NewEntityScreenGeneric(Class entityType) { public Object content() { Tag caption = h2("New " + U.capitalized(ctx().pathSegment(0).substring(3))); - FormWidget form = create(entity).buttons(SAVE, CANCEL, INSERT); + Form form = create(entity).buttons(SAVE, CANCEL, INSERT); return mid6(caption, form); } diff --git a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java index d51fdc11c7..ddad47c6a8 100644 --- a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java +++ b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java @@ -26,8 +26,8 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; import org.rapidoid.app.GUI; -import org.rapidoid.gui.GridWidget; -import org.rapidoid.gui.HighlightedGridWidget; +import org.rapidoid.gui.Grid; +import org.rapidoid.gui.HighlightGrid; import org.rapidoid.html.Tag; import org.rapidoid.http.HttpExchange; import org.rapidoid.model.Items; @@ -49,7 +49,7 @@ public Object content(HttpExchange x) { Tag title = titleBox("Total " + found.size() + " search results", queryInfo); String regex = "(?i)" + Pattern.quote(query); - GridWidget grid = new HighlightedGridWidget(items, "", 10, "id", "_class", "_str").regex(regex); + Grid grid = new HighlightGrid(items, "", 10, "id", "_class", "_str").regex(regex); return div(title, grid); } diff --git a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java index f32c36bb44..56a77173eb 100644 --- a/rapidoid-web/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java +++ b/rapidoid-web/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java @@ -25,8 +25,8 @@ import org.rapidoid.cls.Cls; import org.rapidoid.ctx.Ctx; import org.rapidoid.ctx.Ctxs; -import org.rapidoid.gui.ButtonWidget; -import org.rapidoid.gui.FormWidget; +import org.rapidoid.gui.Btn; +import org.rapidoid.gui.Form; import org.rapidoid.html.Tag; import org.rapidoid.plugins.db.DB; import org.rapidoid.security.Secure; @@ -46,11 +46,11 @@ public Object content() { this.entity = getEntityById(); Tag caption = h2(U.capitalized(ctx().pathSegment(0)) + " Details").style("margin-bottom:15px;"); - FormWidget details = show(entity); + Form details = show(entity); Ctx ctx = Ctxs.ctx(); - ButtonWidget btnEdit = Secure.canUpdate(ctx.username(), entity) ? EDIT : null; - ButtonWidget btnDelete = Secure.canDelete(ctx.username(), entity) ? DELETE : null; + Btn btnEdit = Secure.canUpdate(ctx.username(), entity) ? EDIT : null; + Btn btnDelete = Secure.canDelete(ctx.username(), entity) ? DELETE : null; details = details.buttons(btnEdit, BACK, btnDelete); diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/AboutScreen.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/AboutScreen.java index a11a71e8e2..fd5096a484 100644 --- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/AboutScreen.java +++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/AboutScreen.java @@ -24,7 +24,7 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; import org.rapidoid.app.GUI; -import org.rapidoid.gui.ButtonWidget; +import org.rapidoid.gui.Btn; import org.rapidoid.html.Tag; import org.rapidoid.security.annotation.CanInsert; import org.rapidoid.u.U; @@ -44,8 +44,8 @@ public class AboutScreen extends GUI { public Object content() { Tag mix = h2(a("Enter the mix").href("/mix")); - ButtonWidget tx = btn("Transactional").command("tx"); - ButtonWidget dlg = cmd("Dialog"); + Btn tx = btn("Transactional").command("tx"); + Btn dlg = cmd("Dialog"); return arr(mix, tx, dlg, ADD); } diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ControlsScreen.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ControlsScreen.java index fcfb51ab39..9afacfa64a 100644 --- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ControlsScreen.java +++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ControlsScreen.java @@ -3,7 +3,7 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; import org.rapidoid.app.GUI; -import org.rapidoid.gui.LayoutWidget; +import org.rapidoid.gui.Layout; import org.rapidoid.u.U; /* @@ -44,7 +44,7 @@ public Object content() { Object a8 = radios(U.list("A", "B"), "v2", "A"); Object a9 = checkboxes(U.list("A", "B", "C"), "v3", U.list("A", "C")); - LayoutWidget lay = layout(a1, a2, a3, a4, a5, a6, a7, a8, a9).cols(3); + Layout lay = layout(a1, a2, a3, a4, a5, a6, a7, a8, a9).cols(3); return arr(cmd("abc").warning(), lay, debug()); } diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/HomeScreen.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/HomeScreen.java index 1e1d1e399f..8c67db83d1 100644 --- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/HomeScreen.java +++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/HomeScreen.java @@ -3,9 +3,9 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; import org.rapidoid.app.GUI; -import org.rapidoid.gui.CardWidget; +import org.rapidoid.gui.Card; import org.rapidoid.gui.FA; -import org.rapidoid.gui.StreamWidget; +import org.rapidoid.gui.VStream; import org.rapidoid.html.Tag; /* @@ -41,11 +41,11 @@ public Object content() { Tag upvote = FA.THUMBS_O_UP; Tag downvote = FA.THUMBS_O_DOWN; - CardWidget card = card(h3("{{it().priority}} priority"), h4("Desc: {{it().description}}")); + Card card = card(h3("{{it().priority}} priority"), h4("Desc: {{it().description}}")); card = card.controls(upvote, "123", downvote, star); card = card.header("{{it().title}}"); - StreamWidget stream = stream(card).cols(3).dataUrl("/task/page/{{page}}"); + VStream stream = stream(card).cols(3).dataUrl("/task/page/{{page}}"); return arr(cmd("Refresh").info(), stream); } diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ManageTasksScreen.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ManageTasksScreen.java index a9a93c386c..d74a1c6df4 100644 --- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ManageTasksScreen.java +++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/ManageTasksScreen.java @@ -25,7 +25,7 @@ import org.rapidoid.annotation.Order; import org.rapidoid.annotation.Since; import org.rapidoid.app.GUI; -import org.rapidoid.gui.GridWidget; +import org.rapidoid.gui.Grid; import org.rapidoid.html.Tag; import org.rapidoidx.demo.taskplanner.model.Task; @@ -38,7 +38,7 @@ public class ManageTasksScreen extends GUI { public Object content() { Tag caption = titleBox("Manage tasks"); - GridWidget grid = grid(Task.class, "-priority", 10, "id", "title", "priority"); + Grid grid = grid(Task.class, "-priority", 10, "id", "title", "priority"); return row(caption, grid); } diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/MyTasksScreen.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/MyTasksScreen.java index 4c4bd515ff..850ae59e7f 100644 --- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/MyTasksScreen.java +++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/MyTasksScreen.java @@ -29,7 +29,7 @@ import org.rapidoid.app.GUI; import org.rapidoid.beany.Beany; import org.rapidoid.ctx.Ctxs; -import org.rapidoid.gui.GridWidget; +import org.rapidoid.gui.Grid; import org.rapidoid.html.Tag; import org.rapidoid.lambda.Predicate; import org.rapidoid.security.annotation.LoggedIn; @@ -46,7 +46,7 @@ public class MyTasksScreen extends GUI { public Object content() { Tag c1 = titleBox("Tasks owned by me"); - GridWidget grid1 = grid(Task.class, new Predicate() { + Grid grid1 = grid(Task.class, new Predicate() { @Override public boolean eval(Task t) throws Exception { User user = t.owner.get(); @@ -56,7 +56,7 @@ public boolean eval(Task t) throws Exception { Tag c2 = titleBox("Tasks shared with me"); - GridWidget grid2 = grid(Task.class, new Predicate() { + Grid grid2 = grid(Task.class, new Predicate() { @Override public boolean eval(Task t) throws Exception { return Beany.projection(t.sharedWith, "username").contains(Ctxs.ctx().username()); diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/NewTaskScreen.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/NewTaskScreen.java index df067d22d8..4a0e8de981 100644 --- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/NewTaskScreen.java +++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/NewTaskScreen.java @@ -28,8 +28,8 @@ import org.rapidoid.annotation.Session; import org.rapidoid.annotation.Since; import org.rapidoid.app.GUI; -import org.rapidoid.gui.FormWidget; -import org.rapidoid.gui.GridWidget; +import org.rapidoid.gui.Form; +import org.rapidoid.gui.Grid; import org.rapidoid.html.FieldType; import org.rapidoid.html.Tag; import org.rapidoid.u.U; @@ -56,7 +56,7 @@ public class NewTaskScreen extends GUI { public Object content() { Tag caption1 = titleBox("Add new task"); - FormWidget frm = create(task).buttons(ADD, CANCEL); + Form frm = create(task).buttons(ADD, CANCEL); frm.field("description").setType(FieldType.TEXTAREA); frm.add(field(null, null, null, "abcd", null, FieldType.CHECKBOXES, U.list("AA", "b", "cDeF"), true, v2, null)); @@ -66,7 +66,7 @@ public Object content() { frm.field("comments").setInput(div((Object[]) radios(U.list("a", "bb", "ccc"), v))); Tag caption2 = titleBox("Most recent tasks"); - GridWidget grid = grid(Task.class, "-id", 7, "id", "priority", "title"); + Grid grid = grid(Task.class, "-id", 7, "id", "priority", "title"); return row(col4(caption1, frm), col8(caption2, grid)); } diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/FormsPage.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/FormsPage.java index 2fd8a3ea38..e50c3af941 100644 --- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/FormsPage.java +++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/FormsPage.java @@ -24,8 +24,8 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Session; import org.rapidoid.annotation.Since; -import org.rapidoid.gui.BootstrapWidgets; -import org.rapidoid.gui.ButtonWidget; +import org.rapidoid.gui.Btn; +import org.rapidoid.gui.base.BootstrapWidgets; import org.rapidoid.html.FieldType; import org.rapidoid.html.FormLayout; import org.rapidoid.html.Tag; @@ -83,7 +83,7 @@ private Tag frm(final FormLayout layout, Var[] vars) { final Object[][] options = { null, null, null, opt1, opt2, opt3, opt4, null, null }; - final ButtonWidget[] buttons = { btn("Save").command("saveIt", vars[0]), cmd("Cancel", vars[0]) }; + final Btn[] buttons = { btn("Save").command("saveIt", vars[0]), cmd("Cancel", vars[0]) }; return div(form_(layout, names, desc, types, options, vars, buttons), ul_li((Object[]) vars)); } diff --git a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/MixPage.java b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/MixPage.java index 5bd16531c7..59bb58d533 100644 --- a/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/MixPage.java +++ b/rapidoid-x-demo/src/main/java/org/rapidoidx/demo/taskplanner/gui/extra/MixPage.java @@ -24,9 +24,9 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Session; import org.rapidoid.annotation.Since; -import org.rapidoid.gui.BootstrapWidgets; -import org.rapidoid.gui.ButtonWidget; -import org.rapidoid.gui.GridWidget; +import org.rapidoid.gui.Btn; +import org.rapidoid.gui.Grid; +import org.rapidoid.gui.base.BootstrapWidgets; import org.rapidoid.html.Tag; import org.rapidoid.html.tag.ATag; import org.rapidoid.html.tag.FormTag; @@ -54,15 +54,15 @@ public Object content(HttpExchange x) { FormTag formR = navbarForm(false, "Login", arr("user", "pass"), arr("Username", "Password")); - ButtonWidget abc = btn("abc").primary(); + Btn abc = btn("abc").primary(); - ButtonWidget xy = btn("X Z Y").command("xyz").info(); + Btn xy = btn("X Z Y").command("xyz").info(); Items items = Models.mockBeanItems(20, Person.class); Tag caption = h1("Manage persons"); - GridWidget table = grid(items, null, 10); + Grid table = grid(items, null, 10); Object[] pageContent = arr(row(col6("Hello world!"), col3(abc, xy)), arr(caption, row(table))); diff --git a/rapidoid-x-fullstack/src/main/java/org/rapidoidx/fullstack/Full.java b/rapidoid-x-fullstack/src/main/java/org/rapidoidx/fullstack/Full.java index 6224864680..8d04aa460e 100644 --- a/rapidoid-x-fullstack/src/main/java/org/rapidoidx/fullstack/Full.java +++ b/rapidoid-x-fullstack/src/main/java/org/rapidoidx/fullstack/Full.java @@ -23,7 +23,7 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; -import org.rapidoid.gui.BootstrapWidgets; +import org.rapidoid.gui.base.BootstrapWidgets; @Authors("Nikolche Mihajlovski") @Since("3.0.0")