Web converter

.github/dependabot.yml

@@ -15,7 +15,7 @@ updates:
           - "dependencies"
     - package-ecosystem: "npm"
       target-branch: "main"
-      directory: "/Frontend/WebEditor"
+      directory: "/frontend/webEditor"
       schedule:
           interval: "weekly"
           day: "wednesday"
@@ -28,7 +28,7 @@ updates:
           - "dependencies"
     - package-ecosystem: "maven"
       target-branch: "main"
-      directory: "/Backend/AnalysisBackendServer"
+      directory: "/backend/analysisBackendServer"
       schedule:
           interval: "weekly"
           day: "wednesday"

.github/workflows/backendUpdatesite.yml

@@ -26,13 +26,13 @@ jobs:
         with:
           maven-version: 3.9.6
       - name: Build and Verify
-        working-directory: Backend/AnalysisBackendServer
+        working-directory: backend/analysisBackendServer
         run: mvn clean verify
       - name: Publish Nightly Update Site
         if: github.event_name != 'release' && github.ref == 'refs/heads/main' && github.repository_owner == 'DataFlowAnalysis'
         uses: peaceiris/actions-gh-pages@v4
         with:
-          path: Backend/AnalysisBackendServer
+          path: backend/analysisBackendServer
           deploy_key: ${{ secrets.UPDATE_SITE_DEPLOY_KEY }}
           external_repository: DataFlowAnalysis/updatesite
           destination_dir: nightly/analysis-backend-server/
@@ -42,7 +42,7 @@ jobs:
         if: github.event_name == 'release' && github.repository_owner == 'DataFlowAnalysis'
         uses: peaceiris/actions-gh-pages@v4
         with:
-          path: Backend/AnalysisBackendServer
+          path: backend/analysisBackendServer
           deploy_key: ${{ secrets.UPDATE_SITE_DEPLOY_KEY }}
           external_repository: DataFlowAnalysis/updatesite
           destination_dir: release/analysis-backend-server/${{ github.event.release.tag_name }}

.github/workflows/checkFormat.yaml

@@ -16,7 +16,7 @@ jobs:
                   node-version: "22"
 
             - name: Install and Lint
-              working-directory: Frontend/WebEditor
+              working-directory: frontend/webEditor
               run: |
                   npm install
                   npx prettier --check ./**/*.html

.github/workflows/checkLint.yaml

@@ -16,7 +16,7 @@ jobs:
                   node-version: "22"
 
             - name: Install and Lint
-              working-directory: Frontend/WebEditor
+              working-directory: frontend/webEditor
               run: |
                   npm install
                   npm run lint

.github/workflows/pages.yaml

@@ -20,21 +20,21 @@ jobs:
               with:
                   node-version: 20.x
                   cache: npm
-                  cache-dependency-path: Frontend/WebEditor/package-lock.json
+                  cache-dependency-path: frontend/webEditor/package-lock.json
 
             - name: Install dependencies
-              working-directory: Frontend/WebEditor
+              working-directory: frontend/webEditor
               run: npm install
 
             - name: Build project
-              working-directory: Frontend/WebEditor
+              working-directory: frontend/webEditor
               run: npm run build
 
             - name: Upload Pages artifact
               if: github.ref == 'refs/heads/main'
               uses: actions/upload-pages-artifact@v3
               with:
-                  path: "./Frontend/WebEditor/dist/"
+                  path: "./frontend/webEditor/dist/"
 
             - name: Deploy to GitHub Pages
               if: github.ref == 'refs/heads/main'

.github/workflows/pagesWebConverter.yaml

@@ -0,0 +1,40 @@
+name: Build using vite and deploy to GitHub Pages when on master
+
+on:
+    - push
+
+# Configures premissions for the used GitHub Token that are required for Pages.
+permissions:
+    contents: read # To get the source
+    pages: write # To deploy to pages
+    id-token: write # To verify deployment (done automatically by the official action)
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+            - name: Use Node.js 20.x
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20.x
+                  cache: npm
+                  cache-dependency-path: frontend/webConverter/package-lock.json
+
+            - name: Install dependencies
+              working-directory: frontend/webConverter
+              run: npm install
+
+            - name: Build project
+              working-directory: frontend/webConverter
+              run: npm run build
+
+            - name: Upload Pages artifact
+              if: github.ref == 'refs/heads/master'
+              uses: actions/upload-pages-artifact@v3
+              with:
+                  path: "./frontend/webConverter/dist/"
+
+            - name: Deploy to GitHub Pages
+              if: github.ref == 'refs/heads/master'
+              uses: actions/deploy-pages@v4

