From 0496f6834b8fec552eacf6e0489d2ec46d93a8e9 Mon Sep 17 00:00:00 2001 From: "nikolce.mihajlovski" Date: Sun, 1 Nov 2015 11:13:28 +0100 Subject: [PATCH] Renamed GUI packages and menu components. --- .../main/java/org/rapidoid/app/AppGUI.java | 4 +-- .../builtin/DebugUserInfoScreenBuiltIn.java | 2 +- .../app/builtin/EditEntityScreenGeneric.java | 2 +- .../app/builtin/ListEntityScreenGeneric.java | 4 +-- .../app/builtin/NewEntityScreenGeneric.java | 2 +- .../app/builtin/SearchScreenBuiltIn.java | 4 +-- .../app/builtin/ViewEntityScreenGeneric.java | 4 +-- .../java/custom/CustomizedPagerWidget.java | 2 +- .../main/java/demo/taskplanner/gui/About.java | 2 +- .../demo/taskplanner/gui/ControlsScreen.java | 2 +- .../java/demo/taskplanner/gui/HomeScreen.java | 6 ++--- .../demo/taskplanner/gui/NewTaskScreen.java | 4 +-- .../demo/taskplanner/gui/extra/Forms.java | 4 +-- .../demo/taskplanner/gui/extra/MixPage.java | 6 ++--- .../main/java/org/rapidoid/main/AppTool.java | 2 +- .../AbstractCommandWidget.java | 2 +- .../{widget => gui}/AbstractWidget.java | 2 +- .../{widget => gui}/BootstrapWidgets.java | 14 +++++----- .../{widget => gui}/ButtonWidget.java | 2 +- .../rapidoid/{widget => gui}/CardWidget.java | 2 +- .../rapidoid/{widget => gui}/DebugWidget.java | 2 +- .../java/org/rapidoid/{widget => gui}/FA.java | 2 +- .../{widget => gui}/FormFieldWidget.java | 2 +- .../rapidoid/{widget => gui}/FormMode.java | 2 +- .../rapidoid/{widget => gui}/FormWidget.java | 2 +- .../rapidoid/{widget => gui}/GridWidget.java | 2 +- .../{widget => gui}/HighlightWidget.java | 2 +- .../HighlightedGridWidget.java | 2 +- .../{widget => gui}/KeyValueGridWidget.java | 2 +- .../{widget => gui}/LayoutWidget.java | 2 +- .../rapidoid/{widget => gui}/PageWidget.java | 3 ++- .../rapidoid/{widget => gui}/PagerWidget.java | 2 +- .../rapidoid/{widget => gui}/PanelWidget.java | 2 +- .../{widget => gui}/SnippetWidget.java | 2 +- .../{widget => gui}/StreamWidget.java | 2 +- .../gui/menu/AbstractPageMenuItem.java | 6 ++--- .../{widget => gui/menu}/PageMenu.java | 26 +++++++++---------- .../menu/PageMenuItem.java} | 15 +++++------ .../menu/PageSubMenu.java} | 10 +++---- .../menu/PageSubMenuItem.java} | 7 +++-- .../impl => gui/var}/ArrayContainerVar.java | 2 +- .../var}/CollectionContainerVar.java | 2 +- .../{widget/impl => gui/var}/EqualityVar.java | 2 +- .../{widget/impl => gui/var}/LocalVar.java | 2 +- .../impl => gui/var}/MultiLanguageWidget.java | 2 +- .../{widget/impl => gui/var}/SessionVar.java | 2 +- .../{widget/impl => gui/var}/WidgetVar.java | 2 +- .../org/rapidoid/widget/PageMenuTest.java | 13 ++++++---- .../org/rapidoid/widget/PagerWidgetTest.java | 2 ++ .../org/rapidoid/widget/PlaygroundWidget.java | 1 + .../org/rapidoid/widget/TableWidgetTest.java | 2 ++ .../demo/taskplanner/gui/AboutScreen.java | 2 +- .../demo/taskplanner/gui/ControlsScreen.java | 2 +- .../demo/taskplanner/gui/HomeScreen.java | 6 ++--- .../taskplanner/gui/ManageTasksScreen.java | 2 +- .../demo/taskplanner/gui/MyTasksScreen.java | 2 +- .../demo/taskplanner/gui/NewTaskScreen.java | 4 +-- .../demo/taskplanner/gui/extra/FormsPage.java | 4 +-- .../demo/taskplanner/gui/extra/MixPage.java | 6 ++--- .../java/org/rapidoidx/fullstack/Full.java | 2 +- 60 files changed, 118 insertions(+), 111 deletions(-) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/AbstractCommandWidget.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/AbstractWidget.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/BootstrapWidgets.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/ButtonWidget.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/CardWidget.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/DebugWidget.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/FA.java (99%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/FormFieldWidget.java (99%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/FormMode.java (96%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/FormWidget.java (99%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/GridWidget.java (99%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/HighlightWidget.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/HighlightedGridWidget.java (97%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/KeyValueGridWidget.java (97%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/LayoutWidget.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/PageWidget.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/PagerWidget.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/PanelWidget.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/SnippetWidget.java (99%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui}/StreamWidget.java (98%) rename rapidoid-http/src/main/java/org/rapidoid/webapp/AbstractMenuItem.java => rapidoid-widget/src/main/java/org/rapidoid/gui/menu/AbstractPageMenuItem.java (93%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget => gui/menu}/PageMenu.java (70%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget/AppMenuItem.java => gui/menu/PageMenuItem.java} (80%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget/AppSubMenu.java => gui/menu/PageSubMenu.java} (83%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget/AppSubMenuItem.java => gui/menu/PageSubMenuItem.java} (83%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget/impl => gui/var}/ArrayContainerVar.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget/impl => gui/var}/CollectionContainerVar.java (98%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget/impl => gui/var}/EqualityVar.java (97%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget/impl => gui/var}/LocalVar.java (97%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget/impl => gui/var}/MultiLanguageWidget.java (97%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget/impl => gui/var}/SessionVar.java (97%) rename rapidoid-widget/src/main/java/org/rapidoid/{widget/impl => gui/var}/WidgetVar.java (97%) diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/AppGUI.java b/rapidoid-app/src/main/java/org/rapidoid/app/AppGUI.java index 9a3bf65e76..826e35aa86 100644 --- a/rapidoid-app/src/main/java/org/rapidoid/app/AppGUI.java +++ b/rapidoid-app/src/main/java/org/rapidoid/app/AppGUI.java @@ -5,12 +5,12 @@ 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.lambda.Predicate; import org.rapidoid.model.Items; import org.rapidoid.model.impl.DbItems; import org.rapidoid.plugins.entities.Entities; -import org.rapidoid.widget.BootstrapWidgets; -import org.rapidoid.widget.GridWidget; /* * #%L diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java index b5b921d0dc..9adddf74be 100644 --- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java +++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/DebugUserInfoScreenBuiltIn.java @@ -26,10 +26,10 @@ import org.rapidoid.ctx.Ctx; import org.rapidoid.ctx.Ctxs; import org.rapidoid.ctx.Roles; +import org.rapidoid.gui.FormWidget; import org.rapidoid.html.Tag; import org.rapidoid.security.annotation.DevMode; import org.rapidoid.u.U; -import org.rapidoid.widget.FormWidget; @DevMode @Authors("Nikolche Mihajlovski") diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java index 2a5845138d..c7a4d42f8b 100644 --- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java +++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/EditEntityScreenGeneric.java @@ -22,10 +22,10 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.FormWidget; import org.rapidoid.html.Tag; import org.rapidoid.plugins.db.DB; import org.rapidoid.u.U; -import org.rapidoid.widget.FormWidget; @Authors("Nikolche Mihajlovski") @Since("2.0.0") diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ListEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ListEntityScreenGeneric.java index 7d29049da4..920ab66431 100644 --- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ListEntityScreenGeneric.java +++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ListEntityScreenGeneric.java @@ -25,11 +25,11 @@ 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.html.Tag; import org.rapidoid.plugins.entities.Entities; import org.rapidoid.security.Secure; -import org.rapidoid.widget.ButtonWidget; -import org.rapidoid.widget.GridWidget; @Authors("Nikolche Mihajlovski") @Since("2.0.0") diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java index 88e4e764c4..d610fb48d9 100644 --- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java +++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/NewEntityScreenGeneric.java @@ -22,11 +22,11 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.FormWidget; import org.rapidoid.html.Tag; import org.rapidoid.plugins.db.DB; import org.rapidoid.plugins.entities.Entities; import org.rapidoid.u.U; -import org.rapidoid.widget.FormWidget; @Authors("Nikolche Mihajlovski") @Since("2.1.0") diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java index 87fe3bae74..7a8ca09d01 100644 --- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java +++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/SearchScreenBuiltIn.java @@ -26,13 +26,13 @@ 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.html.Tag; import org.rapidoid.http.HttpExchange; import org.rapidoid.model.Items; import org.rapidoid.plugins.db.DB; import org.rapidoid.u.U; -import org.rapidoid.widget.GridWidget; -import org.rapidoid.widget.HighlightedGridWidget; @Authors("Nikolche Mihajlovski") @Since("2.0.0") diff --git a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java index 28a1f098cd..b2ff652ffb 100644 --- a/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java +++ b/rapidoid-app/src/main/java/org/rapidoid/app/builtin/ViewEntityScreenGeneric.java @@ -25,12 +25,12 @@ 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.html.Tag; import org.rapidoid.plugins.db.DB; import org.rapidoid.security.Secure; import org.rapidoid.u.U; -import org.rapidoid.widget.ButtonWidget; -import org.rapidoid.widget.FormWidget; @Authors("Nikolche Mihajlovski") @Since("2.0.0") diff --git a/rapidoid-demo/src/main/java/custom/CustomizedPagerWidget.java b/rapidoid-demo/src/main/java/custom/CustomizedPagerWidget.java index 9740520e61..618383d729 100644 --- a/rapidoid-demo/src/main/java/custom/CustomizedPagerWidget.java +++ b/rapidoid-demo/src/main/java/custom/CustomizedPagerWidget.java @@ -2,9 +2,9 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.PagerWidget; import org.rapidoid.html.Tag; import org.rapidoid.var.Var; -import org.rapidoid.widget.PagerWidget; /* * #%L 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 4f41cd35d6..794f704ed3 100644 --- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java +++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/About.java @@ -25,11 +25,11 @@ import org.rapidoid.annotation.Transaction; import org.rapidoid.annotation.Controller; import org.rapidoid.app.GUI; +import org.rapidoid.gui.ButtonWidget; import org.rapidoid.html.Tag; import org.rapidoid.plugins.db.DB; import org.rapidoid.security.annotation.CanInsert; import org.rapidoid.u.U; -import org.rapidoid.widget.ButtonWidget; import demo.taskplanner.model.Task; import demo.taskplanner.model.User; 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 2582eaf715..fcb5cef057 100644 --- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java +++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/ControlsScreen.java @@ -4,8 +4,8 @@ import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Controller; import org.rapidoid.app.GUI; +import org.rapidoid.gui.LayoutWidget; import org.rapidoid.u.U; -import org.rapidoid.widget.LayoutWidget; /* * #%L 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 e66c44e51f..4f0a299d27 100644 --- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/HomeScreen.java +++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/HomeScreen.java @@ -4,10 +4,10 @@ import org.rapidoid.annotation.Since; import org.rapidoid.annotation.Controller; import org.rapidoid.app.GUI; +import org.rapidoid.gui.CardWidget; +import org.rapidoid.gui.FA; +import org.rapidoid.gui.StreamWidget; import org.rapidoid.html.Tag; -import org.rapidoid.widget.CardWidget; -import org.rapidoid.widget.FA; -import org.rapidoid.widget.StreamWidget; /* * #%L 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 a0fc43ca7a..00e45240f1 100644 --- a/rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java +++ b/rapidoid-demo/src/main/java/demo/taskplanner/gui/NewTaskScreen.java @@ -29,13 +29,13 @@ 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.html.FieldType; import org.rapidoid.html.Tag; import org.rapidoid.plugins.db.DB; import org.rapidoid.u.U; import org.rapidoid.var.Var; -import org.rapidoid.widget.FormWidget; -import org.rapidoid.widget.GridWidget; import demo.taskplanner.model.Task; 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 2b60def3aa..ac2db838d0 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,6 +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.html.FieldType; import org.rapidoid.html.FormLayout; import org.rapidoid.html.Tag; @@ -31,8 +33,6 @@ import org.rapidoid.http.HttpExchange; import org.rapidoid.var.Var; import org.rapidoid.var.Vars; -import org.rapidoid.widget.BootstrapWidgets; -import org.rapidoid.widget.ButtonWidget; @Controller @Authors("Nikolche Mihajlovski") 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 da47cda50c..58b39a9d1a 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,6 +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.html.Tag; import org.rapidoid.html.tag.ATag; import org.rapidoid.html.tag.FormTag; @@ -32,9 +35,6 @@ import org.rapidoid.model.Items; import org.rapidoid.model.Models; import org.rapidoid.u.U; -import org.rapidoid.widget.BootstrapWidgets; -import org.rapidoid.widget.ButtonWidget; -import org.rapidoid.widget.GridWidget; import demo.taskplanner.model.User; diff --git a/rapidoid-main/src/main/java/org/rapidoid/main/AppTool.java b/rapidoid-main/src/main/java/org/rapidoid/main/AppTool.java index a9f423bbd4..ceea4f8715 100644 --- a/rapidoid-main/src/main/java/org/rapidoid/main/AppTool.java +++ b/rapidoid-main/src/main/java/org/rapidoid/main/AppTool.java @@ -28,6 +28,7 @@ import org.rapidoid.app.AsyncAppHandler; import org.rapidoid.config.Conf; import org.rapidoid.data.YAML; +import org.rapidoid.gui.menu.PageMenu; import org.rapidoid.io.Res; import org.rapidoid.log.Log; import org.rapidoid.plugins.Plugin; @@ -36,7 +37,6 @@ import org.rapidoid.webapp.RootWebApp; import org.rapidoid.webapp.WebApp; import org.rapidoid.webapp.WebAppGroup; -import org.rapidoid.widget.PageMenu; @Authors("Nikolche Mihajlovski") @Since("4.1.0") diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractCommandWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/AbstractCommandWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractCommandWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/AbstractCommandWidget.java index c469ba0f36..f0feedde29 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractCommandWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/AbstractCommandWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/AbstractWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/AbstractWidget.java index c89e9dae6f..61bb254d01 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/AbstractWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/AbstractWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/BootstrapWidgets.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/BootstrapWidgets.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/BootstrapWidgets.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/BootstrapWidgets.java index 1352e8b917..d0b45d8437 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/BootstrapWidgets.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/BootstrapWidgets.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; import java.io.Serializable; import java.util.Collection; @@ -14,6 +14,12 @@ import org.rapidoid.cls.TypeKind; import org.rapidoid.config.Conf; import org.rapidoid.ctx.Ctxs; +import org.rapidoid.gui.var.ArrayContainerVar; +import org.rapidoid.gui.var.CollectionContainerVar; +import org.rapidoid.gui.var.EqualityVar; +import org.rapidoid.gui.var.LocalVar; +import org.rapidoid.gui.var.MultiLanguageWidget; +import org.rapidoid.gui.var.SessionVar; import org.rapidoid.html.FieldType; import org.rapidoid.html.FormLayout; import org.rapidoid.html.HTML; @@ -39,12 +45,6 @@ import org.rapidoid.util.Rnd; import org.rapidoid.util.UTILS; import org.rapidoid.var.Var; -import org.rapidoid.widget.impl.ArrayContainerVar; -import org.rapidoid.widget.impl.CollectionContainerVar; -import org.rapidoid.widget.impl.EqualityVar; -import org.rapidoid.widget.impl.LocalVar; -import org.rapidoid.widget.impl.MultiLanguageWidget; -import org.rapidoid.widget.impl.SessionVar; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/ButtonWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/ButtonWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/ButtonWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/ButtonWidget.java index 07049c1127..06a3cc133d 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/ButtonWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/ButtonWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/CardWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/CardWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/CardWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/CardWidget.java index e2b7544262..9345fadf9f 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/CardWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/CardWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/DebugWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/DebugWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/DebugWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/DebugWidget.java index d725eb04e2..7ff26e6108 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/DebugWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/DebugWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/FA.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/FA.java similarity index 99% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/FA.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/FA.java index 03efb3a1ca..c0a19d0a26 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/FA.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/FA.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/FormFieldWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/FormFieldWidget.java similarity index 99% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/FormFieldWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/FormFieldWidget.java index 33ab0c6078..e59c68eb78 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/FormFieldWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/FormFieldWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/FormMode.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/FormMode.java similarity index 96% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/FormMode.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/FormMode.java index 8ba42b9576..927f7ecce2 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/FormMode.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/FormMode.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/FormWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/FormWidget.java similarity index 99% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/FormWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/FormWidget.java index 10216b0715..33b2877b4b 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/FormWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/FormWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/GridWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/GridWidget.java similarity index 99% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/GridWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/GridWidget.java index 989ca91478..42e7adf976 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/GridWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/GridWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/HighlightWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/HighlightWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/HighlightWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/HighlightWidget.java index 9a89e44af7..24165911e5 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/HighlightWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/HighlightWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/HighlightedGridWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/HighlightedGridWidget.java similarity index 97% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/HighlightedGridWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/HighlightedGridWidget.java index cb24582c5f..945b0c5e2a 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/HighlightedGridWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/HighlightedGridWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/KeyValueGridWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/KeyValueGridWidget.java similarity index 97% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/KeyValueGridWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/KeyValueGridWidget.java index 10c4c0850d..5a6a758589 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/KeyValueGridWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/KeyValueGridWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/LayoutWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/LayoutWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/LayoutWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/LayoutWidget.java index 550746d638..8137a8662c 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/LayoutWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/LayoutWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/PageWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/PageWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/PageWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/PageWidget.java index 27dd8f4144..7690282f31 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/PageWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/PageWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L @@ -27,6 +27,7 @@ import org.rapidoid.config.Conf; import org.rapidoid.ctx.Ctx; import org.rapidoid.ctx.Ctxs; +import org.rapidoid.gui.menu.PageMenu; import org.rapidoid.html.Tag; import org.rapidoid.plugins.Plugins; import org.rapidoid.plugins.templates.ITemplate; diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/PagerWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/PagerWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/PagerWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/PagerWidget.java index f2d34c869e..c122a522c0 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/PagerWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/PagerWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/PanelWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/PanelWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/PanelWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/PanelWidget.java index b45470b1d6..71b40ecb25 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/PanelWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/PanelWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/SnippetWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/SnippetWidget.java similarity index 99% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/SnippetWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/SnippetWidget.java index 46dd380167..8ea8677f38 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/SnippetWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/SnippetWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/StreamWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/StreamWidget.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/StreamWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/StreamWidget.java index 749ea7266d..0316d814f7 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/StreamWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/StreamWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui; /* * #%L diff --git a/rapidoid-http/src/main/java/org/rapidoid/webapp/AbstractMenuItem.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/menu/AbstractPageMenuItem.java similarity index 93% rename from rapidoid-http/src/main/java/org/rapidoid/webapp/AbstractMenuItem.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/menu/AbstractPageMenuItem.java index 71dac36d0e..df4dcb7cc1 100644 --- a/rapidoid-http/src/main/java/org/rapidoid/webapp/AbstractMenuItem.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/menu/AbstractPageMenuItem.java @@ -1,4 +1,4 @@ -package org.rapidoid.webapp; +package org.rapidoid.gui.menu; /* * #%L @@ -29,7 +29,7 @@ @Authors("Nikolche Mihajlovski") @Since("4.1.0") -public abstract class AbstractMenuItem { +public abstract class AbstractPageMenuItem { protected String caption; @@ -43,7 +43,7 @@ public abstract class AbstractMenuItem { protected final Map extra; - public AbstractMenuItem(String caption, Object target, Map extra) { + public AbstractPageMenuItem(String caption, Object target, Map extra) { this.caption = caption.trim(); this.extra = extra; diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/PageMenu.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageMenu.java similarity index 70% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/PageMenu.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageMenu.java index 2032ddf0e4..981361dd0e 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/PageMenu.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageMenu.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui.menu; /* * #%L @@ -35,13 +35,13 @@ @Since("4.1.0") public class PageMenu { - private final List items; + private final List items; - public PageMenu(List items) { + public PageMenu(List items) { this.items = items; } - public List getItems() { + public List getItems() { return items; } @@ -57,29 +57,29 @@ public static PageMenu parse(String filename) { } public static PageMenu from(Object data) { - return Cls.struct(PageMenu.class, AppMenuItem.class, U.or(data, U.map())); + return Cls.struct(PageMenu.class, PageMenuItem.class, U.or(data, U.map())); } - public List leftItems() { - return U.filter(items, new Predicate() { + public List leftItems() { + return U.filter(items, new Predicate() { @Override - public boolean eval(AppMenuItem menuItem) throws Exception { + public boolean eval(PageMenuItem menuItem) throws Exception { return !menuItem.isRight(); } }); } - public List rightItems() { - return U.filter(items, new Predicate() { + public List rightItems() { + return U.filter(items, new Predicate() { @Override - public boolean eval(AppMenuItem menuItem) throws Exception { + public boolean eval(PageMenuItem menuItem) throws Exception { return menuItem.isRight(); } }); } - public List rightItemsReversed() { - List list = rightItems(); + public List rightItemsReversed() { + List list = rightItems(); Collections.reverse(list); return list; } diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/AppMenuItem.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageMenuItem.java similarity index 80% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/AppMenuItem.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageMenuItem.java index f9f29c7374..9fbc2a471d 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/AppMenuItem.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageMenuItem.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui.menu; /* * #%L @@ -26,19 +26,18 @@ import org.rapidoid.annotation.Since; import org.rapidoid.cls.Cls; import org.rapidoid.u.U; -import org.rapidoid.webapp.AbstractMenuItem; @Authors("Nikolche Mihajlovski") @Since("4.1.0") -public class AppMenuItem extends AbstractMenuItem { +public class PageMenuItem extends AbstractPageMenuItem { private static final String CONFIG_RIGHT = "(right)"; - private AppSubMenu submenu; + private PageSubMenu submenu; private boolean right; - public AppMenuItem(String caption, Object target, Map extra) { + public PageMenuItem(String caption, Object target, Map extra) { super(caption, target, extra); if (this.caption.endsWith(CONFIG_RIGHT)) { @@ -47,15 +46,15 @@ public AppMenuItem(String caption, Object target, Map extra) { } if (!Cls.isSimple(target)) { - this.submenu = Cls.struct(AppSubMenu.class, AppSubMenuItem.class, target); + this.submenu = Cls.struct(PageSubMenu.class, PageSubMenuItem.class, target); } } - public AppSubMenu getSubmenu() { + public PageSubMenu getSubmenu() { return submenu; } - public void setSubmenu(AppSubMenu submenu) { + public void setSubmenu(PageSubMenu submenu) { this.submenu = submenu; } diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/AppSubMenu.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageSubMenu.java similarity index 83% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/AppSubMenu.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageSubMenu.java index e675db4fe2..c9c8b6392d 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/AppSubMenu.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageSubMenu.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui.menu; /* * #%L @@ -27,11 +27,11 @@ @Authors("Nikolche Mihajlovski") @Since("4.1.0") -public class AppSubMenu { +public class PageSubMenu { - private final List items; + private final List items; - public AppSubMenu(List items) { + public PageSubMenu(List items) { this.items = items; } @@ -40,7 +40,7 @@ public String toString() { return "AppSubMenu [items=" + items + "]"; } - public List getItems() { + public List getItems() { return items; } diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/AppSubMenuItem.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageSubMenuItem.java similarity index 83% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/AppSubMenuItem.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageSubMenuItem.java index e9fd193377..0ee3f4b72f 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/AppSubMenuItem.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/menu/PageSubMenuItem.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget; +package org.rapidoid.gui.menu; /* * #%L @@ -24,13 +24,12 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; -import org.rapidoid.webapp.AbstractMenuItem; @Authors("Nikolche Mihajlovski") @Since("4.1.0") -public class AppSubMenuItem extends AbstractMenuItem { +public class PageSubMenuItem extends AbstractPageMenuItem { - public AppSubMenuItem(String caption, Object target, Map extra) { + public PageSubMenuItem(String caption, Object target, Map extra) { super(caption, target, extra); } diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/ArrayContainerVar.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/ArrayContainerVar.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/impl/ArrayContainerVar.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/var/ArrayContainerVar.java index ff391c07e3..c14e16e07a 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/ArrayContainerVar.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/ArrayContainerVar.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget.impl; +package org.rapidoid.gui.var; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/CollectionContainerVar.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/CollectionContainerVar.java similarity index 98% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/impl/CollectionContainerVar.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/var/CollectionContainerVar.java index 39d27d3d30..b45ab8347f 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/CollectionContainerVar.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/CollectionContainerVar.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget.impl; +package org.rapidoid.gui.var; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/EqualityVar.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/EqualityVar.java similarity index 97% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/impl/EqualityVar.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/var/EqualityVar.java index 6215d5f0c7..8305ad5a9a 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/EqualityVar.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/EqualityVar.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget.impl; +package org.rapidoid.gui.var; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/LocalVar.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/LocalVar.java similarity index 97% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/impl/LocalVar.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/var/LocalVar.java index 20b4f9117f..da69e7e73b 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/LocalVar.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/LocalVar.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget.impl; +package org.rapidoid.gui.var; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/MultiLanguageWidget.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/MultiLanguageWidget.java similarity index 97% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/impl/MultiLanguageWidget.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/var/MultiLanguageWidget.java index ae332ac349..f821bf0b18 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/MultiLanguageWidget.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/MultiLanguageWidget.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget.impl; +package org.rapidoid.gui.var; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/SessionVar.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/SessionVar.java similarity index 97% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/impl/SessionVar.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/var/SessionVar.java index 9dc3d7f366..b63f964af9 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/SessionVar.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/SessionVar.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget.impl; +package org.rapidoid.gui.var; /* * #%L diff --git a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/WidgetVar.java b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/WidgetVar.java similarity index 97% rename from rapidoid-widget/src/main/java/org/rapidoid/widget/impl/WidgetVar.java rename to rapidoid-widget/src/main/java/org/rapidoid/gui/var/WidgetVar.java index c57d1b6f8c..88079fc701 100644 --- a/rapidoid-widget/src/main/java/org/rapidoid/widget/impl/WidgetVar.java +++ b/rapidoid-widget/src/main/java/org/rapidoid/gui/var/WidgetVar.java @@ -1,4 +1,4 @@ -package org.rapidoid.widget.impl; +package org.rapidoid.gui.var; /* * #%L diff --git a/rapidoid-widget/src/test/java/org/rapidoid/widget/PageMenuTest.java b/rapidoid-widget/src/test/java/org/rapidoid/widget/PageMenuTest.java index c69c8ffd36..530bd1d535 100644 --- a/rapidoid-widget/src/test/java/org/rapidoid/widget/PageMenuTest.java +++ b/rapidoid-widget/src/test/java/org/rapidoid/widget/PageMenuTest.java @@ -24,6 +24,9 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; import org.rapidoid.data.YAML; +import org.rapidoid.gui.menu.PageMenuItem; +import org.rapidoid.gui.menu.PageSubMenuItem; +import org.rapidoid.gui.menu.PageMenu; import org.rapidoid.io.Res; import org.rapidoid.test.TestCommons; @@ -43,17 +46,17 @@ public void shouldConstructAppMenu() { eq(menu.getItems().size(), 2); - AppMenuItem item1 = menu.getItems().get(0); + PageMenuItem item1 = menu.getItems().get(0); eq(item1.getCaption(), "item1"); eq(item1.getTarget(), "aaa"); - AppMenuItem item2 = menu.getItems().get(1); + PageMenuItem item2 = menu.getItems().get(1); eq(item2.getCaption(), "item2"); isNull(item2.getTarget()); - AppSubMenuItem subitem1 = item2.getSubmenu().getItems().get(0); - AppSubMenuItem subitem2 = item2.getSubmenu().getItems().get(1); - AppSubMenuItem subitem3 = item2.getSubmenu().getItems().get(2); + PageSubMenuItem subitem1 = item2.getSubmenu().getItems().get(0); + PageSubMenuItem subitem2 = item2.getSubmenu().getItems().get(1); + PageSubMenuItem subitem3 = item2.getSubmenu().getItems().get(2); eq(subitem1.getCaption(), "d"); eq(subitem1.getTarget(), ""); diff --git a/rapidoid-widget/src/test/java/org/rapidoid/widget/PagerWidgetTest.java b/rapidoid-widget/src/test/java/org/rapidoid/widget/PagerWidgetTest.java index e913462c37..6bfc97b0ec 100644 --- a/rapidoid-widget/src/test/java/org/rapidoid/widget/PagerWidgetTest.java +++ b/rapidoid-widget/src/test/java/org/rapidoid/widget/PagerWidgetTest.java @@ -22,6 +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.var.Var; @Authors("Nikolche Mihajlovski") diff --git a/rapidoid-widget/src/test/java/org/rapidoid/widget/PlaygroundWidget.java b/rapidoid-widget/src/test/java/org/rapidoid/widget/PlaygroundWidget.java index 897f6b9b16..80addc3d46 100644 --- a/rapidoid-widget/src/test/java/org/rapidoid/widget/PlaygroundWidget.java +++ b/rapidoid-widget/src/test/java/org/rapidoid/widget/PlaygroundWidget.java @@ -22,6 +22,7 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; +import org.rapidoid.gui.BootstrapWidgets; import org.rapidoid.html.Tag; import org.rapidoid.html.tag.ButtonTag; import org.rapidoid.html.tag.InputTag; diff --git a/rapidoid-widget/src/test/java/org/rapidoid/widget/TableWidgetTest.java b/rapidoid-widget/src/test/java/org/rapidoid/widget/TableWidgetTest.java index 6f956b8e7a..77cea6abb4 100644 --- a/rapidoid-widget/src/test/java/org/rapidoid/widget/TableWidgetTest.java +++ b/rapidoid-widget/src/test/java/org/rapidoid/widget/TableWidgetTest.java @@ -23,6 +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.model.Items; import org.rapidoid.model.Models; 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 bc843e59c7..a11a71e8e2 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,10 +24,10 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; import org.rapidoid.app.GUI; +import org.rapidoid.gui.ButtonWidget; import org.rapidoid.html.Tag; import org.rapidoid.security.annotation.CanInsert; import org.rapidoid.u.U; -import org.rapidoid.widget.ButtonWidget; import org.rapidoidx.db.XDB; import org.rapidoidx.demo.taskplanner.model.Task; import org.rapidoidx.demo.taskplanner.model.User; 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 a6bbc2199a..fcfb51ab39 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,8 +3,8 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; import org.rapidoid.app.GUI; +import org.rapidoid.gui.LayoutWidget; import org.rapidoid.u.U; -import org.rapidoid.widget.LayoutWidget; /* * #%L 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 98468f1a7b..1e1d1e399f 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,10 +3,10 @@ import org.rapidoid.annotation.Authors; import org.rapidoid.annotation.Since; import org.rapidoid.app.GUI; +import org.rapidoid.gui.CardWidget; +import org.rapidoid.gui.FA; +import org.rapidoid.gui.StreamWidget; import org.rapidoid.html.Tag; -import org.rapidoid.widget.CardWidget; -import org.rapidoid.widget.FA; -import org.rapidoid.widget.StreamWidget; /* * #%L 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 3323394ac8..a9a93c386c 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,8 +25,8 @@ import org.rapidoid.annotation.Order; import org.rapidoid.annotation.Since; import org.rapidoid.app.GUI; +import org.rapidoid.gui.GridWidget; import org.rapidoid.html.Tag; -import org.rapidoid.widget.GridWidget; import org.rapidoidx.demo.taskplanner.model.Task; @Order(2) 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 b21c8164cc..4c4bd515ff 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,11 +29,11 @@ import org.rapidoid.app.GUI; import org.rapidoid.beany.Beany; import org.rapidoid.ctx.Ctxs; +import org.rapidoid.gui.GridWidget; import org.rapidoid.html.Tag; import org.rapidoid.lambda.Predicate; import org.rapidoid.security.annotation.LoggedIn; import org.rapidoid.u.U; -import org.rapidoid.widget.GridWidget; import org.rapidoidx.demo.taskplanner.model.Task; import org.rapidoidx.demo.taskplanner.model.User; 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 92e25b85f6..df067d22d8 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,12 +28,12 @@ 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.html.FieldType; import org.rapidoid.html.Tag; import org.rapidoid.u.U; import org.rapidoid.var.Var; -import org.rapidoid.widget.FormWidget; -import org.rapidoid.widget.GridWidget; import org.rapidoidx.db.XDB; import org.rapidoidx.demo.taskplanner.model.Task; 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 647493ab99..2fd8a3ea38 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,6 +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.html.FieldType; import org.rapidoid.html.FormLayout; import org.rapidoid.html.Tag; @@ -31,8 +33,6 @@ import org.rapidoid.http.HttpExchange; import org.rapidoid.var.Var; import org.rapidoid.var.Vars; -import org.rapidoid.widget.BootstrapWidgets; -import org.rapidoid.widget.ButtonWidget; @Authors("Nikolche Mihajlovski") @Since("3.0.0") 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 7a55e5e153..5bd16531c7 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,6 +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.html.Tag; import org.rapidoid.html.tag.ATag; import org.rapidoid.html.tag.FormTag; @@ -32,9 +35,6 @@ import org.rapidoid.model.Items; import org.rapidoid.model.Models; import org.rapidoid.u.U; -import org.rapidoid.widget.BootstrapWidgets; -import org.rapidoid.widget.ButtonWidget; -import org.rapidoid.widget.GridWidget; import org.rapidoidx.demo.taskplanner.model.Person; @Authors("Nikolche Mihajlovski") 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 7c6e911c05..6224864680 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.widget.BootstrapWidgets; +import org.rapidoid.gui.BootstrapWidgets; @Authors("Nikolche Mihajlovski") @Since("3.0.0")