Renamed GUI packages and menu components.

rapidoid · Nov 1, 2015 · 0496f68 · 0496f68
1 parent 1cdbd98
commit 0496f68
Show file tree

Hide file tree

Showing 60 changed files with 118 additions and 111 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -24,15 +24,15 @@
 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;
 import org.rapidoid.html.tag.ATag;
 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
@@ -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
@@ -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/...apidoid/widget/AbstractCommandWidget.java → ...g/rapidoid/gui/AbstractCommandWidget.java b/...apidoid/widget/AbstractCommandWidget.java → ...g/rapidoid/gui/AbstractCommandWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...a/org/rapidoid/widget/AbstractWidget.java → ...java/org/rapidoid/gui/AbstractWidget.java b/...a/org/rapidoid/widget/AbstractWidget.java → ...java/org/rapidoid/gui/AbstractWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...org/rapidoid/widget/BootstrapWidgets.java → ...va/org/rapidoid/gui/BootstrapWidgets.java b/...org/rapidoid/widget/BootstrapWidgets.java → ...va/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/...ava/org/rapidoid/widget/ButtonWidget.java → ...n/java/org/rapidoid/gui/ButtonWidget.java b/...ava/org/rapidoid/widget/ButtonWidget.java → ...n/java/org/rapidoid/gui/ButtonWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/.../java/org/rapidoid/widget/CardWidget.java → ...ain/java/org/rapidoid/gui/CardWidget.java b/.../java/org/rapidoid/widget/CardWidget.java → ...ain/java/org/rapidoid/gui/CardWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...java/org/rapidoid/widget/DebugWidget.java → ...in/java/org/rapidoid/gui/DebugWidget.java b/...java/org/rapidoid/widget/DebugWidget.java → ...in/java/org/rapidoid/gui/DebugWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...src/main/java/org/rapidoid/widget/FA.java → ...et/src/main/java/org/rapidoid/gui/FA.java b/...src/main/java/org/rapidoid/widget/FA.java → ...et/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/.../org/rapidoid/widget/FormFieldWidget.java → ...ava/org/rapidoid/gui/FormFieldWidget.java b/.../org/rapidoid/widget/FormFieldWidget.java → ...ava/org/rapidoid/gui/FormFieldWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...in/java/org/rapidoid/widget/FormMode.java → .../main/java/org/rapidoid/gui/FormMode.java b/...in/java/org/rapidoid/widget/FormMode.java → .../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/.../java/org/rapidoid/widget/FormWidget.java → ...ain/java/org/rapidoid/gui/FormWidget.java b/.../java/org/rapidoid/widget/FormWidget.java → ...ain/java/org/rapidoid/gui/FormWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/.../java/org/rapidoid/widget/GridWidget.java → ...ain/java/org/rapidoid/gui/GridWidget.java b/.../java/org/rapidoid/widget/GridWidget.java → ...ain/java/org/rapidoid/gui/GridWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/.../org/rapidoid/widget/HighlightWidget.java → ...ava/org/rapidoid/gui/HighlightWidget.java b/.../org/rapidoid/widget/HighlightWidget.java → ...ava/org/rapidoid/gui/HighlightWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...apidoid/widget/HighlightedGridWidget.java → ...g/rapidoid/gui/HighlightedGridWidget.java b/...apidoid/widget/HighlightedGridWidget.java → ...g/rapidoid/gui/HighlightedGridWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...g/rapidoid/widget/KeyValueGridWidget.java → .../org/rapidoid/gui/KeyValueGridWidget.java b/...g/rapidoid/widget/KeyValueGridWidget.java → .../org/rapidoid/gui/KeyValueGridWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...ava/org/rapidoid/widget/LayoutWidget.java → ...n/java/org/rapidoid/gui/LayoutWidget.java b/...ava/org/rapidoid/widget/LayoutWidget.java → ...n/java/org/rapidoid/gui/LayoutWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/.../java/org/rapidoid/widget/PageWidget.java → ...ain/java/org/rapidoid/gui/PageWidget.java b/.../java/org/rapidoid/widget/PageWidget.java → ...ain/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/...java/org/rapidoid/widget/PagerWidget.java → ...in/java/org/rapidoid/gui/PagerWidget.java b/...java/org/rapidoid/widget/PagerWidget.java → ...in/java/org/rapidoid/gui/PagerWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...java/org/rapidoid/widget/PanelWidget.java → ...in/java/org/rapidoid/gui/PanelWidget.java b/...java/org/rapidoid/widget/PanelWidget.java → ...in/java/org/rapidoid/gui/PanelWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...va/org/rapidoid/widget/SnippetWidget.java → .../java/org/rapidoid/gui/SnippetWidget.java b/...va/org/rapidoid/widget/SnippetWidget.java → .../java/org/rapidoid/gui/SnippetWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...ava/org/rapidoid/widget/StreamWidget.java → ...n/java/org/rapidoid/gui/StreamWidget.java b/...ava/org/rapidoid/widget/StreamWidget.java → ...n/java/org/rapidoid/gui/StreamWidget.java
@@ -1,4 +1,4 @@
-package org.rapidoid.widget;
+package org.rapidoid.gui;
 
 /*
  * #%L

diff --git a/...org/rapidoid/webapp/AbstractMenuItem.java → ...pidoid/gui/menu/AbstractPageMenuItem.java b/...org/rapidoid/webapp/AbstractMenuItem.java → ...pidoid/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<String, Object> extra;
 
-	public AbstractMenuItem(String caption, Object target, Map<String, Object> extra) {
+	public AbstractPageMenuItem(String caption, Object target, Map<String, Object> extra) {
 		this.caption = caption.trim();
 		this.extra = extra;