Backend/AnalysisBackendServer/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java → backend/analysisBackendServer/bundles/org.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/websocket/WebSocketServerHandler.java

@@ -95,15 +95,19 @@ private String handleIncomingMessage(int id, String message) {
 				newJson = deserializeJsonAndAnnotate(message);	    				
 	    	}
 	    	else if (message.startsWith("Json2DFD:")) {
-	    		message = message.replaceFirst("Json2DFD:" + name + ":", "");   		
+	    		message = message.replaceFirst("Json2DFD:", "");   		
 				var webEditorDfd = deserializeJson(message);
 			    return name + ":" + Converter.convertToDFDandStringify(webEditorDfd, name);	
 	    	} 
 	    	else if (message.startsWith("DFD:")) {
-	    		newJson = safeLoadAndConvertDFDString(message);
-	    	} else {
+	    		newJson = safeLoadAndConvertDFDString(message, name);
+	    	} else if (message.startsWith("PCM2DFD:")){
+	    	    message = message.replaceFirst("PCM2DFD:", "");
 	    	    newJson = safeLoadAndConvertPCMString(message);
-	    	}
+                return name + ":" + Converter.convertToDFDandStringify(newJson, name); 
+	    	} else {
+                newJson = safeLoadAndConvertPCMString(message);
+            }
     	} catch (IllegalArgumentException e) {
 			return "Error:" + e.getMessage();
 		}
@@ -143,10 +147,8 @@ private WebEditorDfd deserializeJson(String json){
 		return webEditorDfd;
     }
 
-    private WebEditorDfd safeLoadAndConvertDFDString(String message) {
+    private WebEditorDfd safeLoadAndConvertDFDString(String message, String name) {
 		message = message.replaceFirst("DFD:", "");
-		var name = message.split(":")[0];
-		message = message.replaceFirst(name + ":", "");
 		var dfdMessage = message.split("\n:DD:\n")[0];
 		var ddMessage = message.split("\n:DD:\n")[1];
 		try {            

frontend/webConverter/.gitignore

@@ -0,0 +1,30 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.DS_Store
+dist
+dist-ssr
+coverage
+*.local
+
+/cypress/videos/
+/cypress/screenshots/
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+*.tsbuildinfo

frontend/webConverter/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["Vue.volar"]
+}

frontend/webConverter/README.md

@@ -0,0 +1,33 @@
+# WebConverter
+
+This template should help get you started developing with Vue 3 in Vite.
+
+## Recommended IDE Setup
+
+[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur).
+
+## Type Support for `.vue` Imports in TS
+
+TypeScript cannot handle type information for `.vue` imports by default, so we replace the `tsc` CLI with `vue-tsc` for type checking. In editors, we need [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) to make the TypeScript language service aware of `.vue` types.
+
+## Customize configuration
+
+See [Vite Configuration Reference](https://vite.dev/config/).
+
+## Project Setup
+
+```sh
+npm install
+```
+
+### Compile and Hot-Reload for Development
+
+```sh
+npm run dev
+```
+
+### Type-Check, Compile and Minify for Production
+
+```sh
+npm run build
+```

frontend/webConverter/components.d.ts

@@ -0,0 +1,14 @@
+/* eslint-disable */
+// @ts-nocheck
+// Generated by unplugin-vue-components
+// Read more: https://github.com/vuejs/core/pull/3399
+// biome-ignore lint: disable
+export {}
+
+/* prettier-ignore */
+declare module 'vue' {
+  export interface GlobalComponents {
+    BDropdown: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdown']
+    BDropdownItemButton: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownItemButton']
+  }
+}

frontend/webConverter/env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

frontend/webConverter/index.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="">
+  <head>
+    <meta charset="UTF-8">
+    <link rel="icon" href="/favicon.ico">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Vite App</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>