@eclipse-glsp-examples/workflow-glsp 1.1.0-next.7ff1b00.184 → 1.1.0-next.80bb01c.251

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -11,6 +11,6 @@ This package is built with `yarn` and is available from npm via [@eclipse-glsp-e
11
11
  ## More information
12
12
 
13
13
  For more information, please visit the [Eclipse GLSP Umbrella repository](https://github.com/eclipse-glsp/glsp) and the [Eclipse GLSP Website](https://www.eclipse.org/glsp/).
14
- If you have questions, contact us on our [spectrum chat](https://spectrum.chat/glsp/) and have a look at our [communication and support options](https://www.eclipse.org/glsp/contact/).
14
+ If you have questions, please raise them in the [discussions](https://github.com/eclipse-glsp/glsp/discussions) and have a look at our [communication and support options](https://www.eclipse.org/glsp/contact/).
15
15
 
16
16
  ![alt](https://www.eclipse.org/glsp/images/diagramanimated.gif)
@@ -1,6 +1,24 @@
1
+ /********************************************************************************
2
+ * Copyright (c) 2019-2023 EclipseSource and others.
3
+ *
4
+ * This program and the accompanying materials are made available under the
5
+ * terms of the Eclipse Public License v. 2.0 which is available at
6
+ * http://www.eclipse.org/legal/epl-2.0.
7
+ *
8
+ * This Source Code may also be made available under the following Secondary
9
+ * Licenses when the conditions for such availability set forth in the Eclipse
10
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ * with the GNU Classpath Exception which is available at
12
+ * https://www.gnu.org/software/classpath/license.html.
13
+ *
14
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
+ ********************************************************************************/
16
+ import { ContainerConfiguration } from '@eclipse-glsp/client';
1
17
  import 'balloon-css/balloon.min.css';
2
- import { Container } from 'inversify';
18
+ import { Container, ContainerModule } from 'inversify';
3
19
  import 'sprotty/css/edit-label.css';
4
20
  import '../css/diagram.css';
5
- export default function createContainer(widgetId: string): Container;
21
+ export declare const workflowDiagramModule: ContainerModule;
22
+ export declare function createWorkflowDiagramContainer(widgetId: string, ...containerConfiguration: ContainerConfiguration): Container;
23
+ export declare function initializeWorkflowDiagramContainer(container: Container, widgetId: string, ...containerConfiguration: ContainerConfiguration): Container;
6
24
  //# sourceMappingURL=di.config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":"AAsCA,OAAO,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAAmB,MAAM,WAAW,CAAC;AACvD,OAAO,4BAA4B,CAAC;AACpC,OAAO,oBAAoB,CAAC;AAgC5B,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAOnE"}
1
+ {"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAEH,sBAAsB,EA0BzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,4BAA4B,CAAC;AACpC,OAAO,oBAAoB,CAAC;AAK5B,eAAO,MAAM,qBAAqB,iBA0BhC,CAAC;AAEH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,sBAAsB,EAAE,sBAAsB,GAAG,SAAS,CAE7H;AAED,wBAAgB,kCAAkC,CAC9C,SAAS,EAAE,SAAS,EACpB,QAAQ,EAAE,MAAM,EAChB,GAAG,sBAAsB,EAAE,sBAAsB,GAClD,SAAS,CAOX"}
package/lib/di.config.js CHANGED
@@ -1,7 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.initializeWorkflowDiagramContainer = exports.createWorkflowDiagramContainer = exports.workflowDiagramModule = void 0;
3
4
  /********************************************************************************
4
- * Copyright (c) 2019-2021 EclipseSource and others.
5
+ * Copyright (c) 2019-2023 EclipseSource and others.
5
6
  *
6
7
  * This program and the accompanying materials are made available under the
7
8
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -16,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
16
17
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
17
18
  ********************************************************************************/
18
19
  const client_1 = require("@eclipse-glsp/client");
19
- const protocol_1 = require("@eclipse-glsp/protocol");
20
20
  require("balloon-css/balloon.min.css");
21
21
  const inversify_1 = require("inversify");
22
22
  require("sprotty/css/edit-label.css");
@@ -24,13 +24,13 @@ require("../css/diagram.css");
24
24
  const di_config_1 = require("./direct-task-editing/di.config");
25
25
  const model_1 = require("./model");
26
26
  const workflow_views_1 = require("./workflow-views");
27
- const workflowDiagramModule = new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
28
- rebind(client_1.TYPES.ILogger).to(client_1.ConsoleLogger).inSingletonScope();
29
- rebind(client_1.TYPES.LogLevel).toConstantValue(client_1.LogLevel.warn);
30
- bind(client_1.TYPES.ISnapper).to(client_1.GridSnapper);
31
- bind(client_1.TYPES.ICommandPaletteActionProvider).to(client_1.RevealNamedElementActionProvider);
32
- bind(client_1.TYPES.IContextMenuItemProvider).to(client_1.DeleteElementContextMenuItemProvider);
27
+ exports.workflowDiagramModule = new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
33
28
  const context = { bind, unbind, isBound, rebind };
29
+ (0, client_1.bindOrRebind)(context, client_1.TYPES.ILogger).to(client_1.ConsoleLogger).inSingletonScope();
30
+ (0, client_1.bindOrRebind)(context, client_1.TYPES.LogLevel).toConstantValue(client_1.LogLevel.warn);
31
+ bind(client_1.TYPES.ISnapper).to(client_1.GridSnapper);
32
+ (0, client_1.bindAsService)(context, client_1.TYPES.ICommandPaletteActionProvider, client_1.RevealNamedElementActionProvider);
33
+ (0, client_1.bindAsService)(context, client_1.TYPES.IContextMenuItemProvider, client_1.DeleteElementContextMenuItemProvider);
34
34
  (0, client_1.configureDefaultModelElements)(context);
35
35
  (0, client_1.configureModelElement)(context, 'task:automated', model_1.TaskNode, client_1.RoundedCornerNodeView);
36
36
  (0, client_1.configureModelElement)(context, 'task:manual', model_1.TaskNode, client_1.RoundedCornerNodeView);
@@ -38,23 +38,28 @@ const workflowDiagramModule = new inversify_1.ContainerModule((bind, unbind, isB
38
38
  (0, client_1.configureModelElement)(context, 'comp:comp', client_1.SCompartment, client_1.SCompartmentView);
39
39
  (0, client_1.configureModelElement)(context, 'comp:header', client_1.SCompartment, client_1.SCompartmentView);
40
40
  (0, client_1.configureModelElement)(context, 'label:icon', client_1.SLabel, client_1.SLabelView);
41
- (0, client_1.configureModelElement)(context, protocol_1.DefaultTypes.EDGE, client_1.SEdge, workflow_views_1.WorkflowEdgeView);
41
+ (0, client_1.configureModelElement)(context, client_1.DefaultTypes.EDGE, client_1.GEdge, workflow_views_1.WorkflowEdgeView);
42
42
  (0, client_1.configureModelElement)(context, 'edge:weighted', model_1.WeightedEdge, workflow_views_1.WorkflowEdgeView);
43
43
  (0, client_1.configureModelElement)(context, 'icon', model_1.Icon, workflow_views_1.IconView);
44
44
  (0, client_1.configureModelElement)(context, 'activityNode:merge', model_1.ActivityNode, client_1.DiamondNodeView);
45
45
  (0, client_1.configureModelElement)(context, 'activityNode:decision', model_1.ActivityNode, client_1.DiamondNodeView);
46
46
  (0, client_1.configureModelElement)(context, 'activityNode:fork', model_1.ActivityNode, client_1.RectangularNodeView);
47
47
  (0, client_1.configureModelElement)(context, 'activityNode:join', model_1.ActivityNode, client_1.RectangularNodeView);
48
+ (0, client_1.configureModelElement)(context, client_1.DefaultTypes.GRAPH, client_1.GLSPGraph, client_1.GLSPProjectionView);
48
49
  (0, client_1.configureModelElement)(context, 'category', model_1.CategoryNode, client_1.RoundedCornerNodeView);
49
50
  (0, client_1.configureModelElement)(context, 'struct', client_1.SCompartment, client_1.StructureCompartmentView);
50
51
  });
51
- function createContainer(widgetId) {
52
- const container = (0, client_1.createClientContainer)(workflowDiagramModule, di_config_1.directTaskEditor);
52
+ function createWorkflowDiagramContainer(widgetId, ...containerConfiguration) {
53
+ return initializeWorkflowDiagramContainer(new inversify_1.Container(), widgetId, ...containerConfiguration);
54
+ }
55
+ exports.createWorkflowDiagramContainer = createWorkflowDiagramContainer;
56
+ function initializeWorkflowDiagramContainer(container, widgetId, ...containerConfiguration) {
57
+ (0, client_1.initializeDiagramContainer)(container, exports.workflowDiagramModule, di_config_1.directTaskEditor, client_1.glspAccessibilityModule, ...containerConfiguration);
53
58
  (0, client_1.overrideViewerOptions)(container, {
54
59
  baseDiv: widgetId,
55
60
  hiddenDiv: widgetId + '_hidden'
56
61
  });
57
62
  return container;
58
63
  }
59
- exports.default = createContainer;
64
+ exports.initializeWorkflowDiagramContainer = initializeWorkflowDiagramContainer;
60
65
  //# sourceMappingURL=di.config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"di.config.js","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"di.config.js","sourceRoot":"","sources":["../src/di.config.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../src/direct-task-editing/di.config.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,eAAO,MAAM,gBAAgB,iBAG3B,CAAC"}
1
+ {"version":3,"file":"di.config.d.ts","sourceRoot":"","sources":["../../src/direct-task-editing/di.config.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,eAAO,MAAM,gBAAgB,iBAE3B,CAAC"}
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.directTaskEditor = void 0;
4
4
  /********************************************************************************
5
- * Copyright (c) 2020-2022 EclipseSource and others.
5
+ * Copyright (c) 2019-2023 EclipseSource and others.
6
6
  *
7
7
  * This program and the accompanying materials are made available under the
8
8
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,8 +19,7 @@ exports.directTaskEditor = void 0;
19
19
  const client_1 = require("@eclipse-glsp/client");
20
20
  const inversify_1 = require("inversify");
21
21
  const direct_task_editor_1 = require("./direct-task-editor");
22
- exports.directTaskEditor = new inversify_1.ContainerModule((bind, _unbind, isBound) => {
23
- bind(direct_task_editor_1.TaskEditor).toSelf().inSingletonScope();
24
- bind(client_1.TYPES.IUIExtension).toService(direct_task_editor_1.TaskEditor);
22
+ exports.directTaskEditor = new inversify_1.ContainerModule((bind, _unbind, _isBound) => {
23
+ (0, client_1.bindAsService)(bind, client_1.TYPES.IUIExtension, direct_task_editor_1.TaskEditor);
25
24
  });
26
25
  //# sourceMappingURL=di.config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../src/direct-task-editing/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAA6C;AAC7C,yCAA4C;AAC5C,6DAAkD;AAErC,QAAA,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE;IAC3E,IAAI,CAAC,+BAAU,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7C,IAAI,CAAC,cAAK,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC,+BAAU,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"di.config.js","sourceRoot":"","sources":["../../src/direct-task-editing/di.config.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAA4D;AAC5D,yCAA4C;AAC5C,6DAAkD;AAErC,QAAA,gBAAgB,GAAG,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;IAC5E,IAAA,sBAAa,EAAC,IAAI,EAAE,cAAK,CAAC,YAAY,EAAE,+BAAU,CAAC,CAAC;AACxD,CAAC,CAAC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2020-2022 EclipseSource and others.
2
+ * Copyright (c) 2020-2023 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,31 +13,35 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { AbstractUIExtension, Action, AutoCompleteWidget, EditorContextService, GLSPActionDispatcher, ILogger, LabeledAction, Operation, SModelRoot, ValidationStatus, ViewerOptions } from '@eclipse-glsp/client';
17
- import { DOMHelper } from 'sprotty/lib/base/views/dom-helper';
16
+ import { AbstractUIExtension, Action, AutoCompleteWidget, DOMHelper, EditorContextService, GLSPActionDispatcher, ILogger, LabeledAction, Operation, SModelRoot, ValidationStatus, ViewerOptions } from '@eclipse-glsp/client';
18
17
  import { TaskNode } from '../model';
19
18
  /**
20
19
  * Is send from the {@link TaskEditor} to the GLSP server
21
- * to execute a task edit operation.
20
+ * to update a feature from a specified task.
22
21
  */
23
- export interface ApplyTaskEditOperation extends Operation {
24
- kind: typeof ApplyTaskEditOperation.KIND;
22
+ export interface EditTaskOperation extends Operation {
23
+ kind: typeof EditTaskOperation.KIND;
25
24
  /**
26
25
  * Id of the task that should be edited
27
26
  */
28
27
  taskId: string;
29
28
  /**
30
- * The edit expression
29
+ * The feature that is to be updated
31
30
  */
32
- expression: string;
31
+ feature: 'duration' | 'taskType';
32
+ /**
33
+ * The new feature value
34
+ */
35
+ value: string;
33
36
  }
34
- export declare namespace ApplyTaskEditOperation {
35
- const KIND = "applyTaskEdit";
36
- function is(object: any): object is ApplyTaskEditOperation;
37
+ export declare namespace EditTaskOperation {
38
+ const KIND = "editTask";
39
+ function is(object: any): object is EditTaskOperation;
37
40
  function create(options: {
38
41
  taskId: string;
39
- expression: string;
40
- }): ApplyTaskEditOperation;
42
+ feature: 'duration' | 'taskType';
43
+ value: string;
44
+ }): EditTaskOperation;
41
45
  }
42
46
  export declare class TaskEditor extends AbstractUIExtension {
43
47
  static readonly ID = "task-editor";
@@ -1 +1 @@
1
- {"version":3,"file":"direct-task-editor.d.ts","sourceRoot":"","sources":["../../src/direct-task-editing/direct-task-editor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,mBAAmB,EACnB,MAAM,EACN,kBAAkB,EAClB,oBAAoB,EAEpB,oBAAoB,EAEpB,OAAO,EACP,aAAa,EAEb,SAAS,EAKT,UAAU,EAIV,gBAAgB,EAChB,aAAa,EAChB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAc,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEhD;;;GAGG;AACH,MAAM,WAAW,sBAAuB,SAAQ,SAAS;IACrD,IAAI,EAAE,OAAO,sBAAsB,CAAC,IAAI,CAAC;IAEzC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,yBAAiB,sBAAsB,CAAC;IAC7B,MAAM,IAAI,kBAAkB,CAAC;IAEpC,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,sBAAsB,CAEhE;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,sBAAsB,CAM9F;CACJ;AAED,qBACa,UAAW,SAAQ,mBAAmB;IAC/C,MAAM,CAAC,QAAQ,CAAC,EAAE,iBAAiB;IACnC,QAAQ,CAAC,sBAAsB;;;;;MAK7B;IAGF,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAGjD,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAGvC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAE/B,UACmB,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;IACzB,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAE7C,EAAE,IAAI,MAAM;IAGZ,cAAc,IAAI,MAAM;IAIxB,SAAS,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,WAAW,GAAG,IAAI;IAkBxD,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI;cAK5D,YAAY,CAAC,gBAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI;IAMhI,SAAS,CAAC,WAAW,CAAC,gBAAgB,EAAE,WAAW,GAAG,IAAI;cAe1C,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;cAU5D,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUvE,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI;IAI/E,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAK9C,IAAI,IAAI,IAAI;CAIxB"}
1
+ {"version":3,"file":"direct-task-editor.d.ts","sourceRoot":"","sources":["../../src/direct-task-editing/direct-task-editor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EACH,mBAAmB,EACnB,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,oBAAoB,EACpB,oBAAoB,EACpB,OAAO,EACP,aAAa,EAEb,SAAS,EAGT,UAAU,EAKV,gBAAgB,EAChB,aAAa,EAIhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAc,MAAM,UAAU,CAAC;AAEhD;;;GAGG;AACH,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAChD,IAAI,EAAE,OAAO,iBAAiB,CAAC,IAAI,CAAC;IAEpC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,OAAO,EAAE,UAAU,GAAG,UAAU,CAAC;IAEjC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,yBAAiB,iBAAiB,CAAC;IACxB,MAAM,IAAI,aAAa,CAAC;IAE/B,SAAgB,EAAE,CAAC,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,iBAAiB,CAO3D;IAED,SAAgB,MAAM,CAAC,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,UAAU,GAAG,UAAU,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,iBAAiB,CAMtH;CACJ;AAED,qBACa,UAAW,SAAQ,mBAAmB;IAC/C,MAAM,CAAC,QAAQ,CAAC,EAAE,iBAAiB;IACnC,QAAQ,CAAC,sBAAsB;;;;;MAK7B;IAGF,SAAS,CAAC,gBAAgB,EAAE,oBAAoB,CAAC;IAGjD,SAAS,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAGrD,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAGvC,SAAS,CAAC,SAAS,EAAE,SAAS,CAAC;IAE/B,UACmB,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC;IACzB,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC;IAE7C,EAAE,IAAI,MAAM;IAGZ,cAAc,IAAI,MAAM;IAIxB,SAAS,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,WAAW,GAAG,IAAI;IAkBxD,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI;cAK5D,YAAY,CAAC,gBAAgB,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,iBAAiB,EAAE,MAAM,EAAE,GAAG,IAAI;IAMhI,SAAS,CAAC,WAAW,CAAC,gBAAgB,EAAE,WAAW,GAAG,IAAI;cAe1C,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;cAU5D,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUvE,SAAS,CAAC,qBAAqB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI;IAI/E,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAc9C,IAAI,IAAI,IAAI;CAIxB"}
@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
10
10
  };
11
11
  var TaskEditor_1;
12
12
  Object.defineProperty(exports, "__esModule", { value: true });
13
- exports.TaskEditor = exports.ApplyTaskEditOperation = void 0;
13
+ exports.TaskEditor = exports.EditTaskOperation = void 0;
14
14
  /********************************************************************************
15
- * Copyright (c) 2020-2022 EclipseSource and others.
15
+ * Copyright (c) 2020-2023 EclipseSource and others.
16
16
  *
17
17
  * This program and the accompanying materials are made available under the
18
18
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -28,20 +28,22 @@ exports.TaskEditor = exports.ApplyTaskEditOperation = void 0;
28
28
  ********************************************************************************/
29
29
  const client_1 = require("@eclipse-glsp/client");
30
30
  const inversify_1 = require("inversify");
31
- const dom_helper_1 = require("sprotty/lib/base/views/dom-helper");
32
31
  const model_1 = require("../model");
33
- var ApplyTaskEditOperation;
34
- (function (ApplyTaskEditOperation) {
35
- ApplyTaskEditOperation.KIND = 'applyTaskEdit';
32
+ var EditTaskOperation;
33
+ (function (EditTaskOperation) {
34
+ EditTaskOperation.KIND = 'editTask';
36
35
  function is(object) {
37
- return client_1.Operation.hasKind(object, ApplyTaskEditOperation.KIND) && (0, client_1.hasStringProp)(object, 'taskId') && (0, client_1.hasStringProp)(object, 'expression');
36
+ return (client_1.Action.hasKind(object, EditTaskOperation.KIND) &&
37
+ (0, client_1.hasStringProp)(object, 'taskId') &&
38
+ (0, client_1.hasStringProp)(object, 'feature') &&
39
+ (0, client_1.hasStringProp)(object, 'value'));
38
40
  }
39
- ApplyTaskEditOperation.is = is;
41
+ EditTaskOperation.is = is;
40
42
  function create(options) {
41
- return Object.assign({ kind: ApplyTaskEditOperation.KIND, isOperation: true }, options);
43
+ return Object.assign({ kind: EditTaskOperation.KIND, isOperation: true }, options);
42
44
  }
43
- ApplyTaskEditOperation.create = create;
44
- })(ApplyTaskEditOperation = exports.ApplyTaskEditOperation || (exports.ApplyTaskEditOperation = {}));
45
+ EditTaskOperation.create = create;
46
+ })(EditTaskOperation = exports.EditTaskOperation || (exports.EditTaskOperation = {}));
45
47
  let TaskEditor = TaskEditor_1 = class TaskEditor extends client_1.AbstractUIExtension {
46
48
  constructor() {
47
49
  super(...arguments);
@@ -105,8 +107,19 @@ let TaskEditor = TaskEditor_1 = class TaskEditor extends client_1.AbstractUIExte
105
107
  this.actionDispatcher.dispatchAll((0, client_1.toActionArray)(input));
106
108
  }
107
109
  executeFromTextOnlyInput(input) {
108
- const action = ApplyTaskEditOperation.create({ taskId: this.task.id, expression: input });
109
- this.actionDispatcher.dispatch(action);
110
+ if (input.startsWith('duration:')) {
111
+ const value = input.substring('duration:'.length);
112
+ const action = EditTaskOperation.create({ taskId: this.task.id, feature: 'duration', value });
113
+ this.actionDispatcher.dispatch(action);
114
+ }
115
+ else if (input.startsWith('taskType:')) {
116
+ const value = input.substring('taskType:'.length);
117
+ const action = EditTaskOperation.create({ taskId: this.task.id, feature: 'taskType', value });
118
+ this.actionDispatcher.dispatch(action);
119
+ }
120
+ else {
121
+ throw new Error('Unsupported Task Editing: ' + input);
122
+ }
110
123
  }
111
124
  hide() {
112
125
  this.autoSuggestion.dispose();
@@ -128,7 +141,7 @@ __decorate([
128
141
  ], TaskEditor.prototype, "viewerOptions", void 0);
129
142
  __decorate([
130
143
  (0, inversify_1.inject)(client_1.TYPES.DOMHelper),
131
- __metadata("design:type", dom_helper_1.DOMHelper)
144
+ __metadata("design:type", client_1.DOMHelper)
132
145
  ], TaskEditor.prototype, "domHelper", void 0);
133
146
  __decorate([
134
147
  (0, inversify_1.inject)(client_1.TYPES.ILogger),
@@ -1 +1 @@
1
- {"version":3,"file":"direct-task-editor.js","sourceRoot":"","sources":["../../src/direct-task-editing/direct-task-editor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"direct-task-editor.js","sourceRoot":"","sources":["../../src/direct-task-editing/direct-task-editor.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2019-2021 EclipseSource and others.
2
+ * Copyright (c) 2019-2023 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,9 +13,8 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import createWorkflowDiagramContainer from './di.config';
16
+ export * from './di.config';
17
+ export * from './direct-task-editing/direct-task-editor';
17
18
  export * from './model';
18
19
  export * from './workflow-views';
19
- export * from './direct-task-editing/direct-task-editor';
20
- export { createWorkflowDiagramContainer };
21
20
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,8BAA8B,MAAM,aAAa,CAAC;AAEzD,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC;AACjC,cAAc,0CAA0C,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,cAAc,aAAa,CAAC;AAC5B,cAAc,0CAA0C,CAAC;AACzD,cAAc,SAAS,CAAC;AACxB,cAAc,kBAAkB,CAAC"}
package/lib/index.js CHANGED
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
3
  if (k2 === undefined) k2 = k;
4
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
5
9
  }) : (function(o, m, k, k2) {
6
10
  if (k2 === undefined) k2 = k;
7
11
  o[k2] = m[k];
@@ -10,9 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
15
  };
12
16
  Object.defineProperty(exports, "__esModule", { value: true });
13
- exports.createWorkflowDiagramContainer = void 0;
14
17
  /********************************************************************************
15
- * Copyright (c) 2019-2021 EclipseSource and others.
18
+ * Copyright (c) 2019-2023 EclipseSource and others.
16
19
  *
17
20
  * This program and the accompanying materials are made available under the
18
21
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -26,9 +29,8 @@ exports.createWorkflowDiagramContainer = void 0;
26
29
  *
27
30
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
28
31
  ********************************************************************************/
29
- const di_config_1 = require("./di.config");
30
- exports.createWorkflowDiagramContainer = di_config_1.default;
32
+ __exportStar(require("./di.config"), exports);
33
+ __exportStar(require("./direct-task-editing/direct-task-editor"), exports);
31
34
  __exportStar(require("./model"), exports);
32
35
  __exportStar(require("./workflow-views"), exports);
33
- __exportStar(require("./direct-task-editing/direct-task-editor"), exports);
34
36
  //# sourceMappingURL=index.js.map
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,2CAAyD;AAKhD,yCALF,mBAA8B,CAKE;AAHvC,0CAAwB;AACxB,mDAAiC;AACjC,2EAAyD"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,8CAA4B;AAC5B,2EAAyD;AACzD,0CAAwB;AACxB,mDAAiC"}
package/lib/model.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2020-2022 EclipseSource and others.
2
+ * Copyright (c) 2020-2023 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,7 +13,7 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { DiamondNode, EditableLabel, LayoutContainer, Nameable, RectangularNode, SChildElement, SEdge, SModelElement, SShapeElement, WithEditableLabel } from '@eclipse-glsp/client';
16
+ import { DiamondNode, EditableLabel, GEdge, LayoutContainer, Nameable, RectangularNode, SChildElement, SModelElement, SShapeElement, WithEditableLabel } from '@eclipse-glsp/client';
17
17
  export declare class TaskNode extends RectangularNode implements Nameable, WithEditableLabel {
18
18
  static readonly DEFAULT_FEATURES: symbol[];
19
19
  duration?: number;
@@ -23,7 +23,7 @@ export declare class TaskNode extends RectangularNode implements Nameable, WithE
23
23
  get name(): string;
24
24
  }
25
25
  export declare function isTaskNode(element: SModelElement): element is TaskNode;
26
- export declare class WeightedEdge extends SEdge {
26
+ export declare class WeightedEdge extends GEdge {
27
27
  probability?: string;
28
28
  }
29
29
  export declare class ActivityNode extends DiamondNode {
@@ -36,7 +36,7 @@ export declare class ActivityNode extends DiamondNode {
36
36
  }
37
37
  export declare namespace ActivityNode {
38
38
  namespace Type {
39
- const INITIAL = "initalNode";
39
+ const INITIAL = "initialNode";
40
40
  const FINAL = "finalNode";
41
41
  const DECISION = "decisionNode";
42
42
  const MERGE = "mergeNode";
@@ -1 +1 @@
1
- {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAIH,WAAW,EACX,aAAa,EAKb,eAAe,EAGf,QAAQ,EAGR,eAAe,EACf,aAAa,EACb,KAAK,EAEL,aAAa,EACb,aAAa,EACb,iBAAiB,EAEpB,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,QAAS,SAAQ,eAAgB,YAAW,QAAQ,EAAE,iBAAiB;IAChF,gBAAyB,gBAAgB,WAYvC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,IAAI,aAAa,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,GAAG,SAAS,CAM/D;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;CACJ;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,QAAQ,CAEtE;AAED,qBAAa,YAAa,SAAQ,KAAK;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,YAAa,SAAQ,WAAW;IACzC,QAAQ,EAAE,MAAM,CAA+B;IACtC,IAAI;;;MAGX;IACO,WAAW,SAAK;CAC5B;AAED,yBAAiB,YAAY,CAAC;IAC1B,UAAiB,IAAI,CAAC;QACX,MAAM,OAAO,eAAe,CAAC;QAC7B,MAAM,KAAK,cAAc,CAAC;QAC1B,MAAM,QAAQ,iBAAiB,CAAC;QAChC,MAAM,KAAK,cAAc,CAAC;QAC1B,MAAM,IAAI,aAAa,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC;QACxB,MAAM,SAAS,cAAc,CAAC;KACxC;CACJ;AAED,qBAAa,IAAK,SAAQ,aAAc,YAAW,eAAe;IAC9D,MAAM,CAAC,QAAQ,CAAC,gBAAgB,WAAgF;IAEhH,MAAM,EAAE,MAAM,CAAC;IACN,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC7D,IAAI;;;MAGX;CACL;AAED,qBAAa,YAAa,SAAQ,eAAgB,YAAW,QAAQ,EAAE,iBAAiB;IACpF,gBAAyB,gBAAgB,WAWvC;IAEF,IAAI,SAAM;IAEV,IAAI,aAAa,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,GAAG,SAAS,CAM/D;CACJ"}
1
+ {"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAClF,OAAO,EAIH,WAAW,EACX,aAAa,EAEb,KAAK,EAIL,eAAe,EAGf,QAAQ,EAGR,eAAe,EACf,aAAa,EAEb,aAAa,EACb,aAAa,EACb,iBAAiB,EAEpB,MAAM,sBAAsB,CAAC;AAE9B,qBAAa,QAAS,SAAQ,eAAgB,YAAW,QAAQ,EAAE,iBAAiB;IAChF,gBAAyB,gBAAgB,WAYvC;IACF,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,IAAI,aAAa,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,GAAG,SAAS,CAM/D;IAED,IAAI,IAAI,IAAI,MAAM,CAGjB;CACJ;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,IAAI,QAAQ,CAEtE;AAED,qBAAa,YAAa,SAAQ,KAAK;IACnC,WAAW,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,qBAAa,YAAa,SAAQ,WAAW;IACzC,QAAQ,EAAE,MAAM,CAA+B;IACtC,IAAI;;;MAGX;IACO,WAAW,SAAK;CAC5B;AAED,yBAAiB,YAAY,CAAC;IAC1B,UAAiB,IAAI,CAAC;QACX,MAAM,OAAO,gBAAgB,CAAC;QAC9B,MAAM,KAAK,cAAc,CAAC;QAC1B,MAAM,QAAQ,iBAAiB,CAAC;QAChC,MAAM,KAAK,cAAc,CAAC;QAC1B,MAAM,IAAI,aAAa,CAAC;QACxB,MAAM,IAAI,aAAa,CAAC;QACxB,MAAM,SAAS,cAAc,CAAC;KACxC;CACJ;AAED,qBAAa,IAAK,SAAQ,aAAc,YAAW,eAAe;IAC9D,MAAM,CAAC,QAAQ,CAAC,gBAAgB,WAAgF;IAEhH,MAAM,EAAE,MAAM,CAAC;IACN,aAAa,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC7D,IAAI;;;MAGX;CACL;AAED,qBAAa,YAAa,SAAQ,eAAgB,YAAW,QAAQ,EAAE,iBAAiB;IACpF,gBAAyB,gBAAgB,WAWvC;IAEF,IAAI,SAAM;IAEV,IAAI,aAAa,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,GAAG,SAAS,CAM/D;CACJ"}
package/lib/model.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CategoryNode = exports.Icon = exports.ActivityNode = exports.WeightedEdge = exports.isTaskNode = exports.TaskNode = void 0;
4
4
  /********************************************************************************
5
- * Copyright (c) 2020-2022 EclipseSource and others.
5
+ * Copyright (c) 2020-2023 EclipseSource and others.
6
6
  *
7
7
  * This program and the accompanying materials are made available under the
8
8
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -31,7 +31,6 @@ class TaskNode extends client_1.RectangularNode {
31
31
  return labelText ? labelText : '<unknown>';
32
32
  }
33
33
  }
34
- exports.TaskNode = TaskNode;
35
34
  TaskNode.DEFAULT_FEATURES = [
36
35
  client_1.connectableFeature,
37
36
  client_1.deletableFeature,
@@ -45,11 +44,12 @@ TaskNode.DEFAULT_FEATURES = [
45
44
  client_1.nameFeature,
46
45
  client_1.withEditLabelFeature
47
46
  ];
47
+ exports.TaskNode = TaskNode;
48
48
  function isTaskNode(element) {
49
49
  return element instanceof TaskNode || false;
50
50
  }
51
51
  exports.isTaskNode = isTaskNode;
52
- class WeightedEdge extends client_1.SEdge {
52
+ class WeightedEdge extends client_1.GEdge {
53
53
  }
54
54
  exports.WeightedEdge = WeightedEdge;
55
55
  class ActivityNode extends client_1.DiamondNode {
@@ -67,7 +67,7 @@ exports.ActivityNode = ActivityNode;
67
67
  (function (ActivityNode) {
68
68
  let Type;
69
69
  (function (Type) {
70
- Type.INITIAL = 'initalNode';
70
+ Type.INITIAL = 'initialNode';
71
71
  Type.FINAL = 'finalNode';
72
72
  Type.DECISION = 'decisionNode';
73
73
  Type.MERGE = 'mergeNode';
@@ -85,8 +85,8 @@ class Icon extends client_1.SShapeElement {
85
85
  };
86
86
  }
87
87
  }
88
- exports.Icon = Icon;
89
88
  Icon.DEFAULT_FEATURES = [client_1.boundsFeature, client_1.layoutContainerFeature, client_1.layoutableChildFeature, client_1.fadeFeature];
89
+ exports.Icon = Icon;
90
90
  class CategoryNode extends client_1.RectangularNode {
91
91
  constructor() {
92
92
  super(...arguments);
@@ -100,7 +100,6 @@ class CategoryNode extends client_1.RectangularNode {
100
100
  return undefined;
101
101
  }
102
102
  }
103
- exports.CategoryNode = CategoryNode;
104
103
  CategoryNode.DEFAULT_FEATURES = [
105
104
  client_1.deletableFeature,
106
105
  client_1.selectFeature,
@@ -113,4 +112,5 @@ CategoryNode.DEFAULT_FEATURES = [
113
112
  client_1.nameFeature,
114
113
  client_1.withEditLabelFeature
115
114
  ];
115
+ exports.CategoryNode = CategoryNode;
116
116
  //# sourceMappingURL=model.js.map
package/lib/model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAwB8B;AAE9B,MAAa,QAAS,SAAQ,wBAAe;IAkBzC,IAAI,aAAa;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;QAC9E,IAAI,KAAK,IAAI,IAAA,wBAAe,EAAC,KAAK,CAAC,EAAE;YACjC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,IAAI;;QACJ,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,aAAa,0CAAE,IAAI,CAAC;QAC3C,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/C,CAAC;;AA7BL,4BA8BC;AA7B4B,yBAAgB,GAAG;IACxC,2BAAkB;IAClB,yBAAgB;IAChB,sBAAa;IACb,sBAAa;IACb,oBAAW;IACX,+BAAsB;IACtB,oBAAW;IACX,6BAAoB;IACpB,qBAAY;IACZ,oBAAW;IACX,6BAAoB;CACvB,CAAC;AAmBN,SAAgB,UAAU,CAAC,OAAsB;IAC7C,OAAO,OAAO,YAAY,QAAQ,IAAI,KAAK,CAAC;AAChD,CAAC;AAFD,gCAEC;AAED,MAAa,YAAa,SAAQ,cAAK;CAEtC;AAFD,oCAEC;AAED,MAAa,YAAa,SAAQ,oBAAW;IAA7C;;QACI,aAAQ,GAAW,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC;QACtC,SAAI,GAAG;YACZ,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACb,CAAC;QACO,gBAAW,GAAG,CAAC,CAAC;IAC7B,CAAC;CAAA;AAPD,oCAOC;AAED,WAAiB,YAAY;IACzB,IAAiB,IAAI,CAQpB;IARD,WAAiB,IAAI;QACJ,YAAO,GAAG,YAAY,CAAC;QACvB,UAAK,GAAG,WAAW,CAAC;QACpB,aAAQ,GAAG,cAAc,CAAC;QAC1B,UAAK,GAAG,WAAW,CAAC;QACpB,SAAI,GAAG,UAAU,CAAC;QAClB,SAAI,GAAG,UAAU,CAAC;QAClB,cAAS,GAAG,WAAW,CAAC;IACzC,CAAC,EARgB,IAAI,GAAJ,iBAAI,KAAJ,iBAAI,QAQpB;AACL,CAAC,EAVgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAU5B;AAED,MAAa,IAAK,SAAQ,sBAAa;IAAvC;;QAKa,SAAI,GAAG;YACZ,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACb,CAAC;IACN,CAAC;;AATD,oBASC;AARmB,qBAAgB,GAAG,CAAC,sBAAa,EAAE,+BAAsB,EAAE,+BAAsB,EAAE,oBAAW,CAAC,CAAC;AAUpH,MAAa,YAAa,SAAQ,wBAAe;IAAjD;;QAcI,SAAI,GAAG,EAAE,CAAC;IASd,CAAC;IAPG,IAAI,aAAa;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;QAC9E,IAAI,KAAK,IAAI,IAAA,wBAAe,EAAC,KAAK,CAAC,EAAE;YACjC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;;AAtBL,oCAuBC;AAtB4B,6BAAgB,GAAG;IACxC,yBAAgB;IAChB,sBAAa;IACb,sBAAa;IACb,oBAAW;IACX,+BAAsB;IACtB,oBAAW;IACX,6BAAoB;IACpB,qBAAY;IACZ,oBAAW;IACX,6BAAoB;CACvB,CAAC"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;kFAckF;AAClF,iDAwB8B;AAE9B,MAAa,QAAS,SAAQ,wBAAe;IAkBzC,IAAI,aAAa;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;QAC9E,IAAI,KAAK,IAAI,IAAA,wBAAe,EAAC,KAAK,CAAC,EAAE;YACjC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,IAAI;;QACJ,MAAM,SAAS,GAAG,MAAA,IAAI,CAAC,aAAa,0CAAE,IAAI,CAAC;QAC3C,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC;IAC/C,CAAC;;AA5BwB,yBAAgB,GAAG;IACxC,2BAAkB;IAClB,yBAAgB;IAChB,sBAAa;IACb,sBAAa;IACb,oBAAW;IACX,+BAAsB;IACtB,oBAAW;IACX,6BAAoB;IACpB,qBAAY;IACZ,oBAAW;IACX,6BAAoB;CACvB,CAAC;AAbO,4BAAQ;AAgCrB,SAAgB,UAAU,CAAC,OAAsB;IAC7C,OAAO,OAAO,YAAY,QAAQ,IAAI,KAAK,CAAC;AAChD,CAAC;AAFD,gCAEC;AAED,MAAa,YAAa,SAAQ,cAAK;CAEtC;AAFD,oCAEC;AAED,MAAa,YAAa,SAAQ,oBAAW;IAA7C;;QACI,aAAQ,GAAW,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC;QACtC,SAAI,GAAG;YACZ,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACb,CAAC;QACO,gBAAW,GAAG,CAAC,CAAC;IAC7B,CAAC;CAAA;AAPD,oCAOC;AAED,WAAiB,YAAY;IACzB,IAAiB,IAAI,CAQpB;IARD,WAAiB,IAAI;QACJ,YAAO,GAAG,aAAa,CAAC;QACxB,UAAK,GAAG,WAAW,CAAC;QACpB,aAAQ,GAAG,cAAc,CAAC;QAC1B,UAAK,GAAG,WAAW,CAAC;QACpB,SAAI,GAAG,UAAU,CAAC;QAClB,SAAI,GAAG,UAAU,CAAC;QAClB,cAAS,GAAG,WAAW,CAAC;IACzC,CAAC,EARgB,IAAI,GAAJ,iBAAI,KAAJ,iBAAI,QAQpB;AACL,CAAC,EAVgB,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAU5B;AAED,MAAa,IAAK,SAAQ,sBAAa;IAAvC;;QAKa,SAAI,GAAG;YACZ,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACb,CAAC;IACN,CAAC;;AARmB,qBAAgB,GAAG,CAAC,sBAAa,EAAE,+BAAsB,EAAE,+BAAsB,EAAE,oBAAW,CAAC,AAA/E,CAAgF;AADvG,oBAAI;AAWjB,MAAa,YAAa,SAAQ,wBAAe;IAAjD;;QAcI,SAAI,GAAG,EAAE,CAAC;IASd,CAAC;IAPG,IAAI,aAAa;QACb,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;QAC9E,IAAI,KAAK,IAAI,IAAA,wBAAe,EAAC,KAAK,CAAC,EAAE;YACjC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;;AArBwB,6BAAgB,GAAG;IACxC,yBAAgB;IAChB,sBAAa;IACb,sBAAa;IACb,oBAAW;IACX,+BAAsB;IACtB,oBAAW;IACX,6BAAoB;IACpB,qBAAY;IACZ,oBAAW;IACX,6BAAoB;CACvB,AAXwC,CAWvC;AAZO,oCAAY"}
package/package.json CHANGED
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "name": "@eclipse-glsp-examples/workflow-glsp",
3
- "version": "1.1.0-next.7ff1b00.184+7ff1b00",
3
+ "version": "1.1.0-next.80bb01c.251+80bb01c",
4
4
  "description": "GLSP diagrams for the Workflow DSL",
5
- "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
6
5
  "keywords": [
7
6
  "glsp",
8
7
  "workflow",
9
8
  "diagram",
10
9
  "example"
11
10
  ],
12
- "author": {
13
- "name": "Eclipse GLSP"
14
- },
15
11
  "homepage": "https://www.eclipse.org/glsp/",
12
+ "bugs": "https://github.com/eclipse-glsp/glsp/issues",
16
13
  "repository": {
17
14
  "type": "git",
18
15
  "url": "https://github.com/eclipse-glsp/glsp-client.git"
19
16
  },
20
- "bugs": "https://github.com/eclipse-glsp/glsp/issues",
17
+ "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0)",
18
+ "author": {
19
+ "name": "Eclipse GLSP"
20
+ },
21
21
  "contributors": [
22
22
  {
23
23
  "name": "Eclipse GLSP Project",
@@ -25,20 +25,8 @@
25
25
  "url": "https://projects.eclipse.org/projects/ecd.glsp"
26
26
  }
27
27
  ],
28
- "dependencies": {
29
- "@eclipse-glsp/client": "1.1.0-next.7ff1b00.184+7ff1b00",
30
- "balloon-css": "^0.5.0"
31
- },
32
- "devDependencies": {
33
- "mvn-artifact-download": "5.1.0"
34
- },
35
- "scripts": {
36
- "prepare": "yarn clean && yarn build && yarn lint",
37
- "clean": "rimraf tsconfig.tsbuildinfo lib",
38
- "build": "tsc",
39
- "lint": "eslint -c ./.eslintrc.js --ext .ts,.tsx ./src",
40
- "watch": "tsc -w"
41
- },
28
+ "main": "lib/index",
29
+ "types": "lib/index",
42
30
  "files": [
43
31
  "lib",
44
32
  "src",
@@ -46,10 +34,23 @@
46
34
  "css",
47
35
  "scripts"
48
36
  ],
49
- "main": "lib/index",
50
- "types": "lib/index",
37
+ "scripts": {
38
+ "build": "tsc -b",
39
+ "clean": "rimraf tsconfig.tsbuildinfo lib",
40
+ "lint": "eslint --ext .ts,.tsx ./src",
41
+ "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
42
+ "prepare": "yarn clean && yarn build ",
43
+ "watch": "tsc -w"
44
+ },
45
+ "dependencies": {
46
+ "@eclipse-glsp/client": "1.1.0-next.80bb01c.251+80bb01c",
47
+ "balloon-css": "^0.5.0"
48
+ },
49
+ "devDependencies": {
50
+ "mvn-artifact-download": "5.1.0"
51
+ },
51
52
  "publishConfig": {
52
53
  "access": "public"
53
54
  },
54
- "gitHead": "7ff1b00a1575eb1979aa69e8e2873807883d9c6a"
55
+ "gitHead": "80bb01c5e0129da59b31c75395f9cead632c512b"
55
56
  }
package/src/di.config.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2019-2021 EclipseSource and others.
2
+ * Copyright (c) 2019-2023 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -14,28 +14,34 @@
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
16
  import {
17
- configureDefaultModelElements,
18
- configureModelElement,
19
17
  ConsoleLogger,
20
- createClientContainer,
18
+ ContainerConfiguration,
19
+ DefaultTypes,
21
20
  DeleteElementContextMenuItemProvider,
22
21
  DiamondNodeView,
23
- editLabelFeature,
22
+ GEdge,
23
+ glspAccessibilityModule,
24
+ GLSPGraph,
25
+ GLSPProjectionView,
24
26
  GridSnapper,
25
27
  LogLevel,
26
- overrideViewerOptions,
27
28
  RectangularNodeView,
28
29
  RevealNamedElementActionProvider,
29
30
  RoundedCornerNodeView,
30
31
  SCompartment,
31
32
  SCompartmentView,
32
- SEdge,
33
33
  SLabel,
34
34
  SLabelView,
35
35
  StructureCompartmentView,
36
- TYPES
36
+ TYPES,
37
+ bindAsService,
38
+ bindOrRebind,
39
+ configureDefaultModelElements,
40
+ configureModelElement,
41
+ editLabelFeature,
42
+ initializeDiagramContainer,
43
+ overrideViewerOptions
37
44
  } from '@eclipse-glsp/client';
38
- import { DefaultTypes } from '@eclipse-glsp/protocol';
39
45
  import 'balloon-css/balloon.min.css';
40
46
  import { Container, ContainerModule } from 'inversify';
41
47
  import 'sprotty/css/edit-label.css';
@@ -44,14 +50,15 @@ import { directTaskEditor } from './direct-task-editing/di.config';
44
50
  import { ActivityNode, CategoryNode, Icon, TaskNode, WeightedEdge } from './model';
45
51
  import { IconView, WorkflowEdgeView } from './workflow-views';
46
52
 
47
- const workflowDiagramModule = new ContainerModule((bind, unbind, isBound, rebind) => {
48
- rebind(TYPES.ILogger).to(ConsoleLogger).inSingletonScope();
49
- rebind(TYPES.LogLevel).toConstantValue(LogLevel.warn);
50
- bind(TYPES.ISnapper).to(GridSnapper);
51
- bind(TYPES.ICommandPaletteActionProvider).to(RevealNamedElementActionProvider);
52
- bind(TYPES.IContextMenuItemProvider).to(DeleteElementContextMenuItemProvider);
53
+ export const workflowDiagramModule = new ContainerModule((bind, unbind, isBound, rebind) => {
53
54
  const context = { bind, unbind, isBound, rebind };
54
55
 
56
+ bindOrRebind(context, TYPES.ILogger).to(ConsoleLogger).inSingletonScope();
57
+ bindOrRebind(context, TYPES.LogLevel).toConstantValue(LogLevel.warn);
58
+ bind(TYPES.ISnapper).to(GridSnapper);
59
+ bindAsService(context, TYPES.ICommandPaletteActionProvider, RevealNamedElementActionProvider);
60
+ bindAsService(context, TYPES.IContextMenuItemProvider, DeleteElementContextMenuItemProvider);
61
+
55
62
  configureDefaultModelElements(context);
56
63
  configureModelElement(context, 'task:automated', TaskNode, RoundedCornerNodeView);
57
64
  configureModelElement(context, 'task:manual', TaskNode, RoundedCornerNodeView);
@@ -59,20 +66,28 @@ const workflowDiagramModule = new ContainerModule((bind, unbind, isBound, rebind
59
66
  configureModelElement(context, 'comp:comp', SCompartment, SCompartmentView);
60
67
  configureModelElement(context, 'comp:header', SCompartment, SCompartmentView);
61
68
  configureModelElement(context, 'label:icon', SLabel, SLabelView);
62
- configureModelElement(context, DefaultTypes.EDGE, SEdge, WorkflowEdgeView);
69
+ configureModelElement(context, DefaultTypes.EDGE, GEdge, WorkflowEdgeView);
63
70
  configureModelElement(context, 'edge:weighted', WeightedEdge, WorkflowEdgeView);
64
71
  configureModelElement(context, 'icon', Icon, IconView);
65
72
  configureModelElement(context, 'activityNode:merge', ActivityNode, DiamondNodeView);
66
73
  configureModelElement(context, 'activityNode:decision', ActivityNode, DiamondNodeView);
67
74
  configureModelElement(context, 'activityNode:fork', ActivityNode, RectangularNodeView);
68
75
  configureModelElement(context, 'activityNode:join', ActivityNode, RectangularNodeView);
69
-
76
+ configureModelElement(context, DefaultTypes.GRAPH, GLSPGraph, GLSPProjectionView);
70
77
  configureModelElement(context, 'category', CategoryNode, RoundedCornerNodeView);
71
78
  configureModelElement(context, 'struct', SCompartment, StructureCompartmentView);
72
79
  });
73
80
 
74
- export default function createContainer(widgetId: string): Container {
75
- const container = createClientContainer(workflowDiagramModule, directTaskEditor);
81
+ export function createWorkflowDiagramContainer(widgetId: string, ...containerConfiguration: ContainerConfiguration): Container {
82
+ return initializeWorkflowDiagramContainer(new Container(), widgetId, ...containerConfiguration);
83
+ }
84
+
85
+ export function initializeWorkflowDiagramContainer(
86
+ container: Container,
87
+ widgetId: string,
88
+ ...containerConfiguration: ContainerConfiguration
89
+ ): Container {
90
+ initializeDiagramContainer(container, workflowDiagramModule, directTaskEditor, glspAccessibilityModule, ...containerConfiguration);
76
91
  overrideViewerOptions(container, {
77
92
  baseDiv: widgetId,
78
93
  hiddenDiv: widgetId + '_hidden'
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2020-2022 EclipseSource and others.
2
+ * Copyright (c) 2019-2023 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,11 +13,10 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import { TYPES } from '@eclipse-glsp/client';
16
+ import { bindAsService, TYPES } from '@eclipse-glsp/client';
17
17
  import { ContainerModule } from 'inversify';
18
18
  import { TaskEditor } from './direct-task-editor';
19
19
 
20
- export const directTaskEditor = new ContainerModule((bind, _unbind, isBound) => {
21
- bind(TaskEditor).toSelf().inSingletonScope();
22
- bind(TYPES.IUIExtension).toService(TaskEditor);
20
+ export const directTaskEditor = new ContainerModule((bind, _unbind, _isBound) => {
21
+ bindAsService(bind, TYPES.IUIExtension, TaskEditor);
23
22
  });
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2020-2022 EclipseSource and others.
2
+ * Copyright (c) 2020-2023 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -17,35 +17,35 @@ import {
17
17
  AbstractUIExtension,
18
18
  Action,
19
19
  AutoCompleteWidget,
20
+ DOMHelper,
20
21
  EditorContextService,
21
- getAbsoluteClientBounds,
22
22
  GLSPActionDispatcher,
23
- hasStringProp,
24
23
  ILogger,
25
24
  LabeledAction,
26
25
  ModelIndexImpl,
27
26
  Operation,
28
27
  RequestContextActions,
29
28
  RequestEditValidationAction,
29
+ SModelRoot,
30
30
  SetContextActions,
31
31
  SetEditValidationResultAction,
32
- SModelRoot,
33
- toActionArray,
34
32
  TYPES,
35
33
  ValidationDecorator,
36
34
  ValidationStatus,
37
- ViewerOptions
35
+ ViewerOptions,
36
+ getAbsoluteClientBounds,
37
+ hasStringProp,
38
+ toActionArray
38
39
  } from '@eclipse-glsp/client';
39
40
  import { inject, injectable } from 'inversify';
40
- import { DOMHelper } from 'sprotty/lib/base/views/dom-helper';
41
- import { isTaskNode, TaskNode } from '../model';
41
+ import { TaskNode, isTaskNode } from '../model';
42
42
 
43
43
  /**
44
44
  * Is send from the {@link TaskEditor} to the GLSP server
45
- * to execute a task edit operation.
45
+ * to update a feature from a specified task.
46
46
  */
47
- export interface ApplyTaskEditOperation extends Operation {
48
- kind: typeof ApplyTaskEditOperation.KIND;
47
+ export interface EditTaskOperation extends Operation {
48
+ kind: typeof EditTaskOperation.KIND;
49
49
 
50
50
  /**
51
51
  * Id of the task that should be edited
@@ -53,19 +53,29 @@ export interface ApplyTaskEditOperation extends Operation {
53
53
  taskId: string;
54
54
 
55
55
  /**
56
- * The edit expression
56
+ * The feature that is to be updated
57
57
  */
58
- expression: string;
58
+ feature: 'duration' | 'taskType';
59
+
60
+ /**
61
+ * The new feature value
62
+ */
63
+ value: string;
59
64
  }
60
65
 
61
- export namespace ApplyTaskEditOperation {
62
- export const KIND = 'applyTaskEdit';
66
+ export namespace EditTaskOperation {
67
+ export const KIND = 'editTask';
63
68
 
64
- export function is(object: any): object is ApplyTaskEditOperation {
65
- return Operation.hasKind(object, KIND) && hasStringProp(object, 'taskId') && hasStringProp(object, 'expression');
69
+ export function is(object: any): object is EditTaskOperation {
70
+ return (
71
+ Action.hasKind(object, KIND) &&
72
+ hasStringProp(object, 'taskId') &&
73
+ hasStringProp(object, 'feature') &&
74
+ hasStringProp(object, 'value')
75
+ );
66
76
  }
67
77
 
68
- export function create(options: { taskId: string; expression: string }): ApplyTaskEditOperation {
78
+ export function create(options: { taskId: string; feature: 'duration' | 'taskType'; value: string }): EditTaskOperation {
69
79
  return {
70
80
  kind: KIND,
71
81
  isOperation: true,
@@ -178,8 +188,17 @@ export class TaskEditor extends AbstractUIExtension {
178
188
  }
179
189
 
180
190
  protected executeFromTextOnlyInput(input: string): void {
181
- const action = ApplyTaskEditOperation.create({ taskId: this.task.id, expression: input });
182
- this.actionDispatcher.dispatch(action);
191
+ if (input.startsWith('duration:')) {
192
+ const value = input.substring('duration:'.length);
193
+ const action = EditTaskOperation.create({ taskId: this.task.id, feature: 'duration', value });
194
+ this.actionDispatcher.dispatch(action);
195
+ } else if (input.startsWith('taskType:')) {
196
+ const value = input.substring('taskType:'.length);
197
+ const action = EditTaskOperation.create({ taskId: this.task.id, feature: 'taskType', value });
198
+ this.actionDispatcher.dispatch(action);
199
+ } else {
200
+ throw new Error('Unsupported Task Editing: ' + input);
201
+ }
183
202
  }
184
203
 
185
204
  override hide(): void {
package/src/index.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2019-2021 EclipseSource and others.
2
+ * Copyright (c) 2019-2023 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,9 +13,7 @@
13
13
  *
14
14
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  ********************************************************************************/
16
- import createWorkflowDiagramContainer from './di.config';
17
-
16
+ export * from './di.config';
17
+ export * from './direct-task-editing/direct-task-editor';
18
18
  export * from './model';
19
19
  export * from './workflow-views';
20
- export * from './direct-task-editing/direct-task-editor';
21
- export { createWorkflowDiagramContainer };
package/src/model.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /********************************************************************************
2
- * Copyright (c) 2020-2022 EclipseSource and others.
2
+ * Copyright (c) 2020-2023 EclipseSource and others.
3
3
  *
4
4
  * This program and the accompanying materials are made available under the
5
5
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -20,6 +20,7 @@ import {
20
20
  DiamondNode,
21
21
  EditableLabel,
22
22
  fadeFeature,
23
+ GEdge,
23
24
  hoverFeedbackFeature,
24
25
  isEditableLabel,
25
26
  layoutableChildFeature,
@@ -31,7 +32,6 @@ import {
31
32
  popupFeature,
32
33
  RectangularNode,
33
34
  SChildElement,
34
- SEdge,
35
35
  selectFeature,
36
36
  SModelElement,
37
37
  SShapeElement,
@@ -75,7 +75,7 @@ export function isTaskNode(element: SModelElement): element is TaskNode {
75
75
  return element instanceof TaskNode || false;
76
76
  }
77
77
 
78
- export class WeightedEdge extends SEdge {
78
+ export class WeightedEdge extends GEdge {
79
79
  probability?: string;
80
80
  }
81
81
 
@@ -90,7 +90,7 @@ export class ActivityNode extends DiamondNode {
90
90
 
91
91
  export namespace ActivityNode {
92
92
  export namespace Type {
93
- export const INITIAL = 'initalNode';
93
+ export const INITIAL = 'initialNode';
94
94
  export const FINAL = 'finalNode';
95
95
  export const DECISION = 'decisionNode';
96
96
  export const MERGE = 'mergeNode';
@@ -1,37 +0,0 @@
1
- /********************************************************************************
2
- * Copyright (c) 2020-2021 EclipseSource and others.
3
- *
4
- * This program and the accompanying materials are made available under the
5
- * terms of the Eclipse Public License v. 2.0 which is available at
6
- * http://www.eclipse.org/legal/epl-2.0.
7
- *
8
- * This Source Code may also be made available under the following Secondary
9
- * Licenses when the conditions for such availability set forth in the Eclipse
10
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
- * with the GNU Classpath Exception which is available at
12
- * https://www.gnu.org/software/classpath/license.html.
13
- *
14
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
- ********************************************************************************/
16
- import download from 'mvn-artifact-download';
17
- import { join, resolve } from 'path';
18
-
19
- const downloadDir = resolve(join(__dirname)) + '/../../..';
20
- const mavenRepository = 'https://repo1.maven.org/maven2/';
21
- const groupId = 'org.eclipse.glsp.example';
22
- const artifactId = 'org.eclipse.glsp.example.workflow';
23
- const version = '1.0.0';
24
- const classifier = 'glsp';
25
-
26
- console.log('Downloading latest version of the Workflow Example Java Server from the maven repository...');
27
- const isSnapShot = false;
28
- download({ groupId, artifactId, version, classifier, isSnapShot }, downloadDir, mavenRepository).then(() =>
29
- console.log(
30
- 'Download completed. Start the server using this command: \njava -jar org.eclipse.glsp.example.workflow-' +
31
- version +
32
- `${isSnapShot ? '-SNAPSHOT' : ''}` +
33
- '-glsp.jar org.eclipse.glsp.example.workflow.launch.ExampleServerLauncher --port=8081 --websocket\n\n' +
34
- 'After starting the server, access the following file locally in your browser to see the running example:\n' +
35
- './examples/workflow-standalone/app/diagram.html'
36
- )
37
- );