From 92680a9283ed0b31dd5642ab97c99441f2f6b273 Mon Sep 17 00:00:00 2001 From: Huell Date: Wed, 12 Jun 2024 12:18:06 +0200 Subject: [PATCH 1/4] Remove erroneous project File --- .project | 11 +++++++++++ tests/.classpath | 11 ----------- tests/.project | 28 ---------------------------- 3 files changed, 11 insertions(+), 39 deletions(-) create mode 100644 .project delete mode 100644 tests/.classpath delete mode 100644 tests/.project diff --git a/.project b/.project new file mode 100644 index 0000000..328f2e8 --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + Converter + + + + + + + + diff --git a/tests/.classpath b/tests/.classpath deleted file mode 100644 index 675a5e2..0000000 --- a/tests/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/tests/.project b/tests/.project deleted file mode 100644 index f4d8ddd..0000000 --- a/tests/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.dataflowanalysis.converter.tests - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - From ffd069508f661b12cc2ff48c5eed541bb79d59d2 Mon Sep 17 00:00:00 2001 From: Huell Date: Wed, 12 Jun 2024 12:18:42 +0200 Subject: [PATCH 2/4] Remove auto created project file --- .project | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index 328f2e8..0000000 --- a/.project +++ /dev/null @@ -1,11 +0,0 @@ - - - Converter - - - - - - - - From c971b2ebf51999ad08e5af36f07b00ff423e2786 Mon Sep 17 00:00:00 2001 From: Huell Date: Wed, 12 Jun 2024 13:12:43 +0200 Subject: [PATCH 3/4] Fixing edgeless Nodes issue --- .../src/org/dataflowanalysis/converter/PCMConverter.java | 3 ++- .../src/org/dataflowanalysis/converter/tests/PCMTest.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/PCMConverter.java b/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/PCMConverter.java index 16d21f6..5c81053 100644 --- a/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/PCMConverter.java +++ b/bundles/org.dataflowanalysis.converter/src/org/dataflowanalysis/converter/PCMConverter.java @@ -159,7 +159,7 @@ public static String computeCompleteName(AbstractPCMVertex vertex) { private DataFlowDiagramAndDictionary processPalladio(FlowGraphCollection flowGraphCollection) { for (AbstractTransposeFlowGraph transposeFlowGraph : flowGraphCollection.getTransposeFlowGraphs()) { Node previousNode = null; - for (AbstractVertex abstractVertex : transposeFlowGraph.getVertices()) { + for (AbstractVertex abstractVertex : transposeFlowGraph.getVertices()) { if (abstractVertex instanceof AbstractPCMVertex) { previousNode = processAbstractPCMVertex((AbstractPCMVertex) abstractVertex, previousNode); } @@ -181,6 +181,7 @@ private void createFlowBetweenPreviousAndCurrentNode(Node source, Node dest, Abs return; } List dataCharacteristics = pcmVertex.getAllDataCharacteristics(); + if (dataCharacteristics.size() == 0) dataFlowDiagram.getFlows().add(createFlow(source, dest, "")); for (DataCharacteristic dataCharacteristic : dataCharacteristics) { String flowName = dataCharacteristic.variableName(); diff --git a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java index 942a434..19793d1 100644 --- a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java +++ b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java @@ -92,6 +92,9 @@ private void testSpecificModel(String inputModel, String inputFile, String model if (complete == null) { complete = new PCMConverter().pcmToDFD(modelLocation, usageModelPath, allocationPath, nodeCharPath, Activator.class); } + + final DataFlowDiagram test = complete.dataFlowDiagram(); + if (webTarget != null) { var dfdConverter = new DataFlowDiagramConverter(); @@ -125,6 +128,7 @@ private void testSpecificModel(String inputModel, String inputFile, String model for (AbstractTransposeFlowGraph as : flowGraph.getTransposeFlowGraphs()) { for (AbstractVertex ase : as.getVertices()) { List variables = ase.getAllDataCharacteristics(); + if (variables.isEmpty() && !ase.getPreviousElements().isEmpty()) flowNames.add(""); for (DataCharacteristic variable : variables) { flowNames.add(variable.variableName()); } From cc465ae0504faed1f7773323dc04311ba335486e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20H=C3=BCller?= <62952208+01Parzival10@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:50:29 +0200 Subject: [PATCH 4/4] Remove debugging variable --- .../src/org/dataflowanalysis/converter/tests/PCMTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java index 19793d1..f822883 100644 --- a/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java +++ b/tests/org.dataflowanalysis.converter.tests/src/org/dataflowanalysis/converter/tests/PCMTest.java @@ -92,9 +92,6 @@ private void testSpecificModel(String inputModel, String inputFile, String model if (complete == null) { complete = new PCMConverter().pcmToDFD(modelLocation, usageModelPath, allocationPath, nodeCharPath, Activator.class); } - - final DataFlowDiagram test = complete.dataFlowDiagram(); - if (webTarget != null) { var dfdConverter = new DataFlowDiagramConverter();