Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c5734d0
feat: added initial ui for violation summaries
dalu-wins Feb 5, 2026
5a62ceb
fix(ui): wrap long violation summaries
dalu-wins Feb 5, 2026
e2f9c90
fix: added service for updating violation summary and populated with …
dalu-wins Feb 9, 2026
cead1ea
fix: listen to localhost's websocket
dalu-wins Feb 9, 2026
aa95fff
feat: ui now shows real violation summaries under "simple"-tab
dalu-wins Feb 10, 2026
5368ad9
fix: update classpath to contain local plugins
dalu-wins Feb 10, 2026
0c4087a
fix: add second diagram and use as new default diagram
dalu-wins Feb 23, 2026
f0dfba0
added build files for easy deploy on server
dalu-wins Feb 23, 2026
2746bd6
fix: make frontend display information from updated backend & simplif…
dalu-wins Mar 8, 2026
d843929
fix: added files to make backend product buildable with changes made …
dalu-wins Mar 8, 2026
1a9b98b
fix: dont wrap words in first summary column
dalu-wins Mar 8, 2026
2fcabc3
fix: remove extra diagram as you can load them via parameter in url
dalu-wins Mar 8, 2026
6af2de4
fix: remove deploy as it should not be on github
dalu-wins Mar 8, 2026
ad54dcd
fix: remove wait for nextline so it can run as systemd after build
dalu-wins Mar 8, 2026
9cc60b2
fix: remove log version
dalu-wins Mar 9, 2026
bc565bf
fix: add tooltip to violation ui and chain string list from violation
dalu-wins Mar 9, 2026
dd3f666
fix: add tooltip for tfg
dalu-wins Mar 9, 2026
59e1de1
fix: connect to correct websoscket again
dalu-wins Mar 9, 2026
72b69f1
Merge remote-tracking branch 'upstream/main'
dalu-wins Mar 9, 2026
215f845
docs: add setup for backend that contains violation summary logic
dalu-wins Mar 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.dataflowanalysis.analysis">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/org.dataflowanalysis.analysis.dfd">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/org.dataflowanalysis.analysis.pcm">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/org.dataflowanalysis.converter">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/org.dataflowanalysis.examplemodels">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: org.dataflowanalysis.standalone
Bundle-SymbolicName: org.dataflowanalysis.standalone;singleton:=true
Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.dataflowanalysis.dfd.datadictionary;bundle-version="2.0.0",
org.dataflowanalysis.dfd.dataflowdiagram;bundle-version="2.0.0",
Bundle-Version: 3.0.0.qualifier
Require-Bundle: org.dataflowanalysis.dfd.datadictionary,
org.dataflowanalysis.dfd.dataflowdiagram,
org.eclipse.jetty.websocket.server;bundle-version="11.0.24",
org.eclipse.jetty.servlet;bundle-version="11.0.24",
org.eclipse.jetty.http;bundle-version="11.0.24",
Expand All @@ -19,10 +19,10 @@ Require-Bundle: org.dataflowanalysis.dfd.datadictionary;bundle-version="2.0.0",
org.eclipse.jetty.websocket.common;bundle-version="11.0.24",
org.eclipse.jetty.websocket.servlet;bundle-version="11.0.24",
org.slf4j.api;bundle-version="1.7.30",
org.dataflowanalysis.analysis;bundle-version="3.0.0",
org.dataflowanalysis.analysis.dfd;bundle-version="3.0.0",
org.dataflowanalysis.converter;bundle-version="3.0.0",
org.dataflowanalysis.pcm.extension.nodecharacteristics;bundle-version="0.1.0",
org.dataflowanalysis.analysis,
org.dataflowanalysis.analysis.dfd,
org.dataflowanalysis.converter,
org.dataflowanalysis.pcm.extension.nodecharacteristics,
org.dataflowanalysis.analysis.pcm,
org.palladiosimulator.commons.stoex;bundle-version="5.2.1",
de.uka.ipd.sdq.stoex.analyser;bundle-version="5.2.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dataflowanalysis.standalone</groupId>
<artifactId>bundles-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.dataflowanalysis.standalone</artifactId>
<packaging>eclipse-plugin</packaging>
</project>
Original file line number Diff line number Diff line change
@@ -1,40 +1,21 @@
package org.dataflowanalysis.standalone;

import java.util.Scanner;

import org.dataflowanalysis.standalone.websocket.WebSocketServerUtils;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;

