Skip to content

Commit

Permalink
Renamed GUI components.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmihajlovski
nmihajlovski committed Nov 1, 2015
1 parent e9ba284 commit 905b2cd
Show file tree
Hide file tree
Showing 45 changed files with 276 additions and 230 deletions.
4 changes: 2 additions & 2 deletions rapidoid-demo/src/main/java/custom/CustomizedPagerWidget.java
View file
Expand Up @@ -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;

Expand All @@ -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<Integer> pageNumber) {
super(from, to, pageNumber);
Expand Down
6 changes: 3 additions & 3 deletions rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java
View file
Expand Up @@ -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;
Expand All @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java
View file
Expand Up @@ -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;

/*
Expand Down Expand Up @@ -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());
}

Expand Down
8 changes: 4 additions & 4 deletions rapidoid-demo/src/main/java/demo/taskplanner/gui/HomeScreen.java
View file
Expand Up @@ -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;

/*
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java
View file
Expand Up @@ -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;
Expand All @@ -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));
Expand All @@ -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));
}
Expand Down
6 changes: 3 additions & 3 deletions rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/Forms.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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));
}
Expand Down
12 changes: 6 additions & 6 deletions rapidoid-demo/src/main/java/demo/taskplanner/gui/extra/MixPage.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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)));

Expand Down
23 changes: 12 additions & 11 deletions ...n/java/org/rapidoid/gui/ButtonWidget.java → ...i/src/main/java/org/rapidoid/gui/Btn.java
View file
Expand Up @@ -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<ButtonWidget> {
public class Btn extends AbstractCommand<Btn> {

private Object[] contents = {};

Expand Down Expand Up @@ -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;
}
Expand All @@ -90,7 +91,7 @@ public String kind() {
return kind;
}

public ButtonWidget kind(String kind) {
public Btn kind(String kind) {
this.kind = kind;
return this;
}
Expand All @@ -99,7 +100,7 @@ public String linkTo() {
return linkTo;
}

public ButtonWidget linkTo(String linkTo) {
public Btn linkTo(String linkTo) {
this.linkTo = linkTo;
return this;
}
Expand All @@ -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;
}
Expand Down
9 changes: 5 additions & 4 deletions ...ain/java/org/rapidoid/gui/CardWidget.java → .../src/main/java/org/rapidoid/gui/Card.java
View file
Expand Up @@ -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 = {};

Expand All @@ -49,7 +50,7 @@ public Object[] contents() {
return contents;
}

public CardWidget contents(Object... contents) {
public Card contents(Object... contents) {
this.contents = contents;
return this;
}
Expand All @@ -58,7 +59,7 @@ public Object[] controls() {
return controls;
}

public CardWidget controls(Object... controls) {
public Card controls(Object... controls) {
this.controls = controls;
return this;
}
Expand All @@ -67,7 +68,7 @@ public Object header() {
return header;
}

public CardWidget header(Object header) {
public Card header(Object header) {
this.header = header;
return this;
}
Expand Down
7 changes: 4 additions & 3 deletions ...in/java/org/rapidoid/gui/DebugWidget.java → ...src/main/java/org/rapidoid/gui/Debug.java
View file
Expand Up @@ -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<String, Object> visibleAttributes = U.map();

for (Entry<String, Serializable> e : ctx().session().entrySet()) {
Expand All @@ -49,7 +50,7 @@ protected PanelWidget sessionPanel() {
return panel(grid(visibleAttributes)).header("Session scope");
}

protected PanelWidget localPanel() {
protected Panel localPanel() {
Map<String, Object> visibleAttributes = U.map();

for (Entry<String, Object> e : ctx().data().entrySet()) {
Expand Down
1 change: 1 addition & 0 deletions rapidoid-gui/src/main/java/org/rapidoid/gui/FA.java
View file
Expand Up @@ -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;

/*
Expand Down
7 changes: 4 additions & 3 deletions ...ava/org/rapidoid/gui/FormFieldWidget.java → ...src/main/java/org/rapidoid/gui/Field.java
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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);
Expand All @@ -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;
Expand Down

0 comments on commit 905b2cd

Please sign in to comment.