@eclipse-glsp-examples/workflow-server 0.9.0-next.a3fa8d1.14 → 0.9.0-next.b178eb2.24

package/src/handler/create-workflow-node-operation-handler.ts

@@ -15,10 +15,10 @@
  ********************************************************************************/
 import {
     CreateNodeOperation,
-    CreateNodeOperationHandler,
     GCompartment,
+    GModelCreateNodeOperationHandler,
     GModelElement,
-    GModelState,
+    ModelState,
     Point
 } from '@eclipse-glsp/server-node';
 import { inject, injectable } from 'inversify';
@@ -27,9 +27,9 @@ import { ModelTypes } from '../util/model-types';
 import { GridSnapper } from './grid-snapper';
 
 @injectable()
-export abstract class CreateWorkflowNodeOperationHandler extends CreateNodeOperationHandler {
-    @inject(GModelState)
-    protected override modelState: GModelState;
+export abstract class CreateWorkflowNodeOperationHandler extends GModelCreateNodeOperationHandler {
+    @inject(ModelState)
+    protected override modelState: ModelState;
 
     override getLocation(operation: CreateNodeOperation): Point | undefined {
         return GridSnapper.snap(operation.location);

package/src/labeledit/workflow-label-edit-validator.ts

@@ -13,14 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GModelElement, GModelState, LabelEditValidator, ValidationStatus } from '@eclipse-glsp/server-node';
+import { GModelElement, LabelEditValidator, ModelState, ValidationStatus } from '@eclipse-glsp/server-node';
 import { inject, injectable } from 'inversify';
 import { TaskNode } from '../graph-extension';
 
 @injectable()
 export class WorkflowLabelEditValidator implements LabelEditValidator {
-    @inject(GModelState)
-    protected modelState: GModelState;
+    @inject(ModelState)
+    protected modelState: ModelState;
 
     validate(label: string, element: GModelElement): ValidationStatus {
         if (label.length < 1) {

package/src/marker/workflow-model-validator.ts

@@ -13,14 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GModelElement, Marker, ModelValidator, GModelState, MarkerKind, GCompartment, GLabel } from '@eclipse-glsp/server-node';
+import { GCompartment, GLabel, GModelElement, Marker, MarkerKind, ModelState, ModelValidator } from '@eclipse-glsp/server-node';
 import { inject, injectable } from 'inversify';
 import { ActivityNode, TaskNode } from '../graph-extension';
 
 @injectable()
 export class WorkflowModelValidator implements ModelValidator {
-    @inject(GModelState)
-    protected readonly modelState: GModelState;
+    @inject(ModelState)
+    protected readonly modelState: ModelState;
 
     validate(elements: GModelElement[]): Marker[] {
         const markers: Marker[] = [];

package/src/model/workflow-navigation-target-resolver.ts

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { NavigationTarget } from '@eclipse-glsp/protocol';
-import { GModelState } from '@eclipse-glsp/server-node';
+import { ModelState } from '@eclipse-glsp/server-node';
 import { NavigationTargetResolution } from '@eclipse-glsp/server-node/lib/features/navigation/navigation-target-resolution';
 import { NavigationTargetResolver } from '@eclipse-glsp/server-node/lib/features/navigation/navigation-target-resolver';
 import { inject, injectable } from 'inversify';
@@ -22,8 +22,8 @@ import { TaskNode } from '../graph-extension';
 
 @injectable()
 export class WorkflowNavigationTargetResolver extends NavigationTargetResolver {
-    @inject(GModelState)
-    protected readonly modelState: GModelState;
+    @inject(ModelState)
+    protected readonly modelState: ModelState;
 
     async resolve(navigationTarget: NavigationTarget): Promise<NavigationTargetResolution> {
         if (navigationTarget.args && navigationTarget.args['name']) {

package/src/provider/abstract-next-or-previous-navigation-target-provider.ts

@@ -14,17 +14,17 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { Args, EditorContext, NavigationTarget } from '@eclipse-glsp/protocol';
+import { GEdge, ModelState } from '@eclipse-glsp/server-node';
 import { NavigationTargetProvider } from '@eclipse-glsp/server-node/lib/features/navigation/navigation-target-provider';
 import { inject, injectable } from 'inversify';
-import { GEdge, GModelState } from '@eclipse-glsp/server-node';
 import { TaskNode } from '../graph-extension';
 
 @injectable()
 export abstract class AbstractNextOrPreviousNavigationTargetProvider implements NavigationTargetProvider {
     abstract targetTypeId: string;
 
-    @inject(GModelState)
-    protected readonly modelState: GModelState;
+    @inject(ModelState)
+    protected readonly modelState: ModelState;
 
     getTargets(editorContext: EditorContext): NavigationTarget[] {
         const sourceUri = this.modelState.sourceUri;

package/src/provider/node-documentation-navigation-target-provider.ts

@@ -14,18 +14,18 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import { Args, EditorContext, NavigationTarget } from '@eclipse-glsp/protocol';
-import { GModelState } from '@eclipse-glsp/server-node';
+import { ModelState } from '@eclipse-glsp/server-node';
+import { JsonOpenerOptions } from '@eclipse-glsp/server-node/lib/features/navigation/json-opener-options';
 import { NavigationTargetProvider } from '@eclipse-glsp/server-node/lib/features/navigation/navigation-target-provider';
 import { inject, injectable } from 'inversify';
 import { TaskNode } from '../graph-extension';
-import { JsonOpenerOptions } from '@eclipse-glsp/server-node/lib/features/navigation/json-opener-options';
 
 @injectable()
 export class NodeDocumentationNavigationTargetProvider implements NavigationTargetProvider {
     targetTypeId = 'documentation';
 
-    @inject(GModelState)
-    protected readonly modelState: GModelState;
+    @inject(ModelState)
+    protected readonly modelState: ModelState;
 
     getTargets(editorContext: EditorContext): NavigationTarget[] {
         if (editorContext.selectedElementIds.length === 1) {

package/src/provider/workflow-command-palette-action-provider.ts

@@ -21,9 +21,9 @@ import {
     DefaultTypes,
     DeleteElementOperation,
     GModelElement,
-    GModelState,
     GNode,
     LabeledAction,
+    ModelState,
     Point
 } from '@eclipse-glsp/server-node';
 import { inject, injectable } from 'inversify';
@@ -32,8 +32,8 @@ import { ModelTypes } from '../util/model-types';
 
 @injectable()
 export class WorkflowCommandPaletteActionProvider extends CommandPaletteActionProvider {
-    @inject(GModelState)
-    protected override modelState: GModelState;
+    @inject(ModelState)
+    protected override modelState: ModelState;
 
     getPaletteActions(selectedElementIds: string[], selectedElements: GModelElement[], position: Point, args?: Args): LabeledAction[] {
         const actions: LabeledAction[] = [];

package/src/provider/workflow-context-menu-item-provider.ts

@@ -13,15 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Args, ContextMenuItemProvider, CreateNodeOperation, GModelState, MenuItem, Point } from '@eclipse-glsp/server-node';
+import { Args, ContextMenuItemProvider, CreateNodeOperation, MenuItem, ModelState, Point } from '@eclipse-glsp/server-node';
 import { inject, injectable } from 'inversify';
 import { GridSnapper } from '../handler/grid-snapper';
 import { ModelTypes } from '../util/model-types';
 
 @injectable()
 export class WorkflowContextMenuItemProvider extends ContextMenuItemProvider {
-    @inject(GModelState)
-    protected modelState: GModelState;
+    @inject(ModelState)
+    protected modelState: ModelState;
 
     getItems(selectedElementIds: string[], position: Point, args?: Args): MenuItem[] {
         if (this.modelState.isReadonly || selectedElementIds.length !== 0) {

package/src/workflow-diagram-module.ts

@@ -14,25 +14,23 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import {
-    ClassMultiBinding,
     CommandPaletteActionProvider,
     ContextMenuItemProvider,
-    DefaultToolPaletteItemProvider,
     DiagramConfiguration,
     GLSPServer,
     GModelDiagramModule,
     InstanceMultiBinding,
-    JsonRpcGLSPServer,
     LabelEditValidator,
     ModelValidator,
+    MultiBinding,
     NavigationTargetProvider,
     NavigationTargetResolver,
     OperationHandlerConstructor,
     PopupModelFactory,
-    ServerModule,
-    ToolPaletteItemProvider
+    ServerModule
 } from '@eclipse-glsp/server-node';
-import { injectable, interfaces } from 'inversify';
+import { BindingTarget } from '@eclipse-glsp/server-node/lib/di/binding-target';
+import { injectable } from 'inversify';
 import { CreateAutomatedTaskHandler } from './handler/create-automated-task-handler';
 import { CreateCategoryHandler } from './handler/create-category-handler';
 import { CreateDecisionNodeHandler } from './handler/create-decision-node-handler';
@@ -56,11 +54,8 @@ import { WorkflowPopupFactory } from './workflow-popup-factory';
 
 @injectable()
 export class WorkflowServerModule extends ServerModule {
-    override configure(bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind): void {
-        super.configure(bind, unbind, isBound, rebind);
-        bind(WorkflowGLSPServer).toSelf().inSingletonScope();
-        rebind(GLSPServer).toService(WorkflowGLSPServer);
-        rebind(JsonRpcGLSPServer).toService(WorkflowGLSPServer);
+    protected override bindGLSPServer(): BindingTarget<GLSPServer> {
+        return WorkflowGLSPServer;
     }
 }
 
@@ -70,23 +65,6 @@ export class WorkflowDiagramModule extends GModelDiagramModule {
         return 'workflow-diagram';
     }
 
-    protected override configure(
-        bind: interfaces.Bind,
-        unbind: interfaces.Unbind,
-        isBound: interfaces.IsBound,
-        rebind: interfaces.Rebind
-    ): void {
-        super.configure(bind, unbind, isBound, rebind);
-        bind(DiagramConfiguration).to(WorkflowDiagramConfiguration).inSingletonScope();
-        bind(NavigationTargetResolver).to(WorkflowNavigationTargetResolver).inSingletonScope();
-        bind(ContextMenuItemProvider).to(WorkflowContextMenuItemProvider).inSingletonScope();
-        bind(CommandPaletteActionProvider).to(WorkflowCommandPaletteActionProvider).inSingletonScope();
-        bind(LabelEditValidator).to(WorkflowLabelEditValidator).inSingletonScope();
-        bind(PopupModelFactory).to(WorkflowPopupFactory).inSingletonScope();
-        bind(ModelValidator).to(WorkflowModelValidator).inSingletonScope();
-        bind(ToolPaletteItemProvider).to(DefaultToolPaletteItemProvider).inSingletonScope();
-    }
-
     protected override configureOperationHandlers(binding: InstanceMultiBinding<OperationHandlerConstructor>): void {
         super.configureOperationHandlers(binding);
         binding.add(CreateAutomatedTaskHandler);
@@ -100,7 +78,35 @@ export class WorkflowDiagramModule extends GModelDiagramModule {
         binding.add(CreateCategoryHandler);
     }
 
-    protected override configureNavigationTargetProviders(binding: ClassMultiBinding<NavigationTargetProvider>): void {
+    protected bindDiagramConfiguration(): BindingTarget<DiagramConfiguration> {
+        return WorkflowDiagramConfiguration;
+    }
+
+    protected override bindNavigationTargetResolver(): BindingTarget<NavigationTargetResolver> | undefined {
+        return WorkflowNavigationTargetResolver;
+    }
+
+    protected override bindContextMenuItemProvider(): BindingTarget<ContextMenuItemProvider> | undefined {
+        return WorkflowContextMenuItemProvider;
+    }
+
+    protected override bindCommandPaletteActionProvider(): BindingTarget<CommandPaletteActionProvider> | undefined {
+        return WorkflowCommandPaletteActionProvider;
+    }
+
+    protected override bindLabelEditValidator(): BindingTarget<LabelEditValidator> | undefined {
+        return WorkflowLabelEditValidator;
+    }
+
+    protected override bindPopupModelFactory(): BindingTarget<PopupModelFactory> | undefined {
+        return WorkflowPopupFactory;
+    }
+
+    protected override bindModelValidator(): BindingTarget<ModelValidator> | undefined {
+        return WorkflowModelValidator;
+    }
+
+    protected override configureNavigationTargetProviders(binding: MultiBinding<NavigationTargetProvider>): void {
         super.configureNavigationTargetProviders(binding);
         binding.add(NextNodeNavigationTargetProvider);
         binding.add(PreviousNodeNavigationTargetProvider);