public class Application implements IApplication {
@Override
public Object start(IApplicationContext context) throws Exception {
try {
Thread webSocketServer = WebSocketServerUtils.startWebSocketServer();

Scanner scanner = new Scanner(System.in);
String input = "";

System.out.println("Type 'exit' to quit the program.");

// Loop until user types "exit"

while(webSocketServer.isAlive()) {
while (!input.equalsIgnoreCase("exit")) {
input = scanner.nextLine();
}
scanner.close();
return IApplication.EXIT_OK;
};
scanner.close();
@Override
public Object start(IApplicationContext context) throws Exception {
try {
Thread webSocketServer = WebSocketServerUtils.startWebSocketServer();
webSocketServer.join(); // block until server thread dies
} catch (Exception e) {
e.printStackTrace();
}
return IApplication.EXIT_OK;
}

@Override
public void stop() {

}
}
}
return IApplication.EXIT_OK;
}
@Override
public void stop() {
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.dataflowanalysis.standalone;

import org.dataflowanalysis.standalone.websocket.WebSocketServerUtils;
import org.dataflowanalysis.analysis.DataFlowConfidentialityAnalysis;

public class Main {
public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static WebEditorDfd analyzeAnnotate(WebEditorDfd webEditorDfd) {
dfdConverter.setConstraints(constraints);
}
var newJson = dfdConverter.convert(dd).getModel();

for (var child : newJson.model().children()) {
if (child.type().startsWith("node") && child.annotations() != null) {
var oldNode = webEditorDfd.model().children().stream().filter(node -> node.id().equals(child.id())).findAny().orElseThrow();
Expand All @@ -98,8 +98,9 @@ public static WebEditorDfd analyzeAnnotate(WebEditorDfd webEditorDfd) {
oldNode.annotations().removeAll(annotationsToRemove);
oldNode.annotations().addAll(child.annotations());
}
}
return webEditorDfd;
}

return webEditorDfd.withViolations(newJson.violations());
}

/**
Expand Down
15 changes: 15 additions & 0 deletions backend/analysisBackendServer/bundles/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dataflowanalysis.standalone</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>bundles-parent</artifactId>
<packaging>pom</packaging>
<modules>
<module>org.dataflowanalysis.standalone</module>
</modules>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.dataflowanalysis.standalone.feature"
label="Standalone DFA Feature"
version="1.0.0.qualifier"
version="3.0.0.qualifier"
plugin="org.palladiosimulator.branding">

<plugin
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dataflowanalysis.standalone</groupId>
<artifactId>features-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.dataflowanalysis.standalone.feature</artifactId>
<packaging>eclipse-feature</packaging>
</project>
15 changes: 15 additions & 0 deletions backend/analysisBackendServer/features/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dataflowanalysis.standalone</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>features-parent</artifactId>
<packaging>pom</packaging>
<modules>
<module>org.dataflowanalysis.standalone.feature</module>
</modules>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product
name="Standalone DFA Server"
uid="org.dataflowanalysis.standalone.product"
id="org.dataflowanalysis.standalone.product"
application="org.dataflowanalysis.standalone.application"
version="3.0.0.qualifier"
useFeatures="true"
includeLaunchers="true"
autoIncludeRequirements="true">

<configIni use="default">
</configIni>

<launcherArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
</launcherArgs>

<launcher name="standalone-dfa-server">
<linux icon=""/>
</launcher>

<vm>
<linux include="false"/>
</vm>

<features>
<feature id="org.dataflowanalysis.standalone.feature" version="3.0.0.qualifier"/>
<feature id="org.eclipse.platform"/>
</features>

<configurations>
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4"/>
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2"/>
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2"/>
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2"/>
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4"/>
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1"/>
<plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1"/>
</configurations>

<preferencesInfo>
<targetfile overwrite="false"/>
</preferencesInfo>

<cssInfo>
</cssInfo>

</product>
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dataflowanalysis.standalone</groupId>
<artifactId>releng-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.dataflowanalysis.standalone.product</artifactId>
<packaging>eclipse-repository</packaging>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
<version>${tycho.version}</version>
<executions>
<execution>
<id>materialize-products</id>
<goals>
<goal>materialize-products</goal>
</goals>
</execution>
<execution>
<id>archive-products</id>
<goals>
<goal>archive-products</goal>
</goals>
</execution>
</executions>
<configuration>
<products>
<product>
<id>org.dataflowanalysis.standalone.product</id>
<archiveFileName>standalone-dfa-server</archiveFileName>
</product>
</products>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
<?pde version="3.8"?>
<target name="Target Platform" sequenceNumber="1">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="file:///mnt/184CCA5A78B43ABB/bachelor/DataFlowAnalysis/releng/org.dataflowanalysis.analysis.updatesite/target/repository"/>
<unit id="org.dataflowanalysis.analysis.feature.feature.group" version="0.0.0"/>
<unit id="org.dataflowanalysis.converter.feature.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="de.uka.ipd.sdq.identifier.feature.feature.group" version="0.0.0"/>
<unit id="org.palladiosimulator.commons.stoex.sdk.feature.group" version="0.0.0"/>
Expand Down Expand Up @@ -144,10 +149,8 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<repository location="https://dataflowanalysis.github.io/updatesite/nightly/dataflowanalysis/"/>
<unit id="org.dataflowanalysis.analysis.feature.feature.group" version="0.0.0"/>
<unit id="org.dataflowanalysis.converter.feature.feature.group" version="0.0.0"/>
<unit id="org.dataflowanalysis.dfd.datadictionary.feature.feature.group" version="0.0.0"/>
<unit id="org.dataflowanalysis.dfd.dataflowdiagram.feature.feature.group" version="0.0.0"/>
<unit id="org.dataflowanalysis.dfd.datadictionary" version="0.0.0"/>
<unit id="org.dataflowanalysis.dfd.dataflowdiagram" version="0.0.0"/>
</location>
</locations>
</target>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dataflowanalysis.standalone</groupId>
<artifactId>releng-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.dataflowanalysis.standalone.targetplatform</artifactId>
<packaging>eclipse-target-definition</packaging>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dataflowanalysis.standalone</groupId>
<artifactId>releng-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>org.dataflowanalysis.standalone.updatesite</artifactId>
<packaging>eclipse-repository</packaging>
</project>
17 changes: 17 additions & 0 deletions backend/analysisBackendServer/releng/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dataflowanalysis.standalone</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>releng-parent</artifactId>
<packaging>pom</packaging>
<modules>
<module>org.dataflowanalysis.standalone.targetplatform</module>
<module>org.dataflowanalysis.standalone.updatesite</module>
<module>org.dataflowanalysis.standalone.product</module>
</modules>
</project>
Loading
Loading