Merge branch 'main' of https://github.com/DataFlowAnalysis/OnlineEditor into rename

Author: 01Parzival10

backend/analysisBackendServer/releng/org.dataflowanalysis.standalone.targetplatform/org.dataflowanalysis.standalone.targetplatform.targetplatform.target

@@ -20,8 +20,8 @@
 			<repository location="https://updatesite.palladio-simulator.com/palladio-supporting-workflowengine/nightly/"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-			<unit id="tools.mdsd.library.emfeditutils" version="0.0.0"/>
 			<repository location="https://updatesite.mdsd.tools/library-emfeditutils/nightly/"/>
+			<unit id="tools.mdsd.library.emfeditutils.feature.feature.group" version="0.2.0.202510010711"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
 			<unit id="tools.mdsd.library.standalone.initialization.log4j" version="0.0.0"/>

frontend/webEditor/src/features/autoLayout/command.ts

@@ -14,7 +14,7 @@ export namespace LayoutModelAction {
 
     export function create(): LayoutModelAction {
         return {
-            kind: KIND
+            kind: KIND,
         };
     }
 }
@@ -35,7 +35,7 @@ export class LayoutModelCommand extends Command {
 
     private oldModelSchema?: SModelRoot;
     private newModel?: SModelRootImpl;
-    private usedMethod?: LayoutMethod
+    private usedMethod?: LayoutMethod;
 
     constructor() {
         super();
@@ -48,7 +48,10 @@ export class LayoutModelCommand extends Command {
         if (!this.layoutEngine) throw new Error("Missing injects");
 
         this.usedMethod = this.settingsManager?.layoutMethod ?? LayoutMethod.LINES;
-        if (this.settingsManager && (this.usedMethod === LayoutMethod.WRAPPING || this.usedMethod === LayoutMethod.CIRCLES)) {
+        if (
+            this.settingsManager &&
+            (this.usedMethod === LayoutMethod.WRAPPING || this.usedMethod === LayoutMethod.CIRCLES)
+        ) {
             this.oldHideLabels = this.settingsManager.hideEdgeLabels;
             this.settingsManager.hideEdgeLabels = true;
         }
@@ -88,7 +91,10 @@ export class LayoutModelCommand extends Command {
             // No new model saved because the layout was not executed due to read-only mode.
             return context.root;
         }
-        if (this.settingsManager && (this.usedMethod === LayoutMethod.WRAPPING || this.usedMethod === LayoutMethod.CIRCLES)) {
+        if (
+            this.settingsManager &&
+            (this.usedMethod === LayoutMethod.WRAPPING || this.usedMethod === LayoutMethod.CIRCLES)
+        ) {
             this.settingsManager.hideEdgeLabels = true;
         }
 

frontend/webEditor/src/features/dfdElements/behaviorRefactorer.ts

@@ -95,11 +95,11 @@ export class DFDBehaviorRefactorer {
     }
 
     private renameLabelsForPort(port: DfdOutputPortImpl, labelChanges: LabelChange[], tree: ReplaceAutoCompleteTree) {
-        let lines = port.behavior.split(/\n/);
+        let lines = port.getBehavior().split(/\n/);
         for (const change of labelChanges) {
             lines = tree.replace(lines, { old: change.oldLabel, replacement: change.newLabel, type: "Label" });
         }
-        port.behavior = lines.join("\n");
+        port.setBehavior(lines.join("\n"));
     }
 
     private traverseDfdOutputPorts(element: SModelElementImpl, cb: (port: DfdOutputPortImpl) => void) {
@@ -148,7 +148,7 @@ export class DFDBehaviorRefactorer {
         newInputName: string,
         tree: ReplaceAutoCompleteTree,
     ): string {
-        const lines = port.behavior.split("\n");
+        const lines = port.getBehavior().split("\n");
         const newLines = tree.replace(lines, { old: oldInputName, replacement: newInputName, type: "Input" });
         return newLines.join("\n");
     }
@@ -211,9 +211,9 @@ export class RefactorInputNameInDFDBehaviorCommand extends Command {
         behaviorChanges.forEach((updatedBehavior, id) => {
             const port = context.root.index.getById(id);
             if (port instanceof DfdOutputPortImpl) {
-                this.oldBehaviors.set(id, port.behavior);
+                this.oldBehaviors.set(id, port.getBehavior());
                 this.newBehaviors.set(id, updatedBehavior);
-                port.behavior = updatedBehavior;
+                port.setBehavior(updatedBehavior);
             }
         });
 
@@ -224,7 +224,7 @@ export class RefactorInputNameInDFDBehaviorCommand extends Command {
         this.oldBehaviors.forEach((oldBehavior, id) => {
             const port = context.root.index.getById(id);
             if (port instanceof DfdOutputPortImpl) {
-                port.behavior = oldBehavior;
+                port.setBehavior(oldBehavior);
             }
         });
 
@@ -235,7 +235,7 @@ export class RefactorInputNameInDFDBehaviorCommand extends Command {
         this.newBehaviors.forEach((newBehavior, id) => {
             const port = context.root.index.getById(id);
             if (port instanceof DfdOutputPortImpl) {
-                port.behavior = newBehavior;
+                port.setBehavior(newBehavior);
             }
         });
 

frontend/webEditor/src/features/dfdElements/outputPortEditUi.ts

@@ -242,7 +242,7 @@ export class OutputPortEditUI extends AbstractUIExtension implements Switchable
             // Delay update to the next event loop tick to ensure the refactoring is done.
             setTimeout(() => {
                 if (this.editor && this.port) {
-                    this.editor?.setValue(this.port?.behavior);
+                    this.editor?.setValue(this.port?.getBehavior());
                 }
             }, 0);
         });
@@ -309,7 +309,7 @@ export class OutputPortEditUI extends AbstractUIExtension implements Switchable
         }
 
         // Load the current behavior text of the port into the text editor.
-        this.editor?.setValue(this.port.behavior);
+        this.editor?.setValue(this.port.getBehavior());
         this.editor?.getModel()?.setEOL(monaco.editor.EndOfLineSequence.LF);
         this.resizeEditor();
 
@@ -463,15 +463,15 @@ export class SetDfdOutputPortBehaviorCommand extends Command {
 
     execute(context: CommandExecutionContext): CommandReturn {
         const port = context.root.index.getById(this.action.portId) as DfdOutputPortImpl;
-        this.oldBehavior = port.behavior;
-        port.behavior = this.action.behavior;
+        this.oldBehavior = port.getBehavior();
+        port.setBehavior(this.action.behavior);
         return context.root;
     }
 
     undo(context: CommandExecutionContext): CommandReturn {
         const port = context.root.index.getById(this.action.portId) as DfdOutputPortImpl;
         if (this.oldBehavior) {
-            port.behavior = this.oldBehavior;
+            port.setBehavior(this.oldBehavior);
         }
 
         return context.root;

frontend/webEditor/src/features/dfdElements/ports.tsx

@@ -96,15 +96,9 @@ export interface DfdOutputPort extends SPort {
 export class DfdOutputPortImpl extends SPortImpl {
     static readonly DEFAULT_FEATURES = [...defaultPortFeatures, withEditLabelFeature];
 
-    private _behavior: string = "";
-    private tree: AutoCompleteTree;
+    private behavior: string = "";
     private validBehavior: boolean = true;
 
-    constructor() {
-        super();
-        this.tree = new AutoCompleteTree(TreeBuilder.buildTree(labelTypeRegistry, this));
-    }
-
     override get bounds(): Bounds {
         return {
             x: this.position.x,
@@ -145,19 +139,21 @@ export class DfdOutputPortImpl extends SPortImpl {
         return style;
     }
 
-    get behavior(): string {
-        return this._behavior;
-    }
-
-    set behavior(value: string) {
-        this._behavior = value;
+    public setBehavior(value: string) {
+        this.behavior = value;
         if (value === "") {
             this.validBehavior = true;
             return;
         }
-        const errors = this.tree.verify(this.behavior.split("\n"));
+        const errors = new AutoCompleteTree(TreeBuilder.buildTree(labelTypeRegistry, this)).verify(
+            this.behavior.split("\n"),
+        );
         this.validBehavior = errors.length === 0;
     }
+
+    public getBehavior() {
+        return this.behavior;
+    }
 }
 
 @injectable()