@eclipse-glsp/client 0.9.0-next.d9bed812 → 0.9.0-next.e99d24cc

package/src/features/tools/change-bounds-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,10 +13,18 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable, optional } from "inversify";
 import {
     Action,
     Bounds,
+    ChangeBoundsOperation,
+    ChangeRoutingPointsOperation,
+    CompoundOperation,
+    ElementAndRoutingPoints,
+    Operation,
+    Point
+} from '@eclipse-glsp/protocol';
+import { inject, injectable, optional } from 'inversify';
+import {
     BoundsAware,
     Dimension,
     EdgeRouterRegistry,
@@ -26,45 +34,37 @@ import {
     isSelected,
     isViewport,
     MouseListener,
-    Point,
+    SChildElement,
     SConnectableElement,
     SetBoundsAction,
     SModelElement,
     SModelRoot,
     SParentElement,
     TYPES
-} from "sprotty";
-
-import { DragAwareMouseListener } from "../../base/drag-aware-mouse-listener";
-import {
-    ChangeBoundsOperation,
-    ChangeRoutingPointsOperation,
-    CompoundOperation,
-    ElementAndRoutingPoints,
-    Operation
-} from "../../base/operations/operation";
-import { GLSP_TYPES } from "../../base/types";
-import { isValidMove, isValidSize, WriteablePoint } from "../../utils/layout-utils";
+} from 'sprotty';
+import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
+import { GLSP_TYPES } from '../../base/types';
+import { isValidMove, isValidSize, WriteablePoint } from '../../utils/layout-utils';
 import {
     forEachElement,
     isNonRoutableSelectedMovableBoundsAware,
     toElementAndBounds,
     toElementAndRoutingPoints
-} from "../../utils/smodel-util";
-import { isBoundsAwareMoveable, isResizable, Resizable, ResizeHandleLocation, SResizeHandle } from "../change-bounds/model";
+} from '../../utils/smodel-util';
+import { isBoundsAwareMoveable, isResizable, Resizable, ResizeHandleLocation, SResizeHandle } from '../change-bounds/model';
 import {
     createMovementRestrictionFeedback,
     IMovementRestrictor,
     removeMovementRestrictionFeedback
-} from "../change-bounds/movement-restrictor";
-import { SelectionListener, SelectionService } from "../select/selection-service";
+} from '../change-bounds/movement-restrictor';
+import { SelectionListener, SelectionService } from '../select/selection-service';
 import {
     FeedbackMoveMouseListener,
     HideChangeBoundsToolResizeFeedbackAction,
     ShowChangeBoundsToolResizeFeedbackAction
-} from "../tool-feedback/change-bounds-tool-feedback";
-import { applyCssClasses, CursorCSS, cursorFeedbackAction, deleteCssClasses } from "../tool-feedback/css-feedback";
-import { BaseGLSPTool } from "./base-glsp-tool";
+} from '../tool-feedback/change-bounds-tool-feedback';
+import { applyCssClasses, CursorCSS, cursorFeedbackAction, deleteCssClasses } from '../tool-feedback/css-feedback';
+import { BaseGLSPTool } from './base-glsp-tool';
 
 /**
  * The change bounds tool has the license to move multiple elements or resize a single element by implementing the ChangeBounds operation.
@@ -76,12 +76,12 @@ import { BaseGLSPTool } from "./base-glsp-tool";
  * | Move      | MoveAction       | ChangeBoundsOperationAction
  * | Resize    | SetBoundsAction  | ChangeBoundsOperationAction
  *
- * To provide a visual client updates during move we install the `FeedbackMoveMouseListener` and to provide visual client updates during resize
- * and send the server updates we install the `ChangeBoundsListener`.
+ * To provide a visual client updates during move we install the `FeedbackMoveMouseListener` and to provide visual client updates during
+ * resize and send the server updates we install the `ChangeBoundsListener`.
  */
 @injectable()
 export class ChangeBoundsTool extends BaseGLSPTool {
-    static ID = "glsp.change-bounds-tool";
+    static ID = 'glsp.change-bounds-tool';
 
     @inject(GLSP_TYPES.SelectionService) protected selectionService: SelectionService;
     @inject(EdgeRouterRegistry) @optional() readonly edgeRouterRegistry?: EdgeRouterRegistry;
@@ -94,7 +94,7 @@ export class ChangeBoundsTool extends BaseGLSPTool {
         return ChangeBoundsTool.ID;
     }
 
-    enable() {
+    enable(): void {
         // install feedback move mouse listener for client-side move updates
         this.feedbackMoveMouseListener = this.createMoveMouseListener();
         this.mouseTool.register(this.feedbackMoveMouseListener);
@@ -113,12 +113,12 @@ export class ChangeBoundsTool extends BaseGLSPTool {
         return new ChangeBoundsListener(this);
     }
 
-    disable() {
+    disable(): void {
         this.mouseTool.deregister(this.changeBoundsListener);
         this.selectionService.deregister(this.changeBoundsListener);
         this.mouseTool.deregister(this.feedbackMoveMouseListener);
         this.deregisterFeedback([], this.feedbackMoveMouseListener);
-        this.deregisterFeedback([new HideChangeBoundsToolResizeFeedbackAction], this.changeBoundsListener);
+        this.deregisterFeedback([new HideChangeBoundsToolResizeFeedbackAction()], this.changeBoundsListener);
     }
 }
 
@@ -162,7 +162,10 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements Sele
         if (this.isMouseDrag && this.activeResizeHandle) {
             // rely on the FeedbackMoveMouseListener to update the element bounds of selected elements
             // consider resize handles ourselves
-            const actions: Action[] = [cursorFeedbackAction(CursorCSS.RESIZE), applyCssClasses(this.activeResizeHandle, ChangeBoundsListener.CSS_CLASS_ACTIVE)];
+            const actions: Action[] = [
+                cursorFeedbackAction(this.activeResizeHandle.isNwSeResize() ? CursorCSS.RESIZE_NWSE : CursorCSS.RESIZE_NESW),
+                applyCssClasses(this.activeResizeHandle, ChangeBoundsListener.CSS_CLASS_ACTIVE)
+            ];
             const positionUpdate = this.updatePosition(target, event);
             if (positionUpdate) {
                 const resizeActions = this.handleResizeOnClient(positionUpdate);
@@ -205,15 +208,33 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements Sele
     protected handleMoveElementsOnServer(target: SModelElement): Action[] {
         const result: Operation[] = [];
         const newBounds: ElementAndBounds[] = [];
+        const selectedElements: (SModelElement & BoundsAware)[] = [];
         forEachElement(target, isNonRoutableSelectedMovableBoundsAware, element => {
-            this.createElementAndBounds(element).forEach(bounds => newBounds.push(bounds));
+            selectedElements.push(element);
         });
+
+        const selectionSet: Set<SModelElement & BoundsAware> = new Set(selectedElements);
+        selectedElements
+            .filter(element => !this.isChildOfSelected(selectionSet, element))
+            .map(element => this.createElementAndBounds(element))
+            .forEach(bounds => newBounds.push(...bounds));
+
         if (newBounds.length > 0) {
             result.push(new ChangeBoundsOperation(newBounds));
         }
         return result;
     }
 
+    protected isChildOfSelected(selectedElements: Set<SModelElement>, element: SModelElement): boolean {
+        while (element instanceof SChildElement) {
+            element = element.parent;
+            if (selectedElements.has(element)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     protected handleMoveRoutingPointsOnServer(target: SModelElement): Action[] {
         const result: Operation[] = [];
         const newRoutingPoints: ElementAndRoutingPoints[] = [];
@@ -277,11 +298,16 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements Sele
         return element !== undefined && this.activeResizeElement !== undefined && element.id === this.activeResizeElement.id;
     }
 
-    protected initPosition(event: MouseEvent) {
+    protected initPosition(event: MouseEvent): void {
         this.lastDragPosition = { x: event.pageX, y: event.pageY };
         if (this.activeResizeHandle) {
             const resizeElement = findParentByFeature(this.activeResizeHandle, isResizable);
-            this.initialBounds = { x: resizeElement!.bounds.x, y: resizeElement!.bounds.y, width: resizeElement!.bounds.width, height: resizeElement!.bounds.height };
+            this.initialBounds = {
+                x: resizeElement!.bounds.x,
+                y: resizeElement!.bounds.y,
+                width: resizeElement!.bounds.width,
+                height: resizeElement!.bounds.height
+            };
         }
     }
 
@@ -302,29 +328,28 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements Sele
 
             // snap our delta and only send update if the position actually changes
             // otherwise accumulate delta until we do snap to an update
-            const positionUpdate = this.snap(this.positionDelta, target, !event.shiftKey);
+            const positionUpdate = this.snap(this.positionDelta, target, !event.altKey);
             if (positionUpdate.x === 0 && positionUpdate.y === 0) {
                 return undefined;
             }
 
-            // we update our position so we need to reset our delta
-            this.positionDelta.x = 0;
-            this.positionDelta.y = 0;
+            // we update our position so we update our delta by the snapped position
+            this.positionDelta.x -= positionUpdate.x;
+            this.positionDelta.y -= positionUpdate.y;
             return positionUpdate;
         }
         return undefined;
     }
 
-    protected reset() {
+    protected reset(): void {
         if (this.activeResizeElement && isResizable(this.activeResizeElement)) {
             this.tool.dispatchFeedback([new HideChangeBoundsToolResizeFeedbackAction()], this);
-
         }
         this.tool.dispatchActions([cursorFeedbackAction(CursorCSS.DEFAULT)]);
         this.resetPosition();
     }
 
-    protected resetPosition() {
+    protected resetPosition(): void {
         this.activeResizeHandle = undefined;
         this.lastDragPosition = undefined;
         this.positionDelta = { x: 0, y: 0 };
@@ -352,35 +377,43 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements Sele
     }
 
     protected handleTopLeftResize(resizeElement: SParentElement & Resizable, positionUpdate: Point): Action[] {
-        return this.createSetBoundsAction(resizeElement,
+        return this.createSetBoundsAction(
+            resizeElement,
             resizeElement.bounds.x + positionUpdate.x,
             resizeElement.bounds.y + positionUpdate.y,
             resizeElement.bounds.width - positionUpdate.x,
-            resizeElement.bounds.height - positionUpdate.y);
+            resizeElement.bounds.height - positionUpdate.y
+        );
     }
 
     protected handleTopRightResize(resizeElement: SParentElement & Resizable, positionUpdate: Point): Action[] {
-        return this.createSetBoundsAction(resizeElement,
+        return this.createSetBoundsAction(
+            resizeElement,
             resizeElement.bounds.x,
             resizeElement.bounds.y + positionUpdate.y,
             resizeElement.bounds.width + positionUpdate.x,
-            resizeElement.bounds.height - positionUpdate.y);
+            resizeElement.bounds.height - positionUpdate.y
+        );
     }
 
     protected handleBottomLeftResize(resizeElement: SParentElement & Resizable, positionUpdate: Point): Action[] {
-        return this.createSetBoundsAction(resizeElement,
+        return this.createSetBoundsAction(
+            resizeElement,
             resizeElement.bounds.x + positionUpdate.x,
             resizeElement.bounds.y,
             resizeElement.bounds.width - positionUpdate.x,
-            resizeElement.bounds.height + positionUpdate.y);
+            resizeElement.bounds.height + positionUpdate.y
+        );
     }
 
     protected handleBottomRightResize(resizeElement: SParentElement & Resizable, positionUpdate: Point): Action[] {
-        return this.createSetBoundsAction(resizeElement,
+        return this.createSetBoundsAction(
+            resizeElement,
             resizeElement.bounds.x,
             resizeElement.bounds.y,
             resizeElement.bounds.width + positionUpdate.x,
-            resizeElement.bounds.height + positionUpdate.y);
+            resizeElement.bounds.height + positionUpdate.y
+        );
     }
 
     protected createChangeBoundsAction(element: SModelElement & BoundsAware): Action[] {
@@ -414,7 +447,6 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements Sele
                 result.push(removeMovementRestrictionFeedback(element, this.tool.movementRestrictor));
             }
             result.push(new SetBoundsAction([{ elementId: element.id, newPosition, newSize }]));
-
         } else if (this.isValidSize(element, newSize)) {
             if (this.tool.movementRestrictor) {
                 result.push(createMovementRestrictionFeedback(element, this.tool.movementRestrictor));
@@ -426,20 +458,18 @@ export class ChangeBoundsListener extends DragAwareMouseListener implements Sele
     }
 
     protected snap(position: Point, element: SModelElement, isSnap: boolean): Point {
-        return isSnap && this.tool.snapper
-            ? this.tool.snapper.snap(position, element)
-            : { x: position.x, y: position.y };
+        return isSnap && this.tool.snapper ? this.tool.snapper.snap(position, element) : { x: position.x, y: position.y };
     }
 
     protected isValidBoundChange(element: SModelElement & BoundsAware, newPosition: Point, newSize: Dimension): boolean {
         return this.isValidSize(element, newSize) && this.isValidMove(element, newPosition);
     }
 
-    protected isValidSize(element: SModelElement & BoundsAware, size: Dimension) {
+    protected isValidSize(element: SModelElement & BoundsAware, size: Dimension): boolean {
         return isValidSize(element, size);
     }
 
-    protected isValidMove(element: SModelElement & BoundsAware, newPosition: Point) {
+    protected isValidMove(element: SModelElement & BoundsAware, newPosition: Point): boolean {
         return isValidMove(element, newPosition, this.tool.movementRestrictor);
     }
 }

package/src/features/tools/delete-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from "inversify";
+import { Action, DeleteElementOperation } from '@eclipse-glsp/protocol';
+import { inject, injectable } from 'inversify';
 import {
-    Action,
     EnableDefaultToolsAction,
     findParentByFeature,
     isCtrlOrCmd,
@@ -25,22 +25,20 @@ import {
     KeyTool,
     MouseListener,
     SModelElement
-} from "sprotty";
-import { matchesKeystroke } from "sprotty/lib/utils/keyboard";
-
-import { DeleteElementOperation } from "../../base/operations/operation";
-import { GLSPTool } from "../../base/tool-manager/glsp-tool-manager";
-import { GLSP_TYPES } from "../../base/types";
-import { IMouseTool } from "../mouse-tool/mouse-tool";
-import { CursorCSS, cursorFeedbackAction } from "../tool-feedback/css-feedback";
-import { IFeedbackActionDispatcher } from "../tool-feedback/feedback-action-dispatcher";
+} from 'sprotty';
+import { matchesKeystroke } from 'sprotty/lib/utils/keyboard';
+import { GLSPTool } from '../../base/tool-manager/glsp-tool-manager';
+import { GLSP_TYPES } from '../../base/types';
+import { IMouseTool } from '../mouse-tool/mouse-tool';
+import { CursorCSS, cursorFeedbackAction } from '../tool-feedback/css-feedback';
+import { IFeedbackActionDispatcher } from '../tool-feedback/feedback-action-dispatcher';
 
 /**
  * Deletes selected elements when hitting the `Del` key.
  */
 @injectable()
 export class DelKeyDeleteTool implements GLSPTool {
-    static ID = "glsp.delete-keyboard";
+    static ID = 'glsp.delete-keyboard';
 
     isEditTool = true;
     protected deleteKeyListener: DeleteKeyListener = new DeleteKeyListener();
@@ -51,11 +49,11 @@ export class DelKeyDeleteTool implements GLSPTool {
         return DelKeyDeleteTool.ID;
     }
 
-    enable() {
+    enable(): void {
         this.keytool.register(this.deleteKeyListener);
     }
 
-    disable() {
+    disable(): void {
         this.keytool.deregister(this.deleteKeyListener);
     }
 }
@@ -64,8 +62,13 @@ export class DelKeyDeleteTool implements GLSPTool {
 export class DeleteKeyListener extends KeyListener {
     keyDown(element: SModelElement, event: KeyboardEvent): Action[] {
         if (matchesKeystroke(event, 'Delete')) {
-            const deleteElementIds = Array.from(element.root.index.all().filter(e => isDeletable(e) && isSelectable(e) && e.selected)
-                .filter(e => e.id !== e.root.id).map(e => e.id));
+            const deleteElementIds = Array.from(
+                element.root.index
+                    .all()
+                    .filter(e => isDeletable(e) && isSelectable(e) && e.selected)
+                    .filter(e => e.id !== e.root.id)
+                    .map(e => e.id)
+            );
             if (deleteElementIds.length > 0) {
                 return [new DeleteElementOperation(deleteElementIds)];
             }
@@ -79,7 +82,7 @@ export class DeleteKeyListener extends KeyListener {
  */
 @injectable()
 export class MouseDeleteTool implements GLSPTool {
-    static ID = "glsp.delete-mouse";
+    static ID = 'glsp.delete-mouse';
 
     isEditTool = true;
 
@@ -92,12 +95,12 @@ export class MouseDeleteTool implements GLSPTool {
         return MouseDeleteTool.ID;
     }
 
-    enable() {
+    enable(): void {
         this.mouseTool.register(this.deleteToolMouseListener);
         this.feedbackDispatcher.registerFeedback(this, [cursorFeedbackAction(CursorCSS.ELEMENT_DELETION)]);
     }
 
-    disable() {
+    disable(): void {
         this.mouseTool.deregister(this.deleteToolMouseListener);
         this.feedbackDispatcher.registerFeedback(this, [cursorFeedbackAction()]);
     }

package/src/features/tools/di.config.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,21 +13,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { ContainerModule, interfaces } from "inversify";
-import { configureActionHandler, configureModelElement } from "sprotty";
-
-import { TriggerEdgeCreationAction, TriggerNodeCreationAction } from "../../base/operations/operation";
-import { GLSP_TYPES } from "../../base/types";
-import { MARQUEE } from "../tool-feedback/marquee-tool-feedback";
-import { ChangeBoundsTool } from "./change-bounds-tool";
-import { DelKeyDeleteTool, MouseDeleteTool } from "./delete-tool";
-import { EdgeCreationTool } from "./edge-creation-tool";
-import { EdgeEditTool } from "./edge-edit-tool";
-import { MarqueeMouseTool } from "./marquee-mouse-tool";
-import { MarqueeTool } from "./marquee-tool";
-import { MarqueeNode } from "./model";
-import { NodeCreationTool } from "./node-creation-tool";
-import { MarqueeView } from "./view";
+import { TriggerEdgeCreationAction, TriggerNodeCreationAction } from '@eclipse-glsp/protocol';
+import { ContainerModule, interfaces } from 'inversify';
+import { configureActionHandler, configureModelElement } from 'sprotty';
+import { GLSP_TYPES } from '../../base/types';
+import { MARQUEE } from '../tool-feedback/marquee-tool-feedback';
+import { ChangeBoundsTool } from './change-bounds-tool';
+import { DelKeyDeleteTool, MouseDeleteTool } from './delete-tool';
+import { EdgeCreationTool } from './edge-creation-tool';
+import { EdgeEditTool } from './edge-edit-tool';
+import { MarqueeMouseTool } from './marquee-mouse-tool';
+import { MarqueeTool } from './marquee-tool';
+import { MarqueeNode } from './model';
+import { NodeCreationTool } from './node-creation-tool';
+import { MarqueeView } from './view';
 
 const toolsModule = new ContainerModule((bind, _unbind, isBound) => {
     // Register default tools
@@ -47,7 +46,7 @@ const toolsModule = new ContainerModule((bind, _unbind, isBound) => {
     configureActionHandler({ bind, isBound }, TriggerEdgeCreationAction.KIND, EdgeCreationTool);
 });
 
-export function configureMarqueeTool(context: { bind: interfaces.Bind, isBound: interfaces.IsBound }) {
+export function configureMarqueeTool(context: { bind: interfaces.Bind; isBound: interfaces.IsBound }): void {
     configureModelElement(context, MARQUEE, MarqueeNode, MarqueeView);
     context.bind(GLSP_TYPES.IDefaultTool).to(MarqueeTool);
     context.bind(GLSP_TYPES.ITool).to(MarqueeMouseTool);

package/src/features/tools/edge-creation-tool.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019 EclipseSource and others.
+ * Copyright (c) 2019-2021 EclipseSource and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0 which is available at
@@ -13,9 +13,9 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-import { inject, injectable } from "inversify";
+import { Action, CreateEdgeOperation, isTriggerElementTypeCreationAction, TriggerEdgeCreationAction } from '@eclipse-glsp/protocol';
+import { inject, injectable } from 'inversify';
 import {
-    Action,
     AnchorComputerRegistry,
     EnableDefaultToolsAction,
     EnableToolsAction,
@@ -25,28 +25,22 @@ import {
     isCtrlOrCmd,
     SEdge,
     SModelElement
-} from "sprotty";
-
-import { DragAwareMouseListener } from "../../base/drag-aware-mouse-listener";
-import {
-    CreateEdgeOperation,
-    isTriggerElementTypeCreationAction,
-    TriggerEdgeCreationAction
-} from "../../base/operations/operation";
+} from 'sprotty';
+import { DragAwareMouseListener } from '../../base/drag-aware-mouse-listener';
 import {
     DrawFeedbackEdgeAction,
     FeedbackEdgeEndMovingMouseListener,
     RemoveFeedbackEdgeAction
-} from "../tool-feedback/creation-tool-feedback";
-import { CursorCSS, cursorFeedbackAction } from "../tool-feedback/css-feedback";
-import { BaseGLSPTool } from "./base-glsp-tool";
+} from '../tool-feedback/creation-tool-feedback';
+import { CursorCSS, cursorFeedbackAction } from '../tool-feedback/css-feedback';
+import { BaseGLSPTool } from './base-glsp-tool';
 
 /**
  * Tool to create connections in a Diagram, by selecting a source and target node.
  */
 @injectable()
 export class EdgeCreationTool extends BaseGLSPTool implements IActionHandler {
-    static ID = "tool_create_edge";
+    static ID = 'tool_create_edge';
 
     @inject(AnchorComputerRegistry) protected anchorRegistry: AnchorComputerRegistry;
 
@@ -58,7 +52,7 @@ export class EdgeCreationTool extends BaseGLSPTool implements IActionHandler {
         return EdgeCreationTool.ID;
     }
 
-    enable() {
+    enable(): void {
         if (this.triggerAction === undefined) {
             throw new TypeError(`Could not enable tool ${this.id}.The triggerAction cannot be undefined.`);
         }
@@ -69,7 +63,7 @@ export class EdgeCreationTool extends BaseGLSPTool implements IActionHandler {
         this.dispatchFeedback([cursorFeedbackAction(CursorCSS.OPERATION_NOT_ALLOWED)]);
     }
 
-    disable() {
+    disable(): void {
         this.mouseTool.deregister(this.creationToolMouseListener);
         this.mouseTool.deregister(this.feedbackEndMovingMouseListener);
         this.deregisterFeedback([new RemoveFeedbackEdgeAction(), cursorFeedbackAction()]);
@@ -88,7 +82,7 @@ export class EdgeCreationToolMouseListener extends DragAwareMouseListener {
     protected source?: string;
     protected target?: string;
     protected currentTarget?: SModelElement;
-    protected allowedTarget: boolean = false;
+    protected allowedTarget = false;
     protected proxyEdge: SEdge;
 
     constructor(protected triggerAction: TriggerEdgeCreationAction, protected tool: EdgeCreationTool) {
@@ -97,7 +91,7 @@ export class EdgeCreationToolMouseListener extends DragAwareMouseListener {
         this.proxyEdge.type = triggerAction.elementTypeId;
     }
 
-    protected reinitialize() {
+    protected reinitialize(): void {
         this.source = undefined;
         this.target = undefined;
         this.currentTarget = undefined;
@@ -132,11 +126,11 @@ export class EdgeCreationToolMouseListener extends DragAwareMouseListener {
         return result;
     }
 
-    protected isSourceSelected() {
+    protected isSourceSelected(): boolean {
         return this.source !== undefined;
     }
 
-    protected isTargetSelected() {
+    protected isTargetSelected(): boolean {
         return this.target !== undefined;
     }
 
@@ -151,8 +145,9 @@ export class EdgeCreationToolMouseListener extends DragAwareMouseListener {
                     this.allowedTarget = this.isAllowedTarget(newCurrentTarget);
                 }
                 if (this.allowedTarget) {
-                    const action = !this.isSourceSelected() ? cursorFeedbackAction(CursorCSS.EDGE_CREATION_SOURCE) :
-                        cursorFeedbackAction(CursorCSS.EDGE_CREATION_TARGET);
+                    const action = !this.isSourceSelected()
+                        ? cursorFeedbackAction(CursorCSS.EDGE_CREATION_SOURCE)
+                        : cursorFeedbackAction(CursorCSS.EDGE_CREATION_TARGET);
                     return [action];
                 }
             }
@@ -162,10 +157,10 @@ export class EdgeCreationToolMouseListener extends DragAwareMouseListener {
     }
 
     protected isAllowedSource(element: SModelElement | undefined): boolean {
-        return element !== undefined && isConnectable(element) && element.canConnect(this.proxyEdge, "source");
+        return element !== undefined && isConnectable(element) && element.canConnect(this.proxyEdge, 'source');
     }
 
     protected isAllowedTarget(element: SModelElement | undefined): boolean {
-        return element !== undefined && isConnectable(element) && element.canConnect(this.proxyEdge, "target");
+        return element !== undefined && isConnectable(element) && element.canConnect(this.proxyEdge, 'target');
     }
 }