eclipse-glsp · tortmayr · Apr 26, 2022 · Apr 25, 2022
diff --git a/examples/workflow-server/src/handler/create-activity-node-handler.ts b/examples/workflow-server/src/handler/create-activity-node-handler.ts
@@ -13,19 +13,19 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Args, GModelState, GNode, Point } from '@eclipse-glsp/server-node';
+import { CreateNodeOperation, GNode, ModelState, Point } from '@eclipse-glsp/server-node';
 import { injectable } from 'inversify';
 import { ActivityNode, ActivityNodeBuilder } from '../graph-extension';
 import { ModelTypes } from '../util/model-types';
 import { CreateWorkflowNodeOperationHandler } from './create-workflow-node-operation-handler';
 
 @injectable()
 export abstract class CreateActivityNodeHandler extends CreateWorkflowNodeOperationHandler {
-    createNode(relativeLocation: Point | undefined, args: Args | undefined): GNode | undefined {
+    createNode(operation: CreateNodeOperation, relativeLocation?: Point): GNode | undefined {
         return this.builder(relativeLocation, this.modelState).build();
     }
 
-    protected builder(point: Point | undefined, modelState: GModelState): ActivityNodeBuilder {
+    protected builder(point: Point | undefined, modelState: ModelState): ActivityNodeBuilder {
         return ActivityNode.builder()
             .position(point ?? Point.ORIGIN)
             .type(this.elementTypeIds[0])

diff --git a/examples/workflow-server/src/handler/create-automated-task-handler.ts b/examples/workflow-server/src/handler/create-automated-task-handler.ts
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GModelState, Point } from '@eclipse-glsp/server-node';
+import { ModelState, Point } from '@eclipse-glsp/server-node';
 import { injectable } from 'inversify';
 import { TaskNodeBuilder } from '../graph-extension';
 import { ModelTypes } from '../util/model-types';
@@ -24,7 +24,7 @@ export class CreateAutomatedTaskHandler extends CreateTaskHandler {
     elementTypeIds = [ModelTypes.AUTOMATED_TASK];
     label = 'Automated Task';
 
-    protected override builder(point: Point | undefined, modelState: GModelState): TaskNodeBuilder {
+    protected override builder(point: Point | undefined, modelState: ModelState): TaskNodeBuilder {
         return super.builder(point, modelState).addCssClass('automated');
     }
 }
diff --git a/examples/workflow-server/src/handler/create-category-handler.ts b/examples/workflow-server/src/handler/create-category-handler.ts
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Args, ArgsUtil, GModelState, GNode, Point } from '@eclipse-glsp/server-node';
+import { ArgsUtil, CreateNodeOperation, GNode, ModelState, Point } from '@eclipse-glsp/server-node';
 import { Category, CategoryNodeBuilder } from '../graph-extension';
 import { ModelTypes } from '../util/model-types';
 import { CreateWorkflowNodeOperationHandler } from './create-workflow-node-operation-handler';
@@ -22,11 +22,11 @@ export class CreateCategoryHandler extends CreateWorkflowNodeOperationHandler {
     elementTypeIds = [ModelTypes.CATEGORY];
     label = 'Category';
 
-    createNode(relativeLocation: Point | undefined, args: Args | undefined): GNode | undefined {
+    createNode(operation: CreateNodeOperation, relativeLocation?: Point): GNode | undefined {
         return this.builder(relativeLocation, this.modelState).build();
     }
 
-    protected builder(point: Point | undefined, modelState: GModelState): CategoryNodeBuilder {
+    protected builder(point: Point | undefined, modelState: ModelState): CategoryNodeBuilder {
         return Category.builder()
             .type(this.elementTypeIds[0])
             .position(point ?? Point.ORIGIN)

diff --git a/examples/workflow-server/src/handler/create-decision-node-handler.ts b/examples/workflow-server/src/handler/create-decision-node-handler.ts
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GModelState, Point } from '@eclipse-glsp/server-node';
+import { ModelState, Point } from '@eclipse-glsp/server-node';
 import { injectable } from 'inversify';
 import { ActivityNodeBuilder } from '../graph-extension';
 import { ModelTypes } from '../util/model-types';
@@ -24,7 +24,7 @@ export class CreateDecisionNodeHandler extends CreateActivityNodeHandler {
     elementTypeIds = [ModelTypes.DECISION_NODE];
     label = 'Decision Node';
 
-    protected override builder(point: Point | undefined, modelState: GModelState): ActivityNodeBuilder {
+    protected override builder(point: Point | undefined, modelState: ModelState): ActivityNodeBuilder {
         return super.builder(point, modelState).addCssClass('decision');
     }
 }
diff --git a/examples/workflow-server/src/handler/create-edge-handler.ts b/examples/workflow-server/src/handler/create-edge-handler.ts
@@ -13,13 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { CreateEdgeOperationHandler, DefaultTypes, GEdge, GEdgeBuilder, GModelElement, GModelState } from '@eclipse-glsp/server-node';
+import { DefaultTypes, GEdge, GEdgeBuilder, GModelCreateEdgeOperationHandler, GModelElement } from '@eclipse-glsp/server-node';
 
-export class CreateEdgeHandler extends CreateEdgeOperationHandler {
+export class CreateEdgeHandler extends GModelCreateEdgeOperationHandler {
     label = 'Edge';
     elementTypeIds = [DefaultTypes.EDGE];
 
-    createEdge(source: GModelElement, target: GModelElement, modelState: GModelState): GEdge | undefined {
+    createEdge(source: GModelElement, target: GModelElement): GEdge | undefined {
         return new GEdgeBuilder(GEdge).sourceId(source.id).targetId(target.id).build();
     }
 }
diff --git a/examples/workflow-server/src/handler/create-fork-or-join-node-handler.ts b/examples/workflow-server/src/handler/create-fork-or-join-node-handler.ts
@@ -13,14 +13,14 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GModelState, Point } from '@eclipse-glsp/server-node';
+import { ModelState, Point } from '@eclipse-glsp/server-node';
 import { injectable } from 'inversify';
 import { ActivityNodeBuilder } from '../graph-extension';
 import { CreateActivityNodeHandler } from './create-activity-node-handler';
 
 @injectable()
 export abstract class CreateForkOrJoinNodeHandler extends CreateActivityNodeHandler {
-    protected override builder(point: Point | undefined, modelState: GModelState): ActivityNodeBuilder {
+    protected override builder(point: Point | undefined, modelState: ModelState): ActivityNodeBuilder {
         return super.builder(point, modelState).addCssClass('forkOrJoin').size(10, 50);
     }
 }
diff --git a/examples/workflow-server/src/handler/create-manual-task-handler.ts b/examples/workflow-server/src/handler/create-manual-task-handler.ts
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GModelState, Point } from '@eclipse-glsp/server-node';
+import { ModelState, Point } from '@eclipse-glsp/server-node';
 import { injectable } from 'inversify';
 import { TaskNodeBuilder } from '../graph-extension';
 import { ModelTypes } from '../util/model-types';
@@ -24,7 +24,7 @@ export class CreateManualTaskHandler extends CreateTaskHandler {
     elementTypeIds = [ModelTypes.MANUAL_TASK];
     label = 'Manual Task';
 
-    protected override builder(point: Point | undefined, modelState: GModelState): TaskNodeBuilder {
+    protected override builder(point: Point | undefined, modelState: ModelState): TaskNodeBuilder {
         return super.builder(point, modelState).addCssClass('manual');
     }
 }
diff --git a/examples/workflow-server/src/handler/create-merge-node-handler.ts b/examples/workflow-server/src/handler/create-merge-node-handler.ts
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { GModelState, Point } from '@eclipse-glsp/server-node';
+import { ModelState, Point } from '@eclipse-glsp/server-node';
 import { injectable } from 'inversify';
 import { ActivityNodeBuilder } from '../graph-extension';
 import { ModelTypes } from '../util/model-types';
@@ -24,7 +24,7 @@ export class CreateMergeNodeHandler extends CreateActivityNodeHandler {
     elementTypeIds = [ModelTypes.MERGE_NODE];
     label = 'Merge Node';
 
-    protected override builder(point: Point | undefined, modelState: GModelState): ActivityNodeBuilder {
+    protected override builder(point: Point | undefined, modelState: ModelState): ActivityNodeBuilder {
         return super.builder(point, modelState).addCssClass('merge');
     }
 }
diff --git a/examples/workflow-server/src/handler/create-task-handler.ts b/examples/workflow-server/src/handler/create-task-handler.ts
@@ -13,20 +13,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { Args, Point } from '@eclipse-glsp/protocol';
-import { GModelState, GNode } from '@eclipse-glsp/server-node';
+import { Point } from '@eclipse-glsp/protocol';
+import { CreateNodeOperation, GNode, ModelState } from '@eclipse-glsp/server-node';
 import { injectable } from 'inversify';
 import { TaskNode, TaskNodeBuilder } from '../graph-extension';
 import { ModelTypes } from '../util/model-types';
 import { CreateWorkflowNodeOperationHandler } from './create-workflow-node-operation-handler';
 
 @injectable()
 export abstract class CreateTaskHandler extends CreateWorkflowNodeOperationHandler {
-    createNode(relativeLocation: Point | undefined, args: Args | undefined): GNode | undefined {
+    createNode(operation: CreateNodeOperation, relativeLocation?: Point): GNode | undefined {
         return this.builder(relativeLocation, this.modelState).build();
     }
 
-    protected builder(point: Point | undefined, modelState: GModelState): TaskNodeBuilder {
+    protected builder(point: Point | undefined, modelState: ModelState): TaskNodeBuilder {
         return TaskNode.builder()
             .position(point ?? Point.ORIGIN)
             .addCssClass('task')

diff --git a/examples/workflow-server/src/handler/create-weighted-edge-handler.ts b/examples/workflow-server/src/handler/create-weighted-edge-handler.ts
@@ -13,15 +13,15 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { CreateEdgeOperationHandler, GEdge, GModelElement, GModelState } from '@eclipse-glsp/server-node';
+import { GEdge, GModelCreateEdgeOperationHandler, GModelElement } from '@eclipse-glsp/server-node';
 import { WeightedEdge } from '../graph-extension';
 import { ModelTypes } from '../util/model-types';
 
-export class CreateWeightedEdgeHandler extends CreateEdgeOperationHandler {
+export class CreateWeightedEdgeHandler extends GModelCreateEdgeOperationHandler {
     elementTypeIds = [ModelTypes.WEIGHTED_EDGE];
     label = 'Weighted edge';
 
-    createEdge(source: GModelElement, target: GModelElement, modelState: GModelState): GEdge | undefined {
+    createEdge(source: GModelElement, target: GModelElement): GEdge | undefined {
         return WeightedEdge.builder().sourceId(source.id).targetId(target.id).probability('medium').addCssClass('medium').build();
     }
 }
diff --git a/examples/workflow-server/src/handler/create-workflow-node-operation-handler.ts b/examples/workflow-server/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);

diff --git a/examples/workflow-server/src/labeledit/workflow-label-edit-validator.ts b/examples/workflow-server/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) {

diff --git a/examples/workflow-server/src/marker/workflow-model-validator.ts b/examples/workflow-server/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[] = [];

diff --git a/examples/workflow-server/src/model/workflow-navigation-target-resolver.ts b/examples/workflow-server/src/model/workflow-navigation-target-resolver.ts
@@ -14,16 +14,16 @@
  * 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';
 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']) {

diff --git a/...ples/workflow-server/src/provider/abstract-next-or-previous-navigation-target-provider.ts b/...ples/workflow-server/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;

diff --git a/examples/workflow-server/src/provider/node-documentation-navigation-target-provider.ts b/examples/workflow-server/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) {

diff --git a/examples/workflow-server/src/provider/workflow-command-palette-action-provider.ts b/examples/workflow-server/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[] = [];

diff --git a/examples/workflow-server/src/provider/workflow-context-menu-item-provider.ts b/examples/workflow-server/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) {

diff --git a/packages/server-node/src/base-impl/gmodel-state.ts b/packages/server-node/src/base-impl/gmodel-state.ts