Skip to content

Commit 380521a

Browse files
author
odeimaiz
committed
renamed componets -> componet and widgets -> widget
1 parent 6d81ad7 commit 380521a

29 files changed

+59
-59
lines changed

‎services/dy-modeling/client/source/class/qxapp/Application.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -79,30 +79,30 @@ qx.Class.define("qxapp.Application", {
7979
const menuBarHeight = 35;
8080
const avaiBarHeight = 55;
8181

82-
this._menuBar = new qxapp.components.MenuBar(
82+
this._menuBar = new qxapp.component.MenuBar(
8383
docWidth, menuBarHeight,
8484
this._appModel.getColors().getMenuBar()
8585
.getBackground(), this._appModel.getColors().getMenuBar()
8686
.getFont());
8787

88-
this._userMenu = new qxapp.components.UserMenu(
88+
this._userMenu = new qxapp.component.UserMenu(
8989
this._appModel,
9090
this._appModel.getColors().getMenuBar()
9191
.getBackground(), this._appModel.getColors().getMenuBar()
9292
.getFont());
9393

94-
this.__availableServicesBar = new qxapp.components.AvailableServices(
94+
this.__availableServicesBar = new qxapp.component.AvailableServices(
9595
docWidth, avaiBarHeight,
9696
this._appModel.getColors().getToolBar()
9797
.getBackground(), this._appModel.getColors().getToolBar()
9898
.getFont());
9999

100-
this.__threeView = new qxapp.components.ThreeView(
100+
this.__threeView = new qxapp.component.ThreeView(
101101
docWidth, docHeight,
102102
this._appModel.getColors().get3DView()
103103
.getBackground());
104104

105-
this.__entityList = new qxapp.components.EntityList(
105+
this.__entityList = new qxapp.component.EntityList(
106106
250, 300,
107107
this._appModel.getColors().getSettingsView()
108108
.getBackground(), this._appModel.getColors().getSettingsView()
@@ -442,7 +442,7 @@ qx.Class.define("qxapp.Application", {
442442
},
443443

444444
_showPreferences: function() {
445-
let preferencesDlg = new qxapp.components.Preferences(
445+
let preferencesDlg = new qxapp.component.Preferences(
446446
this._appModel, 250, 300,
447447
this._appModel.getColors().getSettingsView()
448448
.getBackground(), this._appModel.getColors().getSettingsView()

‎services/dy-modeling/client/source/class/qxapp/components/AvailableServices.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* global window */
22

3-
qx.Class.define("qxapp.components.AvailableServices", {
3+
qx.Class.define("qxapp.component.AvailableServices", {
44
extend: qx.ui.container.Composite,
55

66
include: [qx.locale.MTranslation],

‎services/dy-modeling/client/source/class/qxapp/components/EntityList.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint no-warning-comments: "off" */
22
/* eslint no-underscore-dangle: ["error", { "allowAfterThis": true, "enforceInMethodNames": true, "allow": ["__widgetChildren"] }] */
33

4-
qx.Class.define("qxapp.components.EntityList", {
4+
qx.Class.define("qxapp.component.EntityList", {
55
extend: qx.ui.window.Window,
66

77
include: [qx.locale.MTranslation],

‎services/dy-modeling/client/source/class/qxapp/components/MenuBar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* global window */
22

3-
qx.Class.define("qxapp.components.MenuBar", {
3+
qx.Class.define("qxapp.component.MenuBar", {
44
extend: qx.ui.container.Composite,
55

66
include: [qx.locale.MTranslation],

‎services/dy-modeling/client/source/class/qxapp/components/Preferences.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.Preferences", {
1+
qx.Class.define("qxapp.component.Preferences", {
22
extend: qx.ui.window.Window,
33

44
include: [qx.locale.MTranslation],

‎services/dy-modeling/client/source/class/qxapp/components/ThreeView.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const TOOL_ACTIVE = 1;
77
const ENTITY_PICKING = 2;
88
const FACE_PICKING = 3;
99

10-
qx.Class.define("qxapp.components.ThreeView", {
10+
qx.Class.define("qxapp.component.ThreeView", {
1111
extend: qx.ui.container.Composite,
1212

1313
construct : function(width, height, backgroundColor) {

‎services/dy-modeling/client/source/class/qxapp/components/UserMenu.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.UserMenu", {
1+
qx.Class.define("qxapp.component.UserMenu", {
22
extend: qx.ui.container.Composite,
33

44
include : [qx.locale.MTranslation],

‎services/web/client/source/class/qxapp/components/form/Auto.js renamed to ‎services/web/client/source/class/qxapp/component/form/Auto.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
/* eslint no-warning-comments: "off" */
6161

62-
qx.Class.define("qxapp.components.form.Auto", {
62+
qx.Class.define("qxapp.component.form.Auto", {
6363
extend : qx.ui.form.Form,
6464
include : [qx.locale.MTranslation],
6565

‎services/web/client/source/class/qxapp/components/form/renderer/PropForm.js renamed to ‎services/web/client/source/class/qxapp/component/form/renderer/PropForm.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/* eslint no-underscore-dangle: ["error", { "allowAfterThis": true, "allow": ["__ctrlMap"] }] */
1515

16-
qx.Class.define("qxapp.components.form.renderer.PropForm", {
16+
qx.Class.define("qxapp.component.form.renderer.PropForm", {
1717
extend : qx.ui.form.renderer.Single,
1818
/**
1919
* create a page for the View Tab with the given title

‎services/web/client/source/class/qxapp/components/widgets/CollapsableVBox.js renamed to ‎services/web/client/source/class/qxapp/component/widget/CollapsableVBox.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.widgets.CollapsableVBox", {
1+
qx.Class.define("qxapp.component.widget.CollapsableVBox", {
22
extend: qx.ui.core.Widget,
33

44
construct: function(headerText = "Header", contentWidgets = []) {

‎services/web/client/source/class/qxapp/components/widgets/FileManager.js renamed to ‎services/web/client/source/class/qxapp/component/widget/FileManager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.widgets.FileManager", {
1+
qx.Class.define("qxapp.component.widget.FileManager", {
22
extend: qx.ui.core.Widget,
33

44
construct: function(nodeModel) {

‎services/web/client/source/class/qxapp/components/widgets/FilePicker.js renamed to ‎services/web/client/source/class/qxapp/component/widget/FilePicker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* global XMLHttpRequest */
2-
qx.Class.define("qxapp.components.widgets.FilePicker", {
2+
qx.Class.define("qxapp.component.widget.FilePicker", {
33
extend: qx.ui.core.Widget,
44

55
construct: function(node) {

‎services/web/client/source/class/qxapp/components/widgets/NodeInput.js renamed to ‎services/web/client/source/class/qxapp/component/widget/NodeInput.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.widgets.NodeInput", {
1+
qx.Class.define("qxapp.component.widget.NodeInput", {
22
extend: qx.ui.core.Widget,
33

44
construct: function(nodeModel) {

‎services/web/client/source/class/qxapp/components/widgets/NodePorts.js renamed to ‎services/web/client/source/class/qxapp/component/widget/NodePorts.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.widgets.NodePorts", {
1+
qx.Class.define("qxapp.component.widget.NodePorts", {
22
extend: qx.ui.core.Widget,
33

44
construct: function(nodeModel) {

‎services/web/client/source/class/qxapp/components/widgets/SettingsView.js renamed to ‎services/web/client/source/class/qxapp/component/widget/SettingsView.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const PORT_INPUTS_WIDTH = 300;
22

3-
qx.Class.define("qxapp.components.widgets.SettingsView", {
3+
qx.Class.define("qxapp.component.widget.SettingsView", {
44
extend: qx.ui.container.Composite,
55

66
construct: function() {
@@ -108,7 +108,7 @@ qx.Class.define("qxapp.components.widgets.SettingsView", {
108108
icon: "@FontAwesome5Solid/folder-open/32"
109109
});
110110
openFolder.addListener("execute", function() {
111-
let fileManager = new qxapp.components.widgets.FileManager(this.getNodeModel()).set({
111+
let fileManager = new qxapp.component.widget.FileManager(this.getNodeModel()).set({
112112
width: 600,
113113
height: 400
114114
});
@@ -200,7 +200,7 @@ qx.Class.define("qxapp.components.widgets.SettingsView", {
200200
},
201201

202202
__createInputPortsUI: function(inputNodeModel) {
203-
let nodePorts = new qxapp.components.widgets.NodePorts(inputNodeModel);
203+
let nodePorts = new qxapp.component.widget.NodePorts(inputNodeModel);
204204
nodePorts.populateNodeLayout();
205205
this.__createDragDropMechanism(nodePorts);
206206
this.__inputNodesLayout.add(nodePorts, {

‎services/web/client/source/class/qxapp/components/widgets/Simulator.js renamed to ‎services/web/client/source/class/qxapp/component/widget/Simulator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.widgets.Simulator", {
1+
qx.Class.define("qxapp.component.widget.Simulator", {
22
extend: qx.ui.core.Widget,
33

44
construct: function(node) {

‎services/web/client/source/class/qxapp/components/widgets/SimulatorSetting.js renamed to ‎services/web/client/source/class/qxapp/component/widget/SimulatorSetting.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.widgets.SimulatorSetting", {
1+
qx.Class.define("qxapp.component.widget.SimulatorSetting", {
22
extend: qx.ui.core.Widget,
33

44
construct: function() {
@@ -7,7 +7,7 @@ qx.Class.define("qxapp.components.widgets.SimulatorSetting", {
77
let simulatorSettingLayout = new qx.ui.layout.HBox(10);
88
this._setLayout(simulatorSettingLayout);
99

10-
let collapsableVBox1 = new qxapp.components.widgets.CollapsableVBox("Inputs");
10+
let collapsableVBox1 = new qxapp.component.widget.CollapsableVBox("Inputs");
1111
let componentsBox = this.__componentsBox = new qx.ui.container.Composite(new qx.ui.layout.VBox(10)).set({
1212
width: 250
1313
});
@@ -16,7 +16,7 @@ qx.Class.define("qxapp.components.widgets.SimulatorSetting", {
1616
});
1717
this._add(collapsableVBox1);
1818

19-
let collapsableVBox2 = new qxapp.components.widgets.CollapsableVBox("Settings");
19+
let collapsableVBox2 = new qxapp.component.widget.CollapsableVBox("Settings");
2020
let settingsBox = this.__settingsBox = new qx.ui.container.Composite(new qx.ui.layout.VBox(10)).set({
2121
width: 250
2222
});
@@ -44,7 +44,7 @@ qx.Class.define("qxapp.components.widgets.SimulatorSetting", {
4444

4545
properties: {
4646
node: {
47-
check: "qxapp.components.workbench.NodeBase",
47+
check: "qxapp.component.workbench.NodeBase",
4848
apply: "__applyNode"
4949
}
5050
},
@@ -229,8 +229,8 @@ qx.Class.define("qxapp.components.widgets.SimulatorSetting", {
229229
if (inputs === null) {
230230
return null;
231231
}
232-
let form = new qxapp.components.form.Auto(inputs);
233-
let propForm = new qxapp.components.form.renderer.PropForm(form);
232+
let form = new qxapp.component.form.Auto(inputs);
233+
let propForm = new qxapp.component.form.renderer.PropForm(form);
234234
return propForm;
235235
},
236236

‎services/web/client/source/class/qxapp/components/widgets/TreeTool.js renamed to ‎services/web/client/source/class/qxapp/component/widget/TreeTool.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint no-warning-comments: "off" */
22

3-
qx.Class.define("qxapp.components.widgets.TreeTool", {
3+
qx.Class.define("qxapp.component.widget.TreeTool", {
44
extend: qx.ui.core.Widget,
55

66
construct: function(projectName, workbenchModel) {

‎services/web/client/source/class/qxapp/components/widgets/WidgetManager.js renamed to ‎services/web/client/source/class/qxapp/component/widget/WidgetManager.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.widgets.WidgetManager", {
1+
qx.Class.define("qxapp.component.widget.WidgetManager", {
22
extend: qx.core.Object,
33

44
type: "singleton",
@@ -7,15 +7,15 @@ qx.Class.define("qxapp.components.widgets.WidgetManager", {
77
getWidgetForNode: function(node) {
88
let nodeKey = node.getMetaData().key;
99
if (nodeKey.includes("file-picker")) {
10-
let filePicker = new qxapp.components.widgets.FilePicker(node);
10+
let filePicker = new qxapp.component.widget.FilePicker(node);
1111
return filePicker;
1212
}
1313
/* else if (nodeKey.includes("s4l/Simulator/LF/")) {
14-
let simulatorSetting = new qxapp.components.widgets.SimulatorSetting();
14+
let simulatorSetting = new qxapp.component.widget.SimulatorSetting();
1515
simulatorSetting.setNode(node);
1616
return simulatorSetting;
1717
} else if (nodeKey.includes("s4l/Simulator/")) {
18-
let simulator = new qxapp.components.widgets.Simulator(node);
18+
let simulator = new qxapp.component.widget.Simulator(node);
1919
return simulator;
2020
}
2121
*/

‎services/web/client/source/class/qxapp/components/widgets/logger/LoggerView.js renamed to ‎services/web/client/source/class/qxapp/component/widget/logger/LoggerView.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const LOG_LEVEL = {
88
};
99
Object.freeze(LOG_LEVEL);
1010

11-
qx.Class.define("qxapp.components.widgets.logger.LoggerView", {
11+
qx.Class.define("qxapp.component.widget.logger.LoggerView", {
1212
extend: qx.ui.core.Widget,
1313

1414
construct: function() {
@@ -64,7 +64,7 @@ qx.Class.define("qxapp.components.widgets.logger.LoggerView", {
6464
this._add(filterLayout);
6565

6666
// let tableModel = this.__logModel = new qx.ui.table.model.Filtered();
67-
let tableModel = this.__logModel = new qxapp.components.widgets.logger.RemoteTableModel();
67+
let tableModel = this.__logModel = new qxapp.component.widget.logger.RemoteTableModel();
6868
tableModel.setColumns(["Origin", "Message"], ["whoRich", "whatRich"]);
6969

7070
let custom = {

‎services/web/client/source/class/qxapp/components/widgets/logger/RemoteTableModel.js renamed to ‎services/web/client/source/class/qxapp/component/widget/logger/RemoteTableModel.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
/* eslint no-underscore-dangle: "off" */
2929

30-
qx.Class.define("qxapp.components.widgets.logger.RemoteTableModel", {
30+
qx.Class.define("qxapp.component.widget.logger.RemoteTableModel", {
3131

3232
extend : qx.ui.table.model.Remote,
3333

‎services/web/client/source/class/qxapp/components/workbench/LinkBase.js renamed to ‎services/web/client/source/class/qxapp/component/workbench/LinkBase.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.workbench.LinkBase", {
1+
qx.Class.define("qxapp.component.workbench.LinkBase", {
22
extend: qx.core.Object,
33

44
construct: function(representation) {

‎services/web/client/source/class/qxapp/components/workbench/NodeBase.js renamed to ‎services/web/client/source/class/qxapp/component/workbench/NodeBase.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const nodeWidth = 180;
22
const portHeight = 16;
33

4-
qx.Class.define("qxapp.components.workbench.NodeBase", {
4+
qx.Class.define("qxapp.component.workbench.NodeBase", {
55
extend: qx.ui.window.Window,
66

77
construct: function(nodeModel) {

‎services/web/client/source/class/qxapp/components/workbench/SvgWidget.js renamed to ‎services/web/client/source/class/qxapp/component/workbench/SvgWidget.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.workbench.SvgWidget", {
1+
qx.Class.define("qxapp.component.workbench.SvgWidget", {
22
extend: qx.ui.core.Widget,
33

44
construct: function(svgLayerId) {

‎services/web/client/source/class/qxapp/components/workbench/WorkbenchView.js renamed to ‎services/web/client/source/class/qxapp/component/workbench/WorkbenchView.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const BUTTON_SIZE = 50;
55
const BUTTON_SPACING = 10;
66
const NODE_INPUTS_WIDTH = 200;
77

8-
qx.Class.define("qxapp.components.workbench.WorkbenchView", {
8+
qx.Class.define("qxapp.component.workbench.WorkbenchView", {
99
extend: qx.ui.container.Composite,
1010

1111
construct: function(workbenchModel) {
@@ -44,7 +44,7 @@ qx.Class.define("qxapp.components.workbench.WorkbenchView", {
4444
});
4545

4646
this.setWorkbenchModel(workbenchModel);
47-
this.__svgWidget = new qxapp.components.workbench.SvgWidget("SvgWidgetLayer");
47+
this.__svgWidget = new qxapp.component.workbench.SvgWidget("SvgWidgetLayer");
4848
// this gets fired once the widget has appeared and the library has been loaded
4949
// due to the qx rendering, this will always happen after setup, so we are
5050
// sure to catch this event
@@ -96,7 +96,7 @@ qx.Class.define("qxapp.components.workbench.WorkbenchView", {
9696
let x = pointerEvent.getViewportLeft() - this.getBounds().left;
9797
let y = pointerEvent.getViewportTop() - navBarHeight;
9898

99-
let srvCat = new qxapp.components.workbench.servicesCatalogue.ServicesCatalogue();
99+
let srvCat = new qxapp.component.workbench.servicesCatalogue.ServicesCatalogue();
100100
srvCat.moveTo(x, y);
101101
srvCat.open();
102102
let pos = {
@@ -143,7 +143,7 @@ qx.Class.define("qxapp.components.workbench.WorkbenchView", {
143143
height: BUTTON_SIZE
144144
});
145145
plusButton.addListener("execute", function() {
146-
let srvCat = new qxapp.components.workbench.servicesCatalogue.ServicesCatalogue();
146+
let srvCat = new qxapp.component.workbench.servicesCatalogue.ServicesCatalogue();
147147
srvCat.center();
148148
srvCat.open();
149149
srvCat.addListener("AddService", function(e) {
@@ -241,7 +241,7 @@ qx.Class.define("qxapp.components.workbench.WorkbenchView", {
241241
__createNodeUI: function(nodeId) {
242242
let nodeModel = this.getWorkbenchModel().getNodeModel(nodeId);
243243

244-
let nodeBase = new qxapp.components.workbench.NodeBase(nodeModel);
244+
let nodeBase = new qxapp.component.workbench.NodeBase(nodeModel);
245245
nodeBase.createNodeLayout();
246246
nodeBase.populateNodeLayout();
247247
this.__createDragDropMechanism(nodeBase);
@@ -334,7 +334,7 @@ qx.Class.define("qxapp.components.workbench.WorkbenchView", {
334334
let posX = this.__pointerPosX;
335335
let posY = this.__pointerPosY;
336336
if (this.__tempLinkNodeId === dragNodeId) {
337-
let srvCat = new qxapp.components.workbench.servicesCatalogue.ServicesCatalogue();
337+
let srvCat = new qxapp.component.workbench.servicesCatalogue.ServicesCatalogue();
338338
if (this.__tempLinkIsInput === true) {
339339
srvCat.setContext(dragNodeId, this.getNodeUI(dragNodeId).getInputPort());
340340
} else {
@@ -363,7 +363,7 @@ qx.Class.define("qxapp.components.workbench.WorkbenchView", {
363363
},
364364

365365
__createInputNodeUI: function(inputNodeModel) {
366-
let nodeInput = new qxapp.components.widgets.NodeInput(inputNodeModel);
366+
let nodeInput = new qxapp.component.widget.NodeInput(inputNodeModel);
367367
nodeInput.populateNodeLayout();
368368
this.__createDragDropMechanism(nodeInput);
369369
this.__inputNodesLayout.add(nodeInput, {
@@ -430,7 +430,7 @@ qx.Class.define("qxapp.components.workbench.WorkbenchView", {
430430
const y2 = pointList[1] ? pointList[1][1] : 0;
431431
let linkRepresentation = this.__svgWidget.drawCurve(x1, y1, x2, y2);
432432

433-
let link = new qxapp.components.workbench.LinkBase(linkRepresentation);
433+
let link = new qxapp.component.workbench.LinkBase(linkRepresentation);
434434
link.setInputNodeId(node1.getNodeId());
435435
link.setOutputNodeId(node2.getNodeId());
436436
link.setLinkId(linkId);

‎services/web/client/source/class/qxapp/components/workbench/servicesCatalogue/SearchTypeFilter.js renamed to ‎services/web/client/source/class/qxapp/component/workbench/servicesCatalogue/SearchTypeFilter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
qx.Class.define("qxapp.components.workbench.servicesCatalogue.SearchTypeFilter", {
1+
qx.Class.define("qxapp.component.workbench.servicesCatalogue.SearchTypeFilter", {
22
extend : qx.core.Object,
33

44
construct: function(controller) {

‎services/web/client/source/class/qxapp/components/workbench/servicesCatalogue/ServicesCatalogue.js renamed to ‎services/web/client/source/class/qxapp/component/workbench/servicesCatalogue/ServicesCatalogue.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint no-warning-comments: "off" */
22

3-
qx.Class.define("qxapp.components.workbench.servicesCatalogue.ServicesCatalogue", {
3+
qx.Class.define("qxapp.component.workbench.servicesCatalogue.ServicesCatalogue", {
44
extend: qx.ui.window.Window,
55

66
construct: function() {
@@ -45,7 +45,7 @@ qx.Class.define("qxapp.components.workbench.servicesCatalogue.ServicesCatalogue"
4545
// controller.setLabelPath("name");
4646

4747
// create the filter
48-
let filterObj = new qxapp.components.workbench.servicesCatalogue.SearchTypeFilter(this.__controller);
48+
let filterObj = new qxapp.component.workbench.servicesCatalogue.SearchTypeFilter(this.__controller);
4949
// Item's data sorting
5050
filterObj.sorter = function(a, b) {
5151
return a > b;

0 commit comments

Comments
 (0)