From 33a96d4c52e0eeeec9767f7086286390667cf46e Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Tue, 26 Nov 2024 08:11:45 +0100 Subject: [PATCH 01/15] feat(models): begin work on model integration testing framework --- .../META-INF/MANIFEST.MF | 9 +- .../anilallewar/anilallewar_0.datadictionary | 0 .../anilallewar/anilallewar_0.dataflowdiagram | 0 .../anilallewar/anilallewar_0.json | 0 .../anilallewar/anilallewar_11.datadictionary | 0 .../anilallewar_11.dataflowdiagram | 0 .../anilallewar/anilallewar_11.json | 0 .../anilallewar/anilallewar_12.datadictionary | 0 .../anilallewar_12.dataflowdiagram | 0 .../anilallewar/anilallewar_12.json | 0 .../anilallewar/anilallewar_18.datadictionary | 0 .../anilallewar_18.dataflowdiagram | 0 .../anilallewar/anilallewar_18.json | 0 .../anilallewar/anilallewar_6.datadictionary | 0 .../anilallewar/anilallewar_6.dataflowdiagram | 0 .../anilallewar/anilallewar_6.json | 0 .../anilallewar/anilallewar_7.datadictionary | 0 .../anilallewar/anilallewar_7.dataflowdiagram | 0 .../anilallewar/anilallewar_7.json | 0 .../anilallewar/anilallewar_8.datadictionary | 0 .../anilallewar/anilallewar_8.dataflowdiagram | 0 .../anilallewar/anilallewar_8.json | 0 .../anilallewar/anilallewar_9.datadictionary | 0 .../anilallewar/anilallewar_9.dataflowdiagram | 0 .../anilallewar/anilallewar_9.json | 0 .../apssouza22/apssouza22_0.datadictionary | 0 .../apssouza22/apssouza22_0.dataflowdiagram | 0 .../TUHH-Models/apssouza22/apssouza22_0.json | 0 .../apssouza22/apssouza22_12.datadictionary | 0 .../apssouza22/apssouza22_12.dataflowdiagram | 0 .../TUHH-Models/apssouza22/apssouza22_12.json | 0 .../apssouza22/apssouza22_18.datadictionary | 0 .../apssouza22/apssouza22_18.dataflowdiagram | 0 .../TUHH-Models/apssouza22/apssouza22_18.json | 0 .../apssouza22/apssouza22_2.datadictionary | 0 .../apssouza22/apssouza22_2.dataflowdiagram | 0 .../TUHH-Models/apssouza22/apssouza22_2.json | 0 .../apssouza22/apssouza22_4.datadictionary | 0 .../apssouza22/apssouza22_4.dataflowdiagram | 0 .../TUHH-Models/apssouza22/apssouza22_4.json | 0 .../apssouza22/apssouza22_6.datadictionary | 0 .../apssouza22/apssouza22_6.dataflowdiagram | 0 .../TUHH-Models/apssouza22/apssouza22_6.json | 0 .../apssouza22/apssouza22_7.datadictionary | 0 .../apssouza22/apssouza22_7.dataflowdiagram | 0 .../TUHH-Models/apssouza22/apssouza22_7.json | 0 .../apssouza22/apssouza22_8.datadictionary | 0 .../apssouza22/apssouza22_8.dataflowdiagram | 0 .../TUHH-Models/apssouza22/apssouza22_8.json | 0 .../callistaenterprise_0.datadictionary | 0 .../callistaenterprise_0.dataflowdiagram | 0 .../callistaenterprise_0.json | 0 .../callistaenterprise_11.datadictionary | 0 .../callistaenterprise_11.dataflowdiagram | 0 .../callistaenterprise_11.json | 0 .../callistaenterprise_18.datadictionary | 0 .../callistaenterprise_18.dataflowdiagram | 0 .../callistaenterprise_18.json | 0 .../callistaenterprise_2.datadictionary | 0 .../callistaenterprise_2.dataflowdiagram | 0 .../callistaenterprise_2.json | 0 .../callistaenterprise_6.datadictionary | 0 .../callistaenterprise_6.dataflowdiagram | 0 .../callistaenterprise_6.json | 0 .../ewolff-kafka_0.datadictionary | 0 .../ewolff-kafka_0.dataflowdiagram | 0 .../ewolff-kafka/ewolff-kafka_0.json | 0 .../ewolff-kafka_18.datadictionary | 0 .../ewolff-kafka_18.dataflowdiagram | 0 .../ewolff-kafka/ewolff-kafka_18.json | 0 .../ewolff-kafka_3.datadictionary | 0 .../ewolff-kafka_3.dataflowdiagram | 0 .../ewolff-kafka/ewolff-kafka_3.json | 0 .../ewolff-kafka_4.datadictionary | 0 .../ewolff-kafka_4.dataflowdiagram | 0 .../ewolff-kafka/ewolff-kafka_4.json | 0 .../ewolff-kafka_5.datadictionary | 0 .../ewolff-kafka_5.dataflowdiagram | 0 .../ewolff-kafka/ewolff-kafka_5.json | 0 .../ewolff-kafka_6.datadictionary | 0 .../ewolff-kafka_6.dataflowdiagram | 0 .../ewolff-kafka/ewolff-kafka_6.json | 0 .../ewolff-kafka_7.datadictionary | 0 .../ewolff-kafka_7.dataflowdiagram | 0 .../ewolff-kafka/ewolff-kafka_7.json | 0 .../ewolff-kafka_8.datadictionary | 0 .../ewolff-kafka_8.dataflowdiagram | 0 .../ewolff-kafka/ewolff-kafka_8.json | 0 .../ewolff-kafka_9.datadictionary | 0 .../ewolff-kafka_9.dataflowdiagram | 0 .../ewolff-kafka/ewolff-kafka_9.json | 0 .../ewolff/ewolff_10.datadictionary | 0 .../ewolff/ewolff_10.dataflowdiagram | 0 .../TUHH-Models/ewolff/ewolff_10.json | 0 .../ewolff/ewolff_12.datadictionary | 0 .../ewolff/ewolff_12.dataflowdiagram | 0 .../TUHH-Models/ewolff/ewolff_12.json | 0 .../ewolff/ewolff_18.datadictionary | 0 .../ewolff/ewolff_18.dataflowdiagram | 0 .../TUHH-Models/ewolff/ewolff_18.json | 0 .../ewolff/ewolff_5.datadictionary | 0 .../ewolff/ewolff_5.dataflowdiagram | 0 .../TUHH-Models/ewolff/ewolff_5.json | 0 .../fernandoabcampos_18.datadictionary | 0 .../fernandoabcampos_18.dataflowdiagram | 0 .../fernandoabcampos/fernandoabcampos_18.json | 0 .../georgwittberger_0.datadictionary | 0 .../georgwittberger_0.dataflowdiagram | 0 .../georgwittberger/georgwittberger_0.json | 0 .../georgwittberger_10.datadictionary | 0 .../georgwittberger_10.dataflowdiagram | 0 .../georgwittberger/georgwittberger_10.json | 0 .../georgwittberger_11.datadictionary | 0 .../georgwittberger_11.dataflowdiagram | 0 .../georgwittberger/georgwittberger_11.json | 0 .../georgwittberger_12.datadictionary | 0 .../georgwittberger_12.dataflowdiagram | 0 .../georgwittberger/georgwittberger_12.json | 0 .../georgwittberger_18.datadictionary | 0 .../georgwittberger_18.dataflowdiagram | 0 .../georgwittberger/georgwittberger_18.json | 0 .../georgwittberger_2.datadictionary | 0 .../georgwittberger_2.dataflowdiagram | 0 .../georgwittberger/georgwittberger_2.json | 0 .../georgwittberger_3.datadictionary | 0 .../georgwittberger_3.dataflowdiagram | 0 .../georgwittberger/georgwittberger_3.json | 0 .../georgwittberger_4.datadictionary | 0 .../georgwittberger_4.dataflowdiagram | 0 .../georgwittberger/georgwittberger_4.json | 0 .../georgwittberger_5.datadictionary | 0 .../georgwittberger_5.dataflowdiagram | 0 .../georgwittberger/georgwittberger_5.json | 0 .../georgwittberger_6.datadictionary | 0 .../georgwittberger_6.dataflowdiagram | 0 .../georgwittberger/georgwittberger_6.json | 0 .../georgwittberger_7.datadictionary | 0 .../georgwittberger_7.dataflowdiagram | 0 .../georgwittberger/georgwittberger_7.json | 0 .../georgwittberger_8.datadictionary | 0 .../georgwittberger_8.dataflowdiagram | 0 .../georgwittberger/georgwittberger_8.json | 0 .../jferrater/jferrater_0.datadictionary | 0 .../jferrater/jferrater_0.dataflowdiagram | 0 .../TUHH-Models/jferrater/jferrater_0.json | 0 .../jferrater/jferrater_18.datadictionary | 0 .../jferrater/jferrater_18.dataflowdiagram | 0 .../TUHH-Models/jferrater/jferrater_18.json | 0 .../jferrater/jferrater_2.datadictionary | 0 .../jferrater/jferrater_2.dataflowdiagram | 0 .../TUHH-Models/jferrater/jferrater_2.json | 0 .../jferrater/jferrater_3.datadictionary | 0 .../jferrater/jferrater_3.dataflowdiagram | 0 .../TUHH-Models/jferrater/jferrater_3.json | 0 .../jferrater/jferrater_5.datadictionary | 0 .../jferrater/jferrater_5.dataflowdiagram | 0 .../TUHH-Models/jferrater/jferrater_5.json | 0 .../jferrater/jferrater_6.datadictionary | 0 .../jferrater/jferrater_6.dataflowdiagram | 0 .../TUHH-Models/jferrater/jferrater_6.json | 0 .../jferrater/jferrater_7.datadictionary | 0 .../jferrater/jferrater_7.dataflowdiagram | 0 .../TUHH-Models/jferrater/jferrater_7.json | 0 .../jferrater/jferrater_8.datadictionary | 0 .../jferrater/jferrater_8.dataflowdiagram | 0 .../TUHH-Models/jferrater/jferrater_8.json | 0 .../jferrater/jferrater_9.datadictionary | 0 .../jferrater/jferrater_9.dataflowdiagram | 0 .../TUHH-Models/jferrater/jferrater_9.json | 0 .../koushikkothagal_0.datadictionary | 0 .../koushikkothagal_0.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_0.json | 0 .../koushikkothagal_1.datadictionary | 0 .../koushikkothagal_1.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_1.json | 0 .../koushikkothagal_10.datadictionary | 0 .../koushikkothagal_10.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_10.json | 0 .../koushikkothagal_11.datadictionary | 0 .../koushikkothagal_11.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_11.json | 0 .../koushikkothagal_12.datadictionary | 0 .../koushikkothagal_12.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_12.json | 0 .../koushikkothagal_18.datadictionary | 0 .../koushikkothagal_18.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_18.json | 0 .../koushikkothagal_2.datadictionary | 0 .../koushikkothagal_2.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_2.json | 0 .../koushikkothagal_3.datadictionary | 0 .../koushikkothagal_3.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_3.json | 0 .../koushikkothagal_4.datadictionary | 0 .../koushikkothagal_4.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_4.json | 0 .../koushikkothagal_5.datadictionary | 0 .../koushikkothagal_5.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_5.json | 0 .../koushikkothagal_6.datadictionary | 0 .../koushikkothagal_6.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_6.json | 0 .../koushikkothagal_7.datadictionary | 0 .../koushikkothagal_7.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_7.json | 0 .../koushikkothagal_8.datadictionary | 0 .../koushikkothagal_8.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_8.json | 0 .../koushikkothagal_9.datadictionary | 0 .../koushikkothagal_9.dataflowdiagram | 0 .../koushikkothagal/koushikkothagal_9.json | 0 .../mdeket/mdeket_5.datadictionary | 0 .../mdeket/mdeket_5.dataflowdiagram | 0 .../TUHH-Models/mdeket/mdeket_5.json | 0 .../mudigal-technologies_0.datadictionary | 0 .../mudigal-technologies_0.dataflowdiagram | 0 .../mudigal-technologies_0.json | 0 .../mudigal-technologies_11.datadictionary | 0 .../mudigal-technologies_11.dataflowdiagram | 0 .../mudigal-technologies_11.json | 0 .../mudigal-technologies_18.datadictionary | 0 .../mudigal-technologies_18.dataflowdiagram | 0 .../mudigal-technologies_18.json | 0 .../mudigal-technologies_2.datadictionary | 0 .../mudigal-technologies_2.dataflowdiagram | 0 .../mudigal-technologies_2.json | 0 .../mudigal-technologies_4.datadictionary | 0 .../mudigal-technologies_4.dataflowdiagram | 0 .../mudigal-technologies_4.json | 0 .../mudigal-technologies_5.datadictionary | 0 .../mudigal-technologies_5.dataflowdiagram | 0 .../mudigal-technologies_5.json | 0 .../mudigal-technologies_7.datadictionary | 0 .../mudigal-technologies_7.dataflowdiagram | 0 .../mudigal-technologies_7.json | 0 .../mudigal-technologies_8.datadictionary | 0 .../mudigal-technologies_8.dataflowdiagram | 0 .../mudigal-technologies_8.json | 0 .../rohitghatol/rohitghatol_10.datadictionary | 0 .../rohitghatol_10.dataflowdiagram | 0 .../rohitghatol/rohitghatol_10.json | 0 .../rohitghatol/rohitghatol_12.datadictionary | 0 .../rohitghatol_12.dataflowdiagram | 0 .../rohitghatol/rohitghatol_12.json | 0 .../rohitghatol/rohitghatol_18.datadictionary | 0 .../rohitghatol_18.dataflowdiagram | 0 .../rohitghatol/rohitghatol_18.json | 0 .../spring-petclinic_0.datadictionary | 0 .../spring-petclinic_0.dataflowdiagram | 0 .../spring-petclinic/spring-petclinic_0.json | 0 .../spring-petclinic_18.datadictionary | 0 .../spring-petclinic_18.dataflowdiagram | 0 .../spring-petclinic/spring-petclinic_18.json | 0 .../spring-petclinic_2.datadictionary | 0 .../spring-petclinic_2.dataflowdiagram | 0 .../spring-petclinic/spring-petclinic_2.json | 0 .../spring-petclinic_3.datadictionary | 0 .../spring-petclinic_3.dataflowdiagram | 0 .../spring-petclinic/spring-petclinic_3.json | 0 .../spring-petclinic_5.datadictionary | 0 .../spring-petclinic_5.dataflowdiagram | 0 .../spring-petclinic/spring-petclinic_5.json | 0 .../spring-petclinic_6.datadictionary | 0 .../spring-petclinic_6.dataflowdiagram | 0 .../spring-petclinic/spring-petclinic_6.json | 0 .../spring-petclinic_7.datadictionary | 0 .../spring-petclinic_7.dataflowdiagram | 0 .../spring-petclinic/spring-petclinic_7.json | 0 .../spring-petclinic_8.datadictionary | 0 .../spring-petclinic_8.dataflowdiagram | 0 .../spring-petclinic/spring-petclinic_8.json | 0 .../spring-petclinic_9.datadictionary | 0 .../spring-petclinic_9.dataflowdiagram | 0 .../spring-petclinic/spring-petclinic_9.json | 0 .../TUHH-Models/sqshq/sqshq_0.datadictionary | 0 .../TUHH-Models/sqshq/sqshq_0.dataflowdiagram | 0 .../{ => dfd}/TUHH-Models/sqshq/sqshq_0.json | 0 .../TUHH-Models/sqshq/sqshq_10.datadictionary | 0 .../sqshq/sqshq_10.dataflowdiagram | 0 .../{ => dfd}/TUHH-Models/sqshq/sqshq_10.json | 0 .../TUHH-Models/sqshq/sqshq_11.datadictionary | 0 .../sqshq/sqshq_11.dataflowdiagram | 0 .../{ => dfd}/TUHH-Models/sqshq/sqshq_11.json | 0 .../TUHH-Models/sqshq/sqshq_12.datadictionary | 0 .../sqshq/sqshq_12.dataflowdiagram | 0 .../{ => dfd}/TUHH-Models/sqshq/sqshq_12.json | 0 .../TUHH-Models/sqshq/sqshq_18.datadictionary | 0 .../sqshq/sqshq_18.dataflowdiagram | 0 .../{ => dfd}/TUHH-Models/sqshq/sqshq_18.json | 0 .../TUHH-Models/sqshq/sqshq_6.datadictionary | 0 .../TUHH-Models/sqshq/sqshq_6.dataflowdiagram | 0 .../{ => dfd}/TUHH-Models/sqshq/sqshq_6.json | 0 .../TUHH-Models/sqshq/sqshq_7.datadictionary | 0 .../TUHH-Models/sqshq/sqshq_7.dataflowdiagram | 0 .../{ => dfd}/TUHH-Models/sqshq/sqshq_7.json | 0 .../TUHH-Models/sqshq/sqshq_8.datadictionary | 0 .../TUHH-Models/sqshq/sqshq_8.dataflowdiagram | 0 .../{ => dfd}/TUHH-Models/sqshq/sqshq_8.json | 0 .../TUHH-Models/sqshq/sqshq_9.datadictionary | 0 .../TUHH-Models/sqshq/sqshq_9.dataflowdiagram | 0 .../{ => dfd}/TUHH-Models/sqshq/sqshq_9.json | 0 .../yidongnan/yidongnan_0.datadictionary | 0 .../yidongnan/yidongnan_0.dataflowdiagram | 0 .../TUHH-Models/yidongnan/yidongnan_0.json | 0 .../yidongnan/yidongnan_18.datadictionary | 0 .../yidongnan/yidongnan_18.dataflowdiagram | 0 .../TUHH-Models/yidongnan/yidongnan_18.json | 0 .../yidongnan/yidongnan_2.datadictionary | 0 .../yidongnan/yidongnan_2.dataflowdiagram | 0 .../TUHH-Models/yidongnan/yidongnan_2.json | 0 .../yidongnan/yidongnan_3.datadictionary | 0 .../yidongnan/yidongnan_3.dataflowdiagram | 0 .../TUHH-Models/yidongnan/yidongnan_3.json | 0 .../yidongnan/yidongnan_4.datadictionary | 0 .../yidongnan/yidongnan_4.dataflowdiagram | 0 .../TUHH-Models/yidongnan/yidongnan_4.json | 0 .../yidongnan/yidongnan_5.datadictionary | 0 .../yidongnan/yidongnan_5.dataflowdiagram | 0 .../TUHH-Models/yidongnan/yidongnan_5.json | 0 .../yidongnan/yidongnan_6.datadictionary | 0 .../yidongnan/yidongnan_6.dataflowdiagram | 0 .../TUHH-Models/yidongnan/yidongnan_6.json | 0 .../yidongnan/yidongnan_7.datadictionary | 0 .../yidongnan/yidongnan_7.dataflowdiagram | 0 .../TUHH-Models/yidongnan/yidongnan_7.json | 0 .../yidongnan/yidongnan_8.datadictionary | 0 .../yidongnan/yidongnan_8.dataflowdiagram | 0 .../TUHH-Models/yidongnan/yidongnan_8.json | 0 .../yidongnan/yidongnan_9.datadictionary | 0 .../yidongnan/yidongnan_9.dataflowdiagram | 0 .../TUHH-Models/yidongnan/yidongnan_9.json | 0 .../{ => pcm}/CoCarNextGen_Base/.project | 0 .../org.eclipse.core.resources.prefs | 0 .../AudiA6C8_base.allocation | 0 .../AudiA6C8_base.nodecharacteristics | 0 .../CoCarNextGen_Base/AudiA6C8_base.pddc | 0 .../AudiA6C8_base.repository | 0 .../AudiA6C8_base.resourceenvironment | 0 .../CoCarNextGen_Base/AudiA6C8_base.system | 0 .../AudiA6C8_base.usagemodel | 0 .../CoCarNextGen_base.repository | 0 .../CoCarNextGen_base.resourceenvironment | 0 .../CoCarNextGen_Base/representations.aird | 0 .../{ => pcm}/CoronaWarnApp/.project | 0 .../{ => pcm}/CoronaWarnApp/cwa.pddc | 0 .../CoronaWarnApp/default.allocation | 0 .../pcm/CoronaWarnApp/default.datadictionary | 8811 +++++++++++++++++ .../pcm/CoronaWarnApp/default.dataflowdiagram | 7922 +++++++++++++++ .../CoronaWarnApp/default.nodecharacteristics | 0 .../CoronaWarnApp/default.repository | 0 .../CoronaWarnApp/default.resourceenvironment | 0 .../{ => pcm}/CoronaWarnApp/default.system | 0 .../CoronaWarnApp/default.usagemodel | 0 .../CoronaWarnApp/representations.aird | 0 .../MaaS_Ticket_System_base/.project | 0 .../MaaS_Ticket_System_base/MaaS.allocation | 0 .../MaaS.nodecharacteristics | 0 .../MaaS_Ticket_System_base/MaaS.pddc | 0 .../MaaS_Ticket_System_base/MaaS.repository | 0 .../MaaS.resourceenvironment | 0 .../MaaS_Ticket_System_base/MaaS.system | 0 .../MaaS_Ticket_System_base/MaaS.usagemodel | 0 .../representations.aird | 0 .../{ => pcm}/TravelPlanner/.project | 0 .../TravelPlanner/representations.aird | 0 .../TravelPlanner/travelPlanner.allocation | 0 .../travelPlanner.nodecharacteristics | 0 .../TravelPlanner/travelPlanner.pddc | 0 .../TravelPlanner/travelPlanner.repository | 0 .../travelPlanner.resourceenvironment | 0 .../TravelPlanner/travelPlanner.system | 0 .../TravelPlanner/travelPlanner.usagemodel | 0 .../DFDSimpleModels/DeadOutPin.datadictionary | 0 .../DeadOutPin.dataflowdiagram | 0 .../UnusedInput.datadictionary | 0 .../UnusedInput.dataflowdiagram | 0 .../WrongFlowName.datadictionary | 0 .../WrongFlowName.dataflowdiagram | 0 .../BranchingTest.datadictionary | 0 .../BranchingTest.dataflowdiagram | 0 .../complexPseudoCycle.datadictionary | 0 .../complexPseudoCycle.dataflowdiagram | 0 .../DFDTestModels/minimal.datadictionary | 0 .../DFDTestModels/minimal.dataflowdiagram | 0 .../{ => dfd}/DFDTestModels/project.txt | 0 .../DFDTestModels/representations.aird | 0 .../models/{ => dfd}/OnlineShopDFD/.project | 0 .../OnlineShopDFD/onlineshop.datadictionary | 0 .../OnlineShopDFD/onlineshop.dataflowdiagram | 0 .../{ => dfd}/OnlineShopDFDsimple/.project | 0 .../onlineshop.datadictionary | 0 .../onlineshop.dataflowdiagram | 0 .../simpleLoopDFD/loopDFD.datadictionary | 0 .../simpleLoopDFD/loopDFD.dataflowdiagram | 0 .../{ => pcm}/BranchingOnlineShop/.project | 0 .../BranchingOnlineShop/default.allocation | 0 .../default.nodecharacteristics | 0 .../BranchingOnlineShop/default.repository | 0 .../default.resourceenvironment | 0 .../BranchingOnlineShop/default.system | 0 .../BranchingOnlineShop/default.usagemodel | 0 .../{ => pcm}/BranchingOnlineShop/dic.pddc | 0 .../BranchingOnlineShop/representations.aird | 0 .../CompositeCharacteristicsTest/.project | 0 .../composite.system | 0 .../default.allocation | 0 .../default.nodecharacteristics | 0 .../default.repository | 0 .../default.resourceenvironment | 0 .../default.system | 0 .../default.usagemodel | 0 .../CompositeCharacteristicsTest/dic.pddc | 0 .../representations.aird | 0 .../models/{ => pcm}/IgnoredNodeTest/.project | 0 .../IgnoredNodeTest/default.allocation | 0 .../default.nodecharacteristics | 0 .../IgnoredNodeTest/default.repository | 0 .../default.resourceenvironment | 0 .../{ => pcm}/IgnoredNodeTest/default.system | 0 .../IgnoredNodeTest/default.usagemodel | 0 .../models/{ => pcm}/IgnoredNodeTest/dic.pddc | 0 .../IgnoredNodeTest/representations.aird | 0 .../InternationalOnlineShop/.project | 0 .../default.allocation | 0 .../default.nodecharacteristics | 0 .../default.repository | 0 .../default.resourceenvironment | 0 .../InternationalOnlineShop/default.system | 0 .../default.usagemodel | 0 .../InternationalOnlineShop/dic.pddc | 0 .../representations.aird | 0 .../MultipleDeployments}/.project | 0 .../MultipleDeployments}/default.allocation | 0 .../default.nodecharacteristics | 0 .../MultipleDeployments}/default.pddc | 0 .../MultipleDeployments}/default.repository | 0 .../default.resourceenvironment | 0 .../MultipleDeployments}/default.system | 0 .../MultipleDeployments}/default.usagemodel | 0 .../MultipleDeployments}/representations.aird | 0 .../NodeCharacteristicsTest/.project | 0 .../default.allocation | 0 .../default.nodecharacteristics | 0 .../default.repository | 0 .../default.resourceenvironment | 0 .../NodeCharacteristicsTest/default.system | 0 .../default.usagemodel | 0 .../NodeCharacteristicsTest/dic.pddc | 0 .../representations.aird | 0 .../VariableReturn}/.project | 0 .../VariableReturn}/default.allocation | 0 .../default.nodecharacteristics | 0 .../VariableReturn}/default.repository | 0 .../default.resourceenvironment | 0 .../VariableReturn}/default.system | 0 .../VariableReturn}/default.usagemodel | 0 .../VariableReturn}/dic.pddc | 0 .../VariableReturn}/representations.aird | 0 .../results/ExampleModelResult.java | 32 + .../results/ExpectedCharacteristic.java | 9 + .../results/ExpectedViolation.java | 65 + .../pcm/BranchingOnlineShopResult.java | 38 + .../pcm/InternationalOnlineShopResult.java | 42 + .../pcm/MultipleDeploymentsResult.java | 44 + .../results/pcm/PCMExampleModelResult.java | 19 + .../results/pcm/TravelPlannerResult.java | 67 + .../results/pcm/VariableReturnResult.java | 48 + 467 files changed, 17104 insertions(+), 2 deletions(-) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/anilallewar/anilallewar_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/apssouza22/apssouza22_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/callistaenterprise/callistaenterprise_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_10.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_10.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_10.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/ewolff/ewolff_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/fernandoabcampos/fernandoabcampos_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/fernandoabcampos/fernandoabcampos_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_10.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_10.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_10.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/georgwittberger/georgwittberger_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/jferrater/jferrater_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_1.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_10.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_10.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/koushikkothagal/koushikkothagal_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mdeket/mdeket_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mdeket/mdeket_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mdeket/mdeket_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/mudigal-technologies/mudigal-technologies_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/rohitghatol/rohitghatol_10.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/rohitghatol/rohitghatol_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/rohitghatol/rohitghatol_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/spring-petclinic/spring-petclinic_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_10.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_10.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_10.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/sqshq/sqshq_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => dfd}/TUHH-Models/yidongnan/yidongnan_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/AudiA6C8_base.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/AudiA6C8_base.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/AudiA6C8_base.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/AudiA6C8_base.system (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/AudiA6C8_base.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/CoCarNextGen_base.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/CoCarNextGen_base.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoCarNextGen_Base/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoronaWarnApp/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoronaWarnApp/cwa.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoronaWarnApp/default.allocation (100%) create mode 100644 bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.datadictionary create mode 100644 bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.dataflowdiagram rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoronaWarnApp/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoronaWarnApp/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoronaWarnApp/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoronaWarnApp/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoronaWarnApp/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/CoronaWarnApp/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/MaaS_Ticket_System_base/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/MaaS_Ticket_System_base/MaaS.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/MaaS_Ticket_System_base/MaaS.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/MaaS_Ticket_System_base/MaaS.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/MaaS_Ticket_System_base/MaaS.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/MaaS_Ticket_System_base/MaaS.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/MaaS_Ticket_System_base/MaaS.system (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/MaaS_Ticket_System_base/MaaS.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/MaaS_Ticket_System_base/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/TravelPlanner/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/TravelPlanner/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/TravelPlanner/travelPlanner.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/TravelPlanner/travelPlanner.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/TravelPlanner/travelPlanner.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/TravelPlanner/travelPlanner.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/TravelPlanner/travelPlanner.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/TravelPlanner/travelPlanner.system (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/{ => pcm}/TravelPlanner/travelPlanner.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDSimpleModels/DeadOutPin.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDSimpleModels/DeadOutPin.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDSimpleModels/UnusedInput.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDSimpleModels/UnusedInput.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDSimpleModels/WrongFlowName.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDSimpleModels/WrongFlowName.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDTestModels/BranchingTest.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDTestModels/BranchingTest.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDTestModels/complexPseudoCycle.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDTestModels/complexPseudoCycle.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDTestModels/minimal.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDTestModels/minimal.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDTestModels/project.txt (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/DFDTestModels/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/OnlineShopDFD/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/OnlineShopDFD/onlineshop.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/OnlineShopDFD/onlineshop.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/OnlineShopDFDsimple/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/OnlineShopDFDsimple/onlineshop.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/OnlineShopDFDsimple/onlineshop.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/simpleLoopDFD/loopDFD.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => dfd}/simpleLoopDFD/loopDFD.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/BranchingOnlineShop/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/BranchingOnlineShop/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/BranchingOnlineShop/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/BranchingOnlineShop/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/BranchingOnlineShop/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/BranchingOnlineShop/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/BranchingOnlineShop/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/BranchingOnlineShop/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/BranchingOnlineShop/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/CompositeCharacteristicsTest/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/CompositeCharacteristicsTest/composite.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/CompositeCharacteristicsTest/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/CompositeCharacteristicsTest/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/CompositeCharacteristicsTest/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/CompositeCharacteristicsTest/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/CompositeCharacteristicsTest/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/CompositeCharacteristicsTest/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/CompositeCharacteristicsTest/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/CompositeCharacteristicsTest/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/IgnoredNodeTest/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/IgnoredNodeTest/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/IgnoredNodeTest/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/IgnoredNodeTest/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/IgnoredNodeTest/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/IgnoredNodeTest/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/IgnoredNodeTest/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/IgnoredNodeTest/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/IgnoredNodeTest/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/InternationalOnlineShop/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/InternationalOnlineShop/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/InternationalOnlineShop/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/InternationalOnlineShop/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/InternationalOnlineShop/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/InternationalOnlineShop/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/InternationalOnlineShop/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/InternationalOnlineShop/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/InternationalOnlineShop/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{OneAssemblyMultipleResourceContainerTest => pcm/MultipleDeployments}/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{OneAssemblyMultipleResourceContainerTest => pcm/MultipleDeployments}/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{OneAssemblyMultipleResourceContainerTest => pcm/MultipleDeployments}/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{OneAssemblyMultipleResourceContainerTest => pcm/MultipleDeployments}/default.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{OneAssemblyMultipleResourceContainerTest => pcm/MultipleDeployments}/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{OneAssemblyMultipleResourceContainerTest => pcm/MultipleDeployments}/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{OneAssemblyMultipleResourceContainerTest => pcm/MultipleDeployments}/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{OneAssemblyMultipleResourceContainerTest => pcm/MultipleDeployments}/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{OneAssemblyMultipleResourceContainerTest => pcm/MultipleDeployments}/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/NodeCharacteristicsTest/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/NodeCharacteristicsTest/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/NodeCharacteristicsTest/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/NodeCharacteristicsTest/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/NodeCharacteristicsTest/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/NodeCharacteristicsTest/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/NodeCharacteristicsTest/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/NodeCharacteristicsTest/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ => pcm}/NodeCharacteristicsTest/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ReturnTestModel => pcm/VariableReturn}/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ReturnTestModel => pcm/VariableReturn}/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ReturnTestModel => pcm/VariableReturn}/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ReturnTestModel => pcm/VariableReturn}/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ReturnTestModel => pcm/VariableReturn}/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ReturnTestModel => pcm/VariableReturn}/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ReturnTestModel => pcm/VariableReturn}/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ReturnTestModel => pcm/VariableReturn}/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/models/{ReturnTestModel => pcm/VariableReturn}/representations.aird (100%) create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedCharacteristic.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMExampleModelResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java diff --git a/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF b/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF index a9dee4a..7540b0e 100644 --- a/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF +++ b/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF @@ -4,8 +4,13 @@ Bundle-Name: DFA Example Models Bundle-SymbolicName: org.dataflowanalysis.examplemodels Bundle-Version: 4.0.0.qualifier Require-Bundle: org.eclipse.core.runtime, - com.google.guava + com.google.guava, + org.dataflowanalysis.analysis, + org.dataflowanalysis.analysis.pcm, + org.dataflowanalysis.analysis.dfd Automatic-Module-Name: org.dataflowanalysis.examplemodels Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.dataflowanalysis.examplemodels +Export-Package: org.dataflowanalysis.examplemodels, + org.dataflowanalysis.examplemodels.results, + org.dataflowanalysis.examplemodels.results.pcm diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_11.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_11.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_12.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_12.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_6.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_6.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_7.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_7.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_8.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_8.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_9.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/anilallewar/anilallewar_9.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_12.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_12.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_2.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_2.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_4.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_4.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_6.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_6.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_7.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_7.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_8.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/apssouza22/apssouza22_8.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_11.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_11.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_2.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_2.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_6.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/callistaenterprise/callistaenterprise_6.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_10.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_10.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_10.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_10.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_10.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_10.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_12.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_12.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_5.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/ewolff/ewolff_5.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/fernandoabcampos/fernandoabcampos_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/fernandoabcampos/fernandoabcampos_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/fernandoabcampos/fernandoabcampos_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/fernandoabcampos/fernandoabcampos_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_10.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_10.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_10.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_10.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_10.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_10.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_11.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_11.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_12.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_12.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_2.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_2.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_3.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_3.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_4.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_4.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_5.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_5.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_6.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_6.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_7.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_7.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_8.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/georgwittberger/georgwittberger_8.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_2.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_2.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_3.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_3.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_5.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_5.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_6.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_6.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_7.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_7.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_8.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_8.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_9.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/jferrater/jferrater_9.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_1.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_1.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_10.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_10.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_10.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_10.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_11.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_11.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_12.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_12.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_2.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_2.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_3.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_3.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_4.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_4.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_5.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_5.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_6.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_6.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_7.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_7.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_8.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_8.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_9.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/koushikkothagal/koushikkothagal_9.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mdeket/mdeket_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mdeket/mdeket_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mdeket/mdeket_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mdeket/mdeket_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mdeket/mdeket_5.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mdeket/mdeket_5.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_11.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_11.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_2.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_2.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_4.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_4.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_5.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_5.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_7.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_7.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_8.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/mudigal-technologies/mudigal-technologies_8.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_10.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_10.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_12.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_12.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/rohitghatol/rohitghatol_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_2.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_2.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_3.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_3.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_5.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_5.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_6.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_6.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_7.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_7.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_8.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_8.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_9.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/spring-petclinic/spring-petclinic_9.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_10.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_10.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_10.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_10.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_10.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_10.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_11.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_11.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_12.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_12.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_6.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_6.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_7.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_7.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_8.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_8.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_9.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/sqshq/sqshq_9.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_0.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_0.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_18.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_18.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_2.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_2.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_3.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_3.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_4.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_4.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_5.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_5.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_6.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_6.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_7.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_7.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_8.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_8.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_9.json b/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TUHH-Models/yidongnan/yidongnan_9.json rename to bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/.project b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/.project rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.allocation b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.allocation rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.pddc b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.pddc rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.repository b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.repository rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.system b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.system rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.usagemodel b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/CoCarNextGen_base.repository b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/CoCarNextGen_base.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/CoCarNextGen_base.repository rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/CoCarNextGen_base.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/CoCarNextGen_base.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/CoCarNextGen_base.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/CoCarNextGen_base.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/CoCarNextGen_base.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/representations.aird b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/.project b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/.project rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/cwa.pddc b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/cwa.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/cwa.pddc rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/cwa.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.allocation b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.datadictionary b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.datadictionary new file mode 100644 index 0000000..2be56bd --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.datadictionary @@ -0,0 +1,8811 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.dataflowdiagram new file mode 100644 index 0000000..30c7abb --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.dataflowdiagram @@ -0,0 +1,7922 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.repository b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.repository rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.system b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.system rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/representations.aird b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/.project b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/.project rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.allocation b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.allocation rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.pddc b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.pddc rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.repository b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.repository rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.system b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.system rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.usagemodel b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/representations.aird b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/.project b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/.project rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/representations.aird b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.allocation b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.allocation rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.pddc b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.pddc rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.repository b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.repository rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.system b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.system rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.usagemodel b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/DeadOutPin.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/DeadOutPin.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/DeadOutPin.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/DeadOutPin.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/DeadOutPin.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/DeadOutPin.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/DeadOutPin.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/DeadOutPin.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/UnusedInput.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/UnusedInput.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/UnusedInput.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/UnusedInput.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/UnusedInput.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/UnusedInput.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/UnusedInput.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/UnusedInput.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/WrongFlowName.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/WrongFlowName.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/WrongFlowName.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/WrongFlowName.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/WrongFlowName.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/WrongFlowName.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/WrongFlowName.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/WrongFlowName.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/BranchingTest.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/BranchingTest.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/BranchingTest.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/BranchingTest.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/BranchingTest.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/BranchingTest.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/BranchingTest.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/BranchingTest.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/complexPseudoCycle.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/complexPseudoCycle.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/complexPseudoCycle.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/complexPseudoCycle.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/complexPseudoCycle.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/complexPseudoCycle.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/complexPseudoCycle.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/complexPseudoCycle.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/minimal.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/minimal.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/minimal.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/minimal.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/minimal.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/minimal.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/minimal.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/minimal.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/project.txt b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/project.txt similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/project.txt rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/project.txt diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/.project b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/.project rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/onlineshop.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/onlineshop.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/onlineshop.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/onlineshop.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/onlineshop.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/onlineshop.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/onlineshop.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/onlineshop.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/.project b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/.project rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/onlineshop.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/onlineshop.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/onlineshop.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/onlineshop.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/onlineshop.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/onlineshop.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/onlineshop.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/onlineshop.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/simpleLoopDFD/loopDFD.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/simpleLoopDFD/loopDFD.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/simpleLoopDFD/loopDFD.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/simpleLoopDFD/loopDFD.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/simpleLoopDFD/loopDFD.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/simpleLoopDFD/loopDFD.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/simpleLoopDFD/loopDFD.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/simpleLoopDFD/loopDFD.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/composite.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/composite.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/composite.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/composite.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OneAssemblyMultipleResourceContainerTest/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/MultipleDeployments/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/ReturnTestModel/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/VariableReturn/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java new file mode 100644 index 0000000..cdc49f2 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java @@ -0,0 +1,32 @@ +package org.dataflowanalysis.examplemodels.results; + +import org.dataflowanalysis.analysis.core.AbstractVertex; +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.examplemodels.Activator; +import org.eclipse.core.runtime.Plugin; + +import java.util.List; + +public interface ExampleModelResult { + default String getModelProjectName() { + return "org.dataflowanalysis.examplemodels"; + } + + default Class getPluginActivator() { + return Activator.class; + } + + default String getBaseFolderName() { + return "models"; + } + + default String getFileName() { + return "default"; + } + + String getModelName(); + + AnalysisConstraint getDSLConstraint(); + + List getExpectedViolations(); +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedCharacteristic.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedCharacteristic.java new file mode 100644 index 0000000..e1b6751 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedCharacteristic.java @@ -0,0 +1,9 @@ +package org.dataflowanalysis.examplemodels.results; + +public record ExpectedCharacteristic(String characteristicType, String characteristicLiteral) { + + @Override + public String toString() { + return String.format("%s.%s", characteristicType, characteristicLiteral); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java new file mode 100644 index 0000000..627d73b --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java @@ -0,0 +1,65 @@ +package org.dataflowanalysis.examplemodels.results; + +import de.uka.ipd.sdq.identifier.Identifier; +import org.dataflowanalysis.analysis.core.AbstractVertex; +import org.dataflowanalysis.analysis.core.CharacteristicValue; +import org.dataflowanalysis.analysis.core.DataCharacteristic; +import org.dataflowanalysis.analysis.pcm.core.AbstractPCMVertex; + +import java.util.*; + +public class ExpectedViolation { + private final UUID nodeID; + private final List vertexCharacteristics; + private final Map> dataCharacteristics; + + public ExpectedViolation(UUID nodeID, List vertexCharacteristics, + Map> dataCharacteristics) { + this.nodeID = nodeID; + this.vertexCharacteristics = vertexCharacteristics; + this.dataCharacteristics = dataCharacteristics; + } + + public boolean references(AbstractVertex element) { + return false; //element.getUniqueIdentifier().equals(this.nodeID); + } + + public List hasNodeCharacteristic(List actualCharacteristics) { + return this.vertexCharacteristics.stream().filter(it -> !this.hasCharacteristicValue(it, actualCharacteristics)).toList(); + + } + + public Map> hasDataCharacteristics(List actualDataCharacteristics) { + Map> missingDataCharacteristics = new HashMap<>(); + for (var expectedDataCharacteristic : dataCharacteristics.entrySet()) { + Optional actualDataCharacteristic = actualDataCharacteristics.stream() + .filter(it -> it.getVariableName().equals(expectedDataCharacteristic.getKey())) + .findAny(); + if (actualDataCharacteristic.isEmpty()) { + missingDataCharacteristics.put(expectedDataCharacteristic.getKey(), expectedDataCharacteristic.getValue()); + continue; + } + List expectedCharacteristics = expectedDataCharacteristic.getValue(); + List missingCharacteristics = new ArrayList<>(); + for (var expectedCharacteristic : expectedCharacteristics) { + if (!this.hasCharacteristicValue(expectedCharacteristic, actualDataCharacteristic.get().getAllCharacteristics())) { + missingCharacteristics.add(expectedCharacteristic); + } + } + if (!missingCharacteristics.isEmpty()) { + missingDataCharacteristics.put(expectedDataCharacteristic.getKey(), missingCharacteristics); + } + } + return missingDataCharacteristics; + } + + private boolean hasCharacteristicValue(ExpectedCharacteristic expectedCharacteristic, List actualCharacteristics) { + return actualCharacteristics.stream() + .filter(it -> expectedCharacteristic.characteristicType().equals(it.getTypeName())) + .anyMatch(it -> expectedCharacteristic.characteristicLiteral().equals(it.getValueName())); + } + + public UUID getNodeID() { + return nodeID; + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java new file mode 100644 index 0000000..6ac8f58 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java @@ -0,0 +1,38 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExampleModelResult; +import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; +import java.util.Map; +import java.util.UUID; + +public class BranchingOnlineShopResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "BranchingOnlineShop"; + } + @Override + public AnalysisConstraint getDSLConstraint() { + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java new file mode 100644 index 0000000..aa37921 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java @@ -0,0 +1,42 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; +import java.util.Map; +import java.util.UUID; + +public class InternationalOnlineShopResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "InternationalOnlineShop"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + return List.of( + new ExpectedViolation(UUID.fromString("74b8d8a8-d110-3c5a-aca0-0092db3ec931"), List.of(new ExpectedCharacteristic("ServerLocation", "nonEU")), + Map.of("userData", List.of(new ExpectedCharacteristic("DataSensitivity", "Personal")))), + new ExpectedViolation(UUID.fromString("f362790a-49d7-3c22-8558-7232ba02d577"), List.of(new ExpectedCharacteristic("ServerLocation", "nonEU")), + Map.of("userData", List.of(new ExpectedCharacteristic("DataSensitivity", "Personal"))))); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java new file mode 100644 index 0000000..f33c155 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java @@ -0,0 +1,44 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; +import java.util.Map; +import java.util.UUID; + +public class MultipleDeploymentsResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "MultipleDeployments"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + return List.of( + new ExpectedViolation(UUID.fromString("838571d3-277b-392f-9ac4-6b4d4ceddf56"), + List.of(new ExpectedCharacteristic("ServerLocation", "nonEU"), new ExpectedCharacteristic("ServerLocation", "EU")), + Map.of("userdata", List.of(new ExpectedCharacteristic("DataSensitivity", "Personal")))), + new ExpectedViolation(UUID.fromString("a9ea02e4-d182-3bb2-bf18-edae674488c7"), + List.of(new ExpectedCharacteristic("ServerLocation", "nonEU"), new ExpectedCharacteristic("ServerLocation", "EU")), + Map.of("userdata", List.of(new ExpectedCharacteristic("DataSensitivity", "Personal"))))); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMExampleModelResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMExampleModelResult.java new file mode 100644 index 0000000..cdf0f32 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMExampleModelResult.java @@ -0,0 +1,19 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.examplemodels.results.ExampleModelResult; + +import java.nio.file.Paths; + +public interface PCMExampleModelResult extends ExampleModelResult { + default String getUsageModelPath() { + return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.usagemodel", this.getFileName())).toString(); + } + + default String getAllocationModelPath() { + return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.allocation", this.getFileName())).toString(); + } + + default String getNodeCharacteristicsModelPath() { + return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.nodecharacteristics", this.getFileName())).toString(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java new file mode 100644 index 0000000..59712fa --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java @@ -0,0 +1,67 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.analysis.dsl.selectors.Intersection; +import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; +import java.util.Map; +import java.util.UUID; + +public class TravelPlannerResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "casestudies"; + } + + @Override + public String getModelName() { + return "TravelPlanner"; + } + + @Override + public String getFileName() { + return "travelPlanner"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + return new ConstraintDSL() + .ofData() + .withLabel("GrantedRoles", ConstraintVariable.of("grantedRoles")) + .neverFlows() + .toVertex() + .withCharacteristic("AssignedRoles", ConstraintVariable.of("assignedRoles")) + .where() + .isNotEmpty(ConstraintVariable.of("grantedRoles")) + .isNotEmpty(ConstraintVariable.of("assignedRoles")) + .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) + .create(); + } + + @Override + public List getExpectedViolations() { + return List.of( + new ExpectedViolation(UUID.fromString("2214df8e-6d69-3738-83a2-1b91df85e9af"), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), + Map.of("flight", + List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline")), + "ccd", List.of(new ExpectedCharacteristic("GrantedRoles", "User")))), + new ExpectedViolation(UUID.fromString("5bdd20eb-7450-3772-974f-87e31009847e"), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), + Map.of("flight", + List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline")), + "ccd", List.of(new ExpectedCharacteristic("GrantedRoles", "User")))), + new ExpectedViolation(UUID.fromString("207639fc-5022-354e-8ffd-7b20885b469e"), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), + Map.of("flight", + List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline")), + "ccd", List.of(new ExpectedCharacteristic("GrantedRoles", "User")), "RETURN", + List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline"))))); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java new file mode 100644 index 0000000..4a6edc1 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java @@ -0,0 +1,48 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.analysis.dsl.selectors.Intersection; +import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; +import java.util.Map; +import java.util.UUID; + +public class VariableReturnResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "VariableReturn"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + return new ConstraintDSL() + .ofData() + .withLabel("AssignedRole", ConstraintVariable.of("grantedRoles")) + .neverFlows() + .toVertex() + .withCharacteristic("AssignedRole", ConstraintVariable.of("assignedRoles")) + .where() + .isNotEmpty(ConstraintVariable.of("grantedRoles")) + .isNotEmpty(ConstraintVariable.of("assignedRoles")) + .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) + .create(); + } + + @Override + public List getExpectedViolations() { + return List.of( + new ExpectedViolation(UUID.fromString("faaf62e5-405f-385c-96f1-c01d378193a6"), List.of(new ExpectedCharacteristic("AssignedRole", "User")), + Map.of("RETURN", List.of(new ExpectedCharacteristic("AssignedRole", "Admin")))), + new ExpectedViolation(UUID.fromString("843a03df-2250-3227-b4b2-108318912005"), List.of(new ExpectedCharacteristic("AssignedRole", "User")), + Map.of("data", List.of(new ExpectedCharacteristic("AssignedRole", "Admin"))))); + } + + @Override + public String toString() { + return this.getModelName(); + } +} From c0103d8c39c6fc67ab923866ea45fcae5d5b131b Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Tue, 26 Nov 2024 11:49:16 +0100 Subject: [PATCH 02/15] feat: add preliminary result containers for each example model and most case studies --- .../.project | 0 .../pcm/CoCarNextGen/AudiA6C8.allocation | 129 + .../CoCarNextGen/AudiA6C8.nodecharacteristics | 220 + .../AudiA6C8.pddc} | 0 .../AudiA6C8.repository} | 206 +- .../AudiA6C8.resourceenvironment} | 2 +- .../AudiA6C8.system} | 310 +- .../AudiA6C8.usagemodel} | 64 +- .../CoCarNextGen.repository} | 0 .../CoCarNextGen.resourceenvironment} | 0 .../representations.aird | 7394 ++++++++--------- .../org.eclipse.core.resources.prefs | 2 - .../AudiA6C8_base.allocation | 129 - .../AudiA6C8_base.nodecharacteristics | 220 - .../CoronaWarnApp/{cwa.pddc => default.pddc} | 0 .../pcm/CoronaWarnApp/representations.aird | 2 +- .../.project | 0 .../MaaS.allocation | 0 .../MaaS.nodecharacteristics | 0 .../MaaS.pddc | 0 .../MaaS.repository | 0 .../MaaS.resourceenvironment | 0 .../MaaS.system | 0 .../MaaS.usagemodel | 0 .../representations.aird | 0 .../BranchingTest.datadictionary | 0 .../BranchingTest.dataflowdiagram | 0 .../complexPseudoCycle.datadictionary | 0 .../complexPseudoCycle.dataflowdiagram | 0 .../models/dfd/DFDTestModels/project.txt | 12 - .../dfd/DFDTestModels/representations.aird | 2 - .../DeadOutPin.datadictionary | 0 .../DeadOutPin.dataflowdiagram | 0 .../minimal.datadictionary | 0 .../minimal.dataflowdiagram | 0 .../{OnlineShopDFD => OnlineShop}/.project | 0 .../onlineshop.datadictionary | 0 .../onlineshop.dataflowdiagram | 0 .../loopDFD.datadictionary | 0 .../loopDFD.dataflowdiagram | 0 .../.project | 0 .../onlineshop.datadictionary | 0 .../onlineshop.dataflowdiagram | 0 .../UnusedInput.datadictionary | 0 .../UnusedInput.dataflowdiagram | 0 .../WrongFlowName.datadictionary | 0 .../WrongFlowName.dataflowdiagram | 0 .../results/ExpectedViolation.java | 2 +- .../results/dfd/BranchingResult.java | 37 + .../results/dfd/ComplexPseudoCycleResult.java | 37 + .../results/dfd/DFDExampleModelResult.java | 15 + .../results/dfd/DeadOutPinResult.java | 38 + .../results/dfd/MinimalResult.java | 37 + .../results/dfd/OnlineShopResult.java | 37 + .../results/dfd/SimpleLoopResult.java | 38 + .../results/dfd/SimpleOnlineShopResult.java | 37 + .../results/dfd/UnusedInputResult.java | 38 + .../results/dfd/WrongFlowNameResult.java | 38 + .../results/pcm/CoCarResult.java | 53 + .../results/pcm/CompositeResult.java | 46 + .../results/pcm/CoronaWarnAppResult.java | 47 + .../results/pcm/IgnoredNodesResult.java | 46 + .../results/pcm/MaaSTicketSystemResult.java | 53 + .../pcm/NodeCharacteristicsResult.java | 46 + 64 files changed, 4982 insertions(+), 4355 deletions(-) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{CoCarNextGen_Base => CoCarNextGen}/.project (100%) create mode 100644 bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{CoCarNextGen_Base/AudiA6C8_base.pddc => CoCarNextGen/AudiA6C8.pddc} (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{CoCarNextGen_Base/AudiA6C8_base.repository => CoCarNextGen/AudiA6C8.repository} (95%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{CoCarNextGen_Base/AudiA6C8_base.resourceenvironment => CoCarNextGen/AudiA6C8.resourceenvironment} (99%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{CoCarNextGen_Base/AudiA6C8_base.system => CoCarNextGen/AudiA6C8.system} (67%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{CoCarNextGen_Base/AudiA6C8_base.usagemodel => CoCarNextGen/AudiA6C8.usagemodel} (85%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{CoCarNextGen_Base/CoCarNextGen_base.repository => CoCarNextGen/CoCarNextGen.repository} (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{CoCarNextGen_Base/CoCarNextGen_base.resourceenvironment => CoCarNextGen/CoCarNextGen.resourceenvironment} (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{CoCarNextGen_Base => CoCarNextGen}/representations.aird (93%) delete mode 100644 bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs delete mode 100644 bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/{cwa.pddc => default.pddc} (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{MaaS_Ticket_System_base => MaaSTicketSystem}/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{MaaS_Ticket_System_base => MaaSTicketSystem}/MaaS.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{MaaS_Ticket_System_base => MaaSTicketSystem}/MaaS.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{MaaS_Ticket_System_base => MaaSTicketSystem}/MaaS.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{MaaS_Ticket_System_base => MaaSTicketSystem}/MaaS.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{MaaS_Ticket_System_base => MaaSTicketSystem}/MaaS.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{MaaS_Ticket_System_base => MaaSTicketSystem}/MaaS.system (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{MaaS_Ticket_System_base => MaaSTicketSystem}/MaaS.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/{MaaS_Ticket_System_base => MaaSTicketSystem}/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDTestModels => Branching}/BranchingTest.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDTestModels => Branching}/BranchingTest.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDTestModels => ComplexPseudoCycle}/complexPseudoCycle.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDTestModels => ComplexPseudoCycle}/complexPseudoCycle.dataflowdiagram (100%) delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/project.txt delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/representations.aird rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDSimpleModels => DeadOutPin}/DeadOutPin.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDSimpleModels => DeadOutPin}/DeadOutPin.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDTestModels => Minimal}/minimal.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDTestModels => Minimal}/minimal.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{OnlineShopDFD => OnlineShop}/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{OnlineShopDFD => OnlineShop}/onlineshop.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{OnlineShopDFD => OnlineShop}/onlineshop.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{simpleLoopDFD => SimpleLoop}/loopDFD.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{simpleLoopDFD => SimpleLoop}/loopDFD.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{OnlineShopDFDsimple => SimpleOnlineShop}/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{OnlineShopDFDsimple => SimpleOnlineShop}/onlineshop.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{OnlineShopDFDsimple => SimpleOnlineShop}/onlineshop.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDSimpleModels => UnusedInput}/UnusedInput.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDSimpleModels => UnusedInput}/UnusedInput.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDSimpleModels => WrongFlowName}/WrongFlowName.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/{DFDSimpleModels => WrongFlowName}/WrongFlowName.dataflowdiagram (100%) create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/.project b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/.project rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.allocation b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.allocation new file mode 100644 index 0000000..e36ba11 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.allocation @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics new file mode 100644 index 0000000..2d4c2c9 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.pddc b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.pddc rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.repository b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.repository similarity index 95% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.repository rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.repository index 82b94dd..17cca29 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.repository +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.repository @@ -1,5 +1,5 @@ - + @@ -85,8 +85,8 @@ - - + + @@ -172,8 +172,8 @@ - - + + @@ -411,8 +411,8 @@ - - + + @@ -625,16 +625,16 @@ - - + + - - + + @@ -688,24 +688,24 @@ - - + + - - + + - - + + @@ -914,8 +914,8 @@ - - + + @@ -944,8 +944,8 @@ - - + + @@ -968,8 +968,8 @@ - - + + @@ -998,8 +998,8 @@ - - + + @@ -1022,8 +1022,8 @@ - - + + @@ -1052,8 +1052,8 @@ - - + + @@ -1076,8 +1076,8 @@ - - + + @@ -1106,8 +1106,8 @@ - - + + @@ -1130,8 +1130,8 @@ - - + + @@ -1160,8 +1160,8 @@ - - + + @@ -1184,8 +1184,8 @@ - - + + @@ -1214,8 +1214,8 @@ - - + + @@ -1238,8 +1238,8 @@ - - + + @@ -1268,8 +1268,8 @@ - - + + @@ -1292,8 +1292,8 @@ - - + + @@ -1317,8 +1317,8 @@ - - + + @@ -1347,8 +1347,8 @@ - - + + @@ -1371,8 +1371,8 @@ - - + + @@ -1396,8 +1396,8 @@ - - + + @@ -1426,8 +1426,8 @@ - - + + @@ -1456,8 +1456,8 @@ - - + + @@ -1531,8 +1531,8 @@ - - + + @@ -1550,8 +1550,8 @@ - - + + @@ -1575,8 +1575,8 @@ - - + + @@ -1588,8 +1588,8 @@ - - + + @@ -1647,8 +1647,8 @@ - - + + @@ -1703,8 +1703,8 @@ - - + + @@ -1742,8 +1742,8 @@ - - + + @@ -1781,16 +1781,16 @@ - - + + - - + + @@ -1838,8 +1838,8 @@ - - + + @@ -1877,16 +1877,16 @@ - - + + - - + + @@ -1903,16 +1903,16 @@ - - + + - - + + @@ -1941,8 +1941,8 @@ - - + + @@ -1962,16 +1962,16 @@ - - + + - - + + @@ -1995,16 +1995,16 @@ - - + + - - + + @@ -2051,16 +2051,16 @@ - - + + - - + + @@ -2363,8 +2363,8 @@ - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.resourceenvironment similarity index 99% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.resourceenvironment index fcb53a1..9a761bc 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.resourceenvironment @@ -1,5 +1,5 @@ - + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.system b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.system similarity index 67% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.system rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.system index 228e61d..d98d500 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.system +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.system @@ -1,353 +1,353 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.usagemodel b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.usagemodel similarity index 85% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.usagemodel index fe865b4..62342ed 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.usagemodel +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.usagemodel @@ -5,30 +5,30 @@ - - + + - - + + - - + + - - + + @@ -42,8 +42,8 @@ - - + + @@ -52,8 +52,8 @@ - - + + @@ -62,8 +62,8 @@ - - + + @@ -82,8 +82,8 @@ - - + + @@ -92,8 +92,8 @@ - - + + @@ -102,12 +102,12 @@ - - + + - - + + @@ -116,8 +116,8 @@ - - + + @@ -139,8 +139,8 @@ - - + + @@ -149,8 +149,8 @@ - - + + @@ -159,8 +159,8 @@ - - + + @@ -169,8 +169,8 @@ - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/CoCarNextGen_base.repository b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/CoCarNextGen.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/CoCarNextGen_base.repository rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/CoCarNextGen.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/CoCarNextGen_base.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/CoCarNextGen.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/CoCarNextGen_base.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/CoCarNextGen.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/representations.aird b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/representations.aird similarity index 93% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/representations.aird index be1ff37..7efb72a 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/representations.aird +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/representations.aird @@ -4,165 +4,165 @@ pathmap://PCM_MODELS/Palladio.resourcetype pathmap://PCM_MODELS/PrimitiveTypes.repository pathmap://PCM_MODELS/FailureTypes.repository - AudiA6C8_base.repository - AudiA6C8_base.resourceenvironment - CoCarNextGen_base.resourceenvironment - AudiA6C8_base.repository - AudiA6C8_base.system - AudiA6C8_base.allocation - AudiA6C8_base.pddc - AudiA6C8_base.nodecharacteristics - AudiA6C8_base.usagemodel + AudiA6C8.repository + AudiA6C8.resourceenvironment + CoCarNextGen.resourceenvironment + AudiA6C8.repository + AudiA6C8.system + AudiA6C8.allocation + AudiA6C8.pddc + AudiA6C8.nodecharacteristics + AudiA6C8.usagemodel - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -184,42 +184,42 @@ - + - + - + - + - + - + - + - + - + @@ -256,51 +256,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -313,77 +313,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -396,7 +396,7 @@ - + @@ -4244,8 +4244,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4254,8 +4254,8 @@ - - + + @@ -4263,8 +4263,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4273,8 +4273,8 @@ - - + + @@ -4282,8 +4282,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4292,8 +4292,8 @@ - - + + @@ -4301,8 +4301,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4311,8 +4311,8 @@ - - + + @@ -4320,8 +4320,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4330,8 +4330,8 @@ - - + + @@ -4339,8 +4339,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4349,8 +4349,8 @@ - - + + @@ -4358,8 +4358,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4368,8 +4368,8 @@ - - + + @@ -4377,8 +4377,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4387,8 +4387,8 @@ - - + + @@ -4396,8 +4396,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4406,8 +4406,8 @@ - - + + @@ -4415,8 +4415,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4425,8 +4425,8 @@ - - + + @@ -4434,8 +4434,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4444,8 +4444,8 @@ - - + + @@ -4453,8 +4453,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4463,8 +4463,8 @@ - - + + @@ -4472,8 +4472,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4482,8 +4482,8 @@ - - + + @@ -4491,8 +4491,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4501,8 +4501,8 @@ - - + + @@ -4510,8 +4510,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4520,8 +4520,8 @@ - - + + @@ -4529,8 +4529,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4539,16 +4539,16 @@ - - + + - - + + @@ -4556,8 +4556,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4566,8 +4566,8 @@ - - + + @@ -4575,8 +4575,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4585,8 +4585,8 @@ - - + + @@ -4594,8 +4594,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4604,8 +4604,8 @@ - - + + @@ -4613,8 +4613,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4623,24 +4623,24 @@ - - + + - - + + - - + + @@ -4648,8 +4648,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4658,16 +4658,16 @@ - - + + - - + + @@ -4675,8 +4675,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4685,8 +4685,8 @@ - - + + @@ -4694,8 +4694,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4704,16 +4704,16 @@ - - + + - - + + @@ -4721,8 +4721,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4731,16 +4731,16 @@ - - + + - - + + @@ -4748,8 +4748,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4758,8 +4758,8 @@ - - + + @@ -4767,8 +4767,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4777,48 +4777,48 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -4826,8 +4826,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4836,56 +4836,56 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -4893,8 +4893,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4903,16 +4903,16 @@ - - + + - - + + @@ -4920,15 +4920,15 @@ - - + + - - + + @@ -4936,8 +4936,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4946,8 +4946,8 @@ - - + + @@ -4955,8 +4955,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4965,8 +4965,8 @@ - - + + @@ -4974,8 +4974,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -4984,15 +4984,15 @@ - - + + - - + + @@ -5000,24 +5000,24 @@ - - + + - - + + - - + + @@ -5025,8 +5025,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5035,15 +5035,15 @@ - - + + - - + + @@ -5051,24 +5051,24 @@ - - + + - - + + - - + + @@ -5076,8 +5076,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5086,23 +5086,23 @@ - - + + - - + + - - + + @@ -5110,24 +5110,24 @@ - - + + - - + + - - + + @@ -5135,8 +5135,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5145,23 +5145,23 @@ - - + + - - + + - - + + @@ -5169,24 +5169,24 @@ - - + + - - + + - - + + @@ -5194,8 +5194,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5204,23 +5204,23 @@ - - + + - - + + - - + + @@ -5228,24 +5228,24 @@ - - + + - - + + - - + + @@ -5253,8 +5253,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5263,55 +5263,55 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -5319,24 +5319,24 @@ - - + + - - + + - - + + @@ -5344,8 +5344,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5354,15 +5354,15 @@ - - + + - - + + @@ -5370,24 +5370,24 @@ - - + + - - + + - - + + @@ -5395,8 +5395,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5405,15 +5405,15 @@ - - + + - - + + @@ -5421,24 +5421,24 @@ - - + + - - + + - - + + @@ -5446,8 +5446,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5456,31 +5456,31 @@ - - + + - - + + - - + + - - + + @@ -5488,24 +5488,24 @@ - - + + - - + + - - + + @@ -5513,8 +5513,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5523,15 +5523,15 @@ - - + + - - + + @@ -5539,24 +5539,24 @@ - - + + - - + + - - + + @@ -5564,8 +5564,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5574,15 +5574,15 @@ - - + + - - + + @@ -5590,24 +5590,24 @@ - - + + - - + + - - + + @@ -5615,8 +5615,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5625,15 +5625,15 @@ - - + + - - + + @@ -5641,24 +5641,24 @@ - - + + - - + + - - + + @@ -5666,8 +5666,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5676,15 +5676,15 @@ - - + + - - + + @@ -5692,24 +5692,24 @@ - - + + - - + + - - + + @@ -5717,8 +5717,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5727,15 +5727,15 @@ - - + + - - + + @@ -5743,24 +5743,24 @@ - - + + - - + + - - + + @@ -5768,8 +5768,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5778,15 +5778,15 @@ - - + + - - + + @@ -5794,24 +5794,24 @@ - - + + - - + + - - + + @@ -5819,8 +5819,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5829,15 +5829,15 @@ - - + + - - + + @@ -5845,24 +5845,24 @@ - - + + - - + + - - + + @@ -5870,8 +5870,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -5880,127 +5880,127 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -6008,24 +6008,24 @@ - - + + - - + + - - + + @@ -6033,8 +6033,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6043,15 +6043,15 @@ - - + + - - + + @@ -6059,24 +6059,24 @@ - - + + - - + + - - + + @@ -6084,8 +6084,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6094,23 +6094,23 @@ - - + + - - + + - - + + @@ -6118,24 +6118,24 @@ - - + + - - + + - - + + @@ -6143,8 +6143,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6153,15 +6153,15 @@ - - + + - - + + @@ -6169,24 +6169,24 @@ - - + + - - + + - - + + @@ -6194,8 +6194,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6204,15 +6204,15 @@ - - + + - - + + @@ -6220,24 +6220,24 @@ - - + + - - + + - - + + @@ -6245,22 +6245,22 @@ - - + + - - + + - - + + @@ -6268,24 +6268,24 @@ - - + + - - + + - - + + @@ -6293,8 +6293,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6303,15 +6303,15 @@ - - + + - - + + @@ -6319,24 +6319,24 @@ - - + + - - + + - - + + @@ -6344,8 +6344,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6354,15 +6354,15 @@ - - + + - - + + @@ -6370,24 +6370,24 @@ - - + + - - + + - - + + @@ -6395,22 +6395,22 @@ - - + + - - + + - - + + @@ -6418,24 +6418,24 @@ - - + + - - + + - - + + @@ -6443,8 +6443,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6453,55 +6453,55 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -6509,24 +6509,24 @@ - - + + - - + + - - + + @@ -6534,8 +6534,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6544,23 +6544,23 @@ - - + + - - + + - - + + @@ -6568,24 +6568,24 @@ - - + + - - + + - - + + @@ -6593,8 +6593,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6603,15 +6603,15 @@ - - + + - - + + @@ -6619,24 +6619,24 @@ - - + + - - + + - - + + @@ -6644,8 +6644,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6654,63 +6654,63 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -6718,8 +6718,8 @@ - - + + @@ -6727,16 +6727,16 @@ - - + + - - + + @@ -6744,8 +6744,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6754,15 +6754,15 @@ - - + + - - + + @@ -6770,24 +6770,24 @@ - - + + - - + + - - + + @@ -6795,8 +6795,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -6805,15 +6805,15 @@ - - + + - - + + @@ -6821,24 +6821,24 @@ - - + + - - + + - - + + @@ -6846,8 +6846,8 @@ - - + + @@ -6856,8 +6856,8 @@ - - + + @@ -6866,8 +6866,8 @@ - - + + @@ -6876,8 +6876,8 @@ - - + + @@ -6886,8 +6886,8 @@ - - + + @@ -6896,8 +6896,8 @@ - - + + 6001 @@ -6908,8 +6908,8 @@ - - + + @@ -6918,8 +6918,8 @@ - - + + @@ -6928,8 +6928,8 @@ - - + + @@ -6938,8 +6938,8 @@ - - + + @@ -6948,8 +6948,8 @@ - - + + @@ -6958,8 +6958,8 @@ - - + + @@ -6968,8 +6968,8 @@ - - + + @@ -6978,8 +6978,8 @@ - - + + @@ -6988,8 +6988,8 @@ - - + + @@ -6998,8 +6998,8 @@ - - + + @@ -7008,8 +7008,8 @@ - - + + @@ -7018,8 +7018,8 @@ - - + + @@ -7028,8 +7028,8 @@ - - + + @@ -7038,8 +7038,8 @@ - - + + @@ -7048,8 +7048,8 @@ - - + + @@ -7058,8 +7058,8 @@ - - + + @@ -7068,8 +7068,8 @@ - - + + @@ -7078,8 +7078,8 @@ - - + + @@ -7088,8 +7088,8 @@ - - + + @@ -7098,8 +7098,8 @@ - - + + @@ -7108,8 +7108,8 @@ - - + + @@ -7118,8 +7118,8 @@ - - + + @@ -7128,8 +7128,8 @@ - - + + @@ -7138,8 +7138,8 @@ - - + + @@ -7148,8 +7148,8 @@ - - + + @@ -7158,8 +7158,8 @@ - - + + @@ -7168,8 +7168,8 @@ - - + + @@ -7178,8 +7178,8 @@ - - + + @@ -7188,8 +7188,8 @@ - - + + @@ -7198,8 +7198,8 @@ - - + + @@ -7208,8 +7208,8 @@ - - + + @@ -7218,8 +7218,8 @@ - - + + @@ -7228,8 +7228,8 @@ - - + + @@ -7238,8 +7238,8 @@ - - + + @@ -7248,8 +7248,8 @@ - - + + @@ -7258,8 +7258,8 @@ - - + + @@ -7268,8 +7268,8 @@ - - + + @@ -7278,8 +7278,8 @@ - - + + @@ -7288,8 +7288,8 @@ - - + + @@ -7298,8 +7298,8 @@ - - + + @@ -7308,8 +7308,8 @@ - - + + @@ -7318,8 +7318,8 @@ - - + + @@ -7328,8 +7328,8 @@ - - + + @@ -7338,8 +7338,8 @@ - - + + @@ -7348,8 +7348,8 @@ - - + + @@ -7358,8 +7358,8 @@ - - + + @@ -7368,8 +7368,8 @@ - - + + @@ -7378,8 +7378,8 @@ - - + + @@ -7388,8 +7388,8 @@ - - + + @@ -7398,8 +7398,8 @@ - - + + @@ -7408,8 +7408,8 @@ - - + + @@ -7418,8 +7418,8 @@ - - + + @@ -7428,8 +7428,8 @@ - - + + @@ -7438,8 +7438,8 @@ - - + + @@ -7448,8 +7448,8 @@ - - + + @@ -7458,8 +7458,8 @@ - - + + @@ -7468,8 +7468,8 @@ - - + + @@ -7478,8 +7478,8 @@ - - + + 6001 @@ -7490,8 +7490,8 @@ - - + + @@ -7500,8 +7500,8 @@ - - + + @@ -7510,8 +7510,8 @@ - - + + @@ -7520,8 +7520,8 @@ - - + + @@ -7530,8 +7530,8 @@ - - + + @@ -7540,8 +7540,8 @@ - - + + @@ -7550,8 +7550,8 @@ - - + + @@ -7560,8 +7560,8 @@ - - + + @@ -7570,8 +7570,8 @@ - - + + @@ -7580,8 +7580,8 @@ - - + + @@ -7590,8 +7590,8 @@ - - + + @@ -7600,8 +7600,8 @@ - - + + @@ -7610,8 +7610,8 @@ - - + + @@ -7620,8 +7620,8 @@ - - + + @@ -7630,8 +7630,8 @@ - - + + @@ -7640,8 +7640,8 @@ - - + + @@ -7650,8 +7650,8 @@ - - + + @@ -7660,8 +7660,8 @@ - - + + @@ -7670,8 +7670,8 @@ - - + + @@ -7680,8 +7680,8 @@ - - + + @@ -7690,8 +7690,8 @@ - - + + @@ -7700,8 +7700,8 @@ - - + + @@ -7710,8 +7710,8 @@ - - + + @@ -7720,8 +7720,8 @@ - - + + @@ -7730,8 +7730,8 @@ - - + + @@ -7740,8 +7740,8 @@ - - + + @@ -7750,8 +7750,8 @@ - - + + @@ -7760,8 +7760,8 @@ - - + + @@ -7770,8 +7770,8 @@ - - + + @@ -7780,8 +7780,8 @@ - - + + @@ -7790,8 +7790,8 @@ - - + + @@ -7800,8 +7800,8 @@ - - + + @@ -7810,8 +7810,8 @@ - - + + @@ -7820,8 +7820,8 @@ - - + + 6001 @@ -7837,7 +7837,7 @@ - + @@ -8386,8 +8386,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8396,31 +8396,31 @@ - - + + - - + + - - + + - - + + @@ -8429,8 +8429,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8439,31 +8439,31 @@ - - + + - - + + - - + + - - + + @@ -8472,8 +8472,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8482,31 +8482,31 @@ - - + + - - + + - - + + - - + + @@ -8515,8 +8515,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8525,31 +8525,31 @@ - - + + - - + + - - + + - - + + @@ -8558,8 +8558,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8569,8 +8569,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8580,8 +8580,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8591,8 +8591,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8602,8 +8602,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8613,8 +8613,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8624,8 +8624,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8635,8 +8635,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8646,8 +8646,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8657,8 +8657,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8668,8 +8668,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8679,8 +8679,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8690,8 +8690,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8701,8 +8701,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -8712,7 +8712,7 @@ - + @@ -8720,7 +8720,7 @@ - + @@ -8728,7 +8728,7 @@ - + @@ -8736,7 +8736,7 @@ - + @@ -8744,7 +8744,7 @@ - + @@ -8752,7 +8752,7 @@ - + @@ -8760,7 +8760,7 @@ - + @@ -8768,7 +8768,7 @@ - + @@ -8776,7 +8776,7 @@ - + @@ -8784,7 +8784,7 @@ - + @@ -8792,7 +8792,7 @@ - + @@ -8800,7 +8800,7 @@ - + @@ -8808,7 +8808,7 @@ - + @@ -8816,7 +8816,7 @@ - + @@ -8824,7 +8824,7 @@ - + @@ -8832,7 +8832,7 @@ - + @@ -8840,7 +8840,7 @@ - + @@ -8848,7 +8848,7 @@ - + @@ -8858,7 +8858,7 @@ - + @@ -9294,16 +9294,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -9313,8 +9313,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -9323,30 +9323,30 @@ - - + + - - + + - - + + - - + + @@ -9356,8 +9356,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -9366,30 +9366,30 @@ - - + + - - + + - - + + - - + + @@ -9399,8 +9399,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -9409,30 +9409,30 @@ - - + + - - + + - - + + - - + + @@ -9442,8 +9442,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -9452,30 +9452,30 @@ - - + + - - + + - - + + - - + + @@ -9485,8 +9485,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -9495,30 +9495,30 @@ - - + + - - + + - - + + - - + + @@ -9528,8 +9528,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -9538,30 +9538,30 @@ - - + + - - + + - - + + - - + + @@ -9571,8 +9571,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -9581,15 +9581,15 @@ - - + + - - + + @@ -9598,7 +9598,7 @@ - + @@ -9606,7 +9606,7 @@ - + @@ -9614,7 +9614,7 @@ - + @@ -9622,7 +9622,7 @@ - + @@ -9630,7 +9630,7 @@ - + @@ -9638,7 +9638,7 @@ - + @@ -9646,7 +9646,7 @@ - + @@ -9654,7 +9654,7 @@ - + @@ -9665,7 +9665,7 @@ - + @@ -9715,23 +9715,23 @@ - - + + - - + + - + @@ -9742,7 +9742,7 @@ - + @@ -9792,23 +9792,23 @@ - - + + - - + + - + @@ -9819,7 +9819,7 @@ - + @@ -9869,23 +9869,23 @@ - - + + - - + + - + @@ -9896,7 +9896,7 @@ - + @@ -9946,23 +9946,23 @@ - - + + - - + + - + @@ -9973,7 +9973,7 @@ - + @@ -10023,23 +10023,23 @@ - - + + - - + + - + @@ -10050,7 +10050,7 @@ - + @@ -10100,23 +10100,23 @@ - - + + - - + + - + @@ -10127,7 +10127,7 @@ - + @@ -10219,16 +10219,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -10238,30 +10238,30 @@ - - + + - - + + - - + + - - + + @@ -10270,7 +10270,7 @@ - + @@ -10278,7 +10278,7 @@ - + @@ -10289,7 +10289,7 @@ - + @@ -10364,16 +10364,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -10383,15 +10383,15 @@ - - + + - + @@ -10399,7 +10399,7 @@ - + @@ -10410,7 +10410,7 @@ - + @@ -10502,16 +10502,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -10521,30 +10521,30 @@ - - + + - - + + - - + + - - + + @@ -10553,7 +10553,7 @@ - + @@ -10561,7 +10561,7 @@ - + @@ -10572,7 +10572,7 @@ - + @@ -10660,16 +10660,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -10679,22 +10679,22 @@ - - + + - - + + - - + + @@ -10703,7 +10703,7 @@ - + @@ -10711,7 +10711,7 @@ - + @@ -10722,7 +10722,7 @@ - + @@ -10810,16 +10810,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -10829,22 +10829,22 @@ - - + + - - + + - - + + @@ -10853,7 +10853,7 @@ - + @@ -10861,7 +10861,7 @@ - + @@ -10872,7 +10872,7 @@ - + @@ -10964,16 +10964,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -10983,30 +10983,30 @@ - - + + - - + + - - + + - - + + @@ -11015,7 +11015,7 @@ - + @@ -11023,7 +11023,7 @@ - + @@ -11034,7 +11034,7 @@ - + @@ -11122,16 +11122,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -11141,22 +11141,22 @@ - - + + - - + + - - + + @@ -11165,7 +11165,7 @@ - + @@ -11173,7 +11173,7 @@ - + @@ -11184,7 +11184,7 @@ - + @@ -11351,16 +11351,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -11370,8 +11370,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -11380,30 +11380,30 @@ - - + + - - + + - - + + - - + + @@ -11412,22 +11412,22 @@ - - + + - - + + - - + + @@ -11437,8 +11437,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -11447,23 +11447,23 @@ - - + + - - + + - - + + @@ -11472,7 +11472,7 @@ - + @@ -11480,7 +11480,7 @@ - + @@ -11488,7 +11488,7 @@ - + @@ -11499,7 +11499,7 @@ - + @@ -11666,16 +11666,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -11685,8 +11685,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -11695,30 +11695,30 @@ - - + + - - + + - - + + - - + + @@ -11727,22 +11727,22 @@ - - + + - - + + - - + + @@ -11752,8 +11752,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -11762,23 +11762,23 @@ - - + + - - + + - - + + @@ -11787,7 +11787,7 @@ - + @@ -11795,7 +11795,7 @@ - + @@ -11803,7 +11803,7 @@ - + @@ -11814,7 +11814,7 @@ - + @@ -11981,16 +11981,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -12000,37 +12000,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -12039,22 +12039,22 @@ - - + + - - + + - - + + @@ -12064,8 +12064,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -12074,23 +12074,23 @@ - - + + - - + + - - + + @@ -12099,7 +12099,7 @@ - + @@ -12107,7 +12107,7 @@ - + @@ -12115,7 +12115,7 @@ - + @@ -12126,7 +12126,7 @@ - + @@ -12293,16 +12293,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -12312,8 +12312,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -12322,30 +12322,30 @@ - - + + - - + + - - + + - - + + @@ -12354,22 +12354,22 @@ - - + + - - + + - - + + @@ -12379,30 +12379,30 @@ - - + + - - + + - - + + - - + + @@ -12411,7 +12411,7 @@ - + @@ -12419,7 +12419,7 @@ - + @@ -12427,7 +12427,7 @@ - + @@ -12438,7 +12438,7 @@ - + @@ -12605,16 +12605,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -12624,8 +12624,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -12634,30 +12634,30 @@ - - + + - - + + - - + + - - + + @@ -12666,22 +12666,22 @@ - - + + - - + + - - + + @@ -12691,8 +12691,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -12701,23 +12701,23 @@ - - + + - - + + - - + + @@ -12726,7 +12726,7 @@ - + @@ -12734,7 +12734,7 @@ - + @@ -12742,7 +12742,7 @@ - + @@ -12753,7 +12753,7 @@ - + @@ -12919,16 +12919,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -12938,37 +12938,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -12977,22 +12977,22 @@ - - + + - - + + - - + + @@ -13002,8 +13002,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -13012,23 +13012,23 @@ - - + + - - + + - - + + @@ -13037,7 +13037,7 @@ - + @@ -13045,7 +13045,7 @@ - + @@ -13053,7 +13053,7 @@ - + @@ -13064,7 +13064,7 @@ - + @@ -13200,16 +13200,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -13219,8 +13219,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -13229,30 +13229,30 @@ - - + + - - + + - - + + - - + + @@ -13261,8 +13261,8 @@ - - + + @@ -13270,15 +13270,15 @@ - - + + - + @@ -13286,7 +13286,7 @@ - + @@ -13294,7 +13294,7 @@ - + @@ -13305,7 +13305,7 @@ - + @@ -13464,16 +13464,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -13483,22 +13483,22 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -13507,8 +13507,8 @@ - - + + @@ -13517,22 +13517,22 @@ - - + + - - + + - - + + @@ -13542,8 +13542,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -13552,15 +13552,15 @@ - - + + - - + + @@ -13569,7 +13569,7 @@ - + @@ -13577,7 +13577,7 @@ - + @@ -13585,7 +13585,7 @@ - + @@ -13596,7 +13596,7 @@ - + @@ -13671,16 +13671,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -13690,15 +13690,15 @@ - - + + - + @@ -13706,7 +13706,7 @@ - + @@ -13717,7 +13717,7 @@ - + @@ -13767,16 +13767,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -13786,7 +13786,7 @@ - + @@ -13797,7 +13797,7 @@ - + @@ -14152,16 +14152,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14171,15 +14171,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14188,15 +14188,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14206,8 +14206,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14217,8 +14217,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14227,15 +14227,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14244,8 +14244,8 @@ - - + + @@ -14254,22 +14254,22 @@ - - + + - - + + - - + + @@ -14279,22 +14279,22 @@ - - + + - - + + - - + + @@ -14304,8 +14304,8 @@ - - + + @@ -14313,8 +14313,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14323,23 +14323,23 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14349,8 +14349,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14359,8 +14359,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14369,8 +14369,8 @@ - - + + @@ -14380,8 +14380,8 @@ - - + + @@ -14390,7 +14390,7 @@ - + @@ -14398,7 +14398,7 @@ - + @@ -14406,7 +14406,7 @@ - + @@ -14414,7 +14414,7 @@ - + @@ -14422,7 +14422,7 @@ - + @@ -14430,7 +14430,7 @@ - + @@ -14438,7 +14438,7 @@ - + @@ -14449,7 +14449,7 @@ - + @@ -14934,16 +14934,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14953,8 +14953,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14963,30 +14963,30 @@ - - + + - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -14996,8 +14996,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15006,22 +15006,22 @@ - - + + - - + + - - + + @@ -15029,8 +15029,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15039,8 +15039,8 @@ - - + + @@ -15049,22 +15049,22 @@ - - + + - - + + - - + + @@ -15074,8 +15074,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15084,15 +15084,15 @@ - - + + - - + + @@ -15101,8 +15101,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15111,30 +15111,30 @@ - - + + - - + + - - + + - - + + @@ -15145,8 +15145,8 @@ - - + + @@ -15154,8 +15154,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15164,23 +15164,23 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15190,8 +15190,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15200,8 +15200,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15210,8 +15210,8 @@ - - + + @@ -15220,37 +15220,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -15261,8 +15261,8 @@ - - + + @@ -15271,7 +15271,7 @@ - + @@ -15279,7 +15279,7 @@ - + @@ -15287,7 +15287,7 @@ - + @@ -15295,7 +15295,7 @@ - + @@ -15303,7 +15303,7 @@ - + @@ -15311,7 +15311,7 @@ - + @@ -15319,7 +15319,7 @@ - + @@ -15327,7 +15327,7 @@ - + @@ -15335,7 +15335,7 @@ - + @@ -15346,7 +15346,7 @@ - + @@ -15505,16 +15505,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15524,29 +15524,29 @@ - - + + - - + + - - + + - - + + @@ -15555,22 +15555,22 @@ - - + + - - + + - - + + @@ -15580,8 +15580,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15590,15 +15590,15 @@ - - + + - - + + @@ -15607,7 +15607,7 @@ - + @@ -15615,7 +15615,7 @@ - + @@ -15623,7 +15623,7 @@ - + @@ -15634,7 +15634,7 @@ - + @@ -15771,16 +15771,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15790,37 +15790,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -15829,8 +15829,8 @@ - - + + @@ -15838,8 +15838,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -15849,7 +15849,7 @@ - + @@ -15857,7 +15857,7 @@ - + @@ -15865,7 +15865,7 @@ - + @@ -15876,7 +15876,7 @@ - + @@ -16013,16 +16013,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -16032,37 +16032,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -16071,8 +16071,8 @@ - - + + @@ -16080,15 +16080,15 @@ - - + + - + @@ -16096,7 +16096,7 @@ - + @@ -16104,7 +16104,7 @@ - + @@ -16115,7 +16115,7 @@ - + @@ -16235,16 +16235,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -16254,23 +16254,23 @@ - - + + - - + + - - + + @@ -16278,15 +16278,15 @@ - - + + - + @@ -16294,7 +16294,7 @@ - + @@ -16302,7 +16302,7 @@ - + @@ -16313,7 +16313,7 @@ - + @@ -16433,16 +16433,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -16452,23 +16452,23 @@ - - + + - - + + - - + + @@ -16476,15 +16476,15 @@ - - + + - + @@ -16492,7 +16492,7 @@ - + @@ -16500,7 +16500,7 @@ - + @@ -16511,7 +16511,7 @@ - + @@ -16619,16 +16619,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -16638,29 +16638,29 @@ - - + + - - + + - - + + - - + + @@ -16669,8 +16669,8 @@ - - + + @@ -16678,7 +16678,7 @@ - + @@ -16686,7 +16686,7 @@ - + @@ -16697,7 +16697,7 @@ - + @@ -16792,16 +16792,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -16811,23 +16811,23 @@ - - + + - - + + - - + + @@ -16835,7 +16835,7 @@ - + @@ -16843,7 +16843,7 @@ - + @@ -16854,7 +16854,7 @@ - + @@ -17142,16 +17142,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -17161,8 +17161,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -17171,30 +17171,30 @@ - - + + - - + + - - + + - - + + @@ -17204,8 +17204,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -17214,22 +17214,22 @@ - - + + - - + + - - + + @@ -17238,22 +17238,22 @@ - - + + - - + + - - + + @@ -17263,8 +17263,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -17273,15 +17273,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -17290,8 +17290,8 @@ - - + + @@ -17300,15 +17300,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -17317,8 +17317,8 @@ - - + + @@ -17328,8 +17328,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -17338,15 +17338,15 @@ - - + + - - + + @@ -17355,7 +17355,7 @@ - + @@ -17363,7 +17363,7 @@ - + @@ -17371,7 +17371,7 @@ - + @@ -17379,7 +17379,7 @@ - + @@ -17387,7 +17387,7 @@ - + @@ -17398,7 +17398,7 @@ - + @@ -18152,16 +18152,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18171,8 +18171,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18181,52 +18181,52 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -18236,8 +18236,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18246,15 +18246,15 @@ - - + + - - + + @@ -18263,8 +18263,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18273,8 +18273,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18283,23 +18283,23 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18308,22 +18308,22 @@ - - + + - - + + - - + + @@ -18332,8 +18332,8 @@ - - + + @@ -18341,16 +18341,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18362,8 +18362,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18372,23 +18372,23 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18397,22 +18397,22 @@ - - + + - - + + - - + + @@ -18421,8 +18421,8 @@ - - + + @@ -18430,16 +18430,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18451,8 +18451,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18461,31 +18461,31 @@ - - + + - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18497,8 +18497,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18507,23 +18507,23 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18532,22 +18532,22 @@ - - + + - - + + - - + + @@ -18556,8 +18556,8 @@ - - + + @@ -18565,8 +18565,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18575,22 +18575,22 @@ - - + + - - + + - - + + @@ -18599,8 +18599,8 @@ - - + + @@ -18608,16 +18608,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18630,8 +18630,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18641,8 +18641,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18654,7 +18654,7 @@ - + @@ -18662,7 +18662,7 @@ - + @@ -18670,7 +18670,7 @@ - + @@ -18678,7 +18678,7 @@ - + @@ -18686,7 +18686,7 @@ - + @@ -18694,7 +18694,7 @@ - + @@ -18702,7 +18702,7 @@ - + @@ -18710,7 +18710,7 @@ - + @@ -18718,7 +18718,7 @@ - + @@ -18726,7 +18726,7 @@ - + @@ -18734,7 +18734,7 @@ - + @@ -18742,7 +18742,7 @@ - + @@ -18750,7 +18750,7 @@ - + @@ -18758,7 +18758,7 @@ - + @@ -18769,7 +18769,7 @@ - + @@ -18915,16 +18915,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18934,37 +18934,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -18974,8 +18974,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -18984,15 +18984,15 @@ - - + + - - + + @@ -19001,7 +19001,7 @@ - + @@ -19009,7 +19009,7 @@ - + @@ -19017,7 +19017,7 @@ - + @@ -19028,7 +19028,7 @@ - + @@ -19078,23 +19078,23 @@ - - + + - - + + - + @@ -19105,7 +19105,7 @@ - + @@ -19155,23 +19155,23 @@ - - + + - - + + - + @@ -19182,7 +19182,7 @@ - + @@ -19810,8 +19810,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -19820,31 +19820,31 @@ - - + + - - + + - - + + - - + + @@ -19853,8 +19853,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -19863,31 +19863,31 @@ - - + + - - + + - - + + - - + + @@ -19896,8 +19896,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -19906,31 +19906,31 @@ - - + + - - + + - - + + - - + + @@ -19939,8 +19939,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -19950,8 +19950,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -19961,8 +19961,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -19972,8 +19972,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -19983,8 +19983,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -19994,8 +19994,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20005,8 +20005,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20016,8 +20016,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20027,8 +20027,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20038,8 +20038,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20049,8 +20049,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20060,8 +20060,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20071,8 +20071,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20082,8 +20082,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20093,8 +20093,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20104,8 +20104,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20115,8 +20115,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20126,8 +20126,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20137,7 +20137,7 @@ - + @@ -20145,7 +20145,7 @@ - + @@ -20153,7 +20153,7 @@ - + @@ -20161,7 +20161,7 @@ - + @@ -20169,7 +20169,7 @@ - + @@ -20177,7 +20177,7 @@ - + @@ -20185,7 +20185,7 @@ - + @@ -20193,7 +20193,7 @@ - + @@ -20201,7 +20201,7 @@ - + @@ -20209,7 +20209,7 @@ - + @@ -20217,7 +20217,7 @@ - + @@ -20225,7 +20225,7 @@ - + @@ -20233,7 +20233,7 @@ - + @@ -20241,7 +20241,7 @@ - + @@ -20249,7 +20249,7 @@ - + @@ -20257,7 +20257,7 @@ - + @@ -20265,7 +20265,7 @@ - + @@ -20273,7 +20273,7 @@ - + @@ -20281,7 +20281,7 @@ - + @@ -20289,7 +20289,7 @@ - + @@ -20297,7 +20297,7 @@ - + @@ -20305,8 +20305,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -20316,7 +20316,7 @@ - + @@ -20326,7 +20326,7 @@ - + @@ -22750,12 +22750,12 @@ - - - + + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -22765,8 +22765,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -22776,8 +22776,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -22787,8 +22787,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -22798,8 +22798,8 @@ - - + + @@ -22813,11 +22813,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -22828,8 +22828,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -22840,8 +22840,8 @@ - - + + @@ -22857,11 +22857,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -22872,8 +22872,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -22884,8 +22884,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -22896,8 +22896,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -22908,8 +22908,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -22919,8 +22919,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -22931,8 +22931,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -22943,8 +22943,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -22955,8 +22955,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -22967,8 +22967,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -22979,8 +22979,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -22991,8 +22991,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23003,8 +23003,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23015,8 +23015,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -23026,8 +23026,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23038,8 +23038,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23050,8 +23050,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23062,8 +23062,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23074,8 +23074,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23086,8 +23086,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23106,11 +23106,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23129,11 +23129,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23152,11 +23152,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23167,8 +23167,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23179,8 +23179,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23191,8 +23191,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23211,11 +23211,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23226,8 +23226,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23246,11 +23246,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23269,11 +23269,11 @@ - - + + - - + + @@ -23289,11 +23289,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23312,11 +23312,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23335,11 +23335,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23358,11 +23358,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23381,11 +23381,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23404,11 +23404,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23427,11 +23427,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23442,8 +23442,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23454,8 +23454,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23466,8 +23466,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23478,8 +23478,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23490,8 +23490,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23502,8 +23502,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23522,11 +23522,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23545,11 +23545,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23568,11 +23568,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23583,8 +23583,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23595,8 +23595,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23607,8 +23607,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23619,8 +23619,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23639,11 +23639,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23662,11 +23662,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23677,8 +23677,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23689,8 +23689,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23701,8 +23701,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23713,8 +23713,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23725,8 +23725,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23745,11 +23745,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23768,11 +23768,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23783,8 +23783,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23803,11 +23803,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23818,8 +23818,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23830,8 +23830,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23842,8 +23842,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23862,11 +23862,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23877,8 +23877,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23889,8 +23889,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23901,8 +23901,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23913,8 +23913,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23933,11 +23933,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -23948,8 +23948,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23960,8 +23960,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23972,8 +23972,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23984,8 +23984,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -23996,8 +23996,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24016,11 +24016,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -24031,8 +24031,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24051,11 +24051,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -24074,11 +24074,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -24088,8 +24088,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24100,8 +24100,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24112,8 +24112,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24124,8 +24124,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -24135,8 +24135,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24147,8 +24147,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24159,8 +24159,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24171,8 +24171,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24183,8 +24183,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24203,11 +24203,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -24218,8 +24218,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24230,8 +24230,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24242,8 +24242,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24254,8 +24254,8 @@ - - + + KEEP_LOCATION KEEP_SIZE @@ -24274,11 +24274,11 @@ - - + + - - + + @@ -24294,11 +24294,11 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE @@ -24318,8 +24318,8 @@ - - + + @@ -24327,8 +24327,8 @@ - - + + @@ -24336,8 +24336,8 @@ - - + + @@ -24345,8 +24345,8 @@ - - + + @@ -24354,8 +24354,8 @@ - - + + @@ -24363,8 +24363,8 @@ - - + + @@ -24372,8 +24372,8 @@ - - + + @@ -24381,8 +24381,8 @@ - - + + @@ -24390,8 +24390,8 @@ - - + + @@ -24399,8 +24399,8 @@ - - + + @@ -24408,8 +24408,8 @@ - - + + @@ -24417,8 +24417,8 @@ - - + + @@ -24426,8 +24426,8 @@ - - + + @@ -24435,8 +24435,8 @@ - - + + @@ -24444,8 +24444,8 @@ - - + + @@ -24453,8 +24453,8 @@ - - + + @@ -24462,8 +24462,8 @@ - - + + @@ -24471,8 +24471,8 @@ - - + + @@ -24480,8 +24480,8 @@ - - + + @@ -24489,8 +24489,8 @@ - - + + @@ -24498,8 +24498,8 @@ - - + + @@ -24507,8 +24507,8 @@ - - + + @@ -24516,8 +24516,8 @@ - - + + @@ -24525,8 +24525,8 @@ - - + + @@ -24534,8 +24534,8 @@ - - + + @@ -24543,8 +24543,8 @@ - - + + @@ -24552,8 +24552,8 @@ - - + + @@ -24561,8 +24561,8 @@ - - + + @@ -24570,8 +24570,8 @@ - - + + @@ -24579,8 +24579,8 @@ - - + + @@ -24588,8 +24588,8 @@ - - + + @@ -24597,8 +24597,8 @@ - - + + @@ -24606,8 +24606,8 @@ - - + + @@ -24615,8 +24615,8 @@ - - + + @@ -24624,8 +24624,8 @@ - - + + @@ -24633,8 +24633,8 @@ - - + + @@ -24642,8 +24642,8 @@ - - + + @@ -24651,8 +24651,8 @@ - - + + @@ -24660,8 +24660,8 @@ - - + + @@ -24669,8 +24669,8 @@ - - + + @@ -24678,8 +24678,8 @@ - - + + @@ -24687,8 +24687,8 @@ - - + + @@ -24696,8 +24696,8 @@ - - + + @@ -24705,8 +24705,8 @@ - - + + @@ -24714,8 +24714,8 @@ - - + + @@ -24723,8 +24723,8 @@ - - + + @@ -24732,8 +24732,8 @@ - - + + @@ -24741,8 +24741,8 @@ - - + + @@ -24750,8 +24750,8 @@ - - + + @@ -24759,8 +24759,8 @@ - - + + @@ -24768,8 +24768,8 @@ - - + + @@ -24777,8 +24777,8 @@ - - + + @@ -24786,8 +24786,8 @@ - - + + @@ -24795,8 +24795,8 @@ - - + + @@ -24804,8 +24804,8 @@ - - + + @@ -24813,8 +24813,8 @@ - - + + @@ -24822,8 +24822,8 @@ - - + + @@ -24831,8 +24831,8 @@ - - + + @@ -24840,8 +24840,8 @@ - - + + @@ -24849,8 +24849,8 @@ - - + + @@ -24858,8 +24858,8 @@ - - + + @@ -24867,8 +24867,8 @@ - - + + @@ -24879,7 +24879,7 @@ - + @@ -25038,16 +25038,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25057,22 +25057,22 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25081,8 +25081,8 @@ - - + + @@ -25091,15 +25091,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25108,8 +25108,8 @@ - - + + @@ -25119,8 +25119,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25129,15 +25129,15 @@ - - + + - - + + @@ -25146,7 +25146,7 @@ - + @@ -25154,7 +25154,7 @@ - + @@ -25162,7 +25162,7 @@ - + @@ -25173,7 +25173,7 @@ - + @@ -25397,16 +25397,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25416,8 +25416,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25426,15 +25426,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25443,8 +25443,8 @@ - - + + @@ -25453,8 +25453,8 @@ - - + + @@ -25462,8 +25462,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25472,23 +25472,23 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25497,8 +25497,8 @@ - - + + @@ -25508,8 +25508,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25518,30 +25518,30 @@ - - + + - - + + - - + + - - + + @@ -25551,7 +25551,7 @@ - + @@ -25559,7 +25559,7 @@ - + @@ -25567,7 +25567,7 @@ - + @@ -25575,7 +25575,7 @@ - + @@ -25586,7 +25586,7 @@ - + @@ -25678,16 +25678,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -25697,30 +25697,30 @@ - - + + - - + + - - + + - - + + @@ -25729,7 +25729,7 @@ - + @@ -25737,7 +25737,7 @@ - + @@ -25748,7 +25748,7 @@ - + @@ -26040,16 +26040,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -26059,7 +26059,7 @@ - + @@ -26067,22 +26067,22 @@ - - + + - - + + - - + + @@ -26091,37 +26091,37 @@ - - + + - - + + - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -26131,23 +26131,23 @@ - - + + - - + + - - + + @@ -26156,8 +26156,8 @@ - - + + @@ -26165,30 +26165,30 @@ - - + + - - + + - - + + - - + + @@ -26196,8 +26196,8 @@ - - + + @@ -26206,7 +26206,7 @@ - + @@ -26214,7 +26214,7 @@ - + @@ -26222,7 +26222,7 @@ - + @@ -26230,7 +26230,7 @@ - + @@ -26238,7 +26238,7 @@ - + @@ -26249,7 +26249,7 @@ - + @@ -26344,16 +26344,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -26363,23 +26363,23 @@ - - + + - - + + - - + + @@ -26387,7 +26387,7 @@ - + @@ -26395,7 +26395,7 @@ - + @@ -26406,7 +26406,7 @@ - + @@ -26749,16 +26749,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -26768,7 +26768,7 @@ - + @@ -26776,8 +26776,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -26786,15 +26786,15 @@ - - + + - - + + @@ -26803,37 +26803,37 @@ - - + + - - + + - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -26843,37 +26843,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -26883,22 +26883,22 @@ - - + + - - + + - - + + @@ -26908,8 +26908,8 @@ - - + + @@ -26917,30 +26917,30 @@ - - + + - - + + - - + + - - + + @@ -26948,8 +26948,8 @@ - - + + @@ -26958,7 +26958,7 @@ - + @@ -26966,7 +26966,7 @@ - + @@ -26974,7 +26974,7 @@ - + @@ -26982,7 +26982,7 @@ - + @@ -26990,7 +26990,7 @@ - + @@ -26998,7 +26998,7 @@ - + @@ -27009,7 +27009,7 @@ - + @@ -27159,16 +27159,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -27178,8 +27178,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -27188,22 +27188,22 @@ - - + + - - + + - - + + @@ -27212,8 +27212,8 @@ - - + + @@ -27221,7 +27221,7 @@ - + @@ -27229,7 +27229,7 @@ - + @@ -27237,30 +27237,30 @@ - - + + - - + + - - + + - - + + @@ -27269,7 +27269,7 @@ - + @@ -27280,7 +27280,7 @@ - + @@ -27388,16 +27388,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -27407,8 +27407,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -27417,22 +27417,22 @@ - - + + - - + + - - + + @@ -27441,8 +27441,8 @@ - - + + @@ -27450,7 +27450,7 @@ - + @@ -27458,7 +27458,7 @@ - + @@ -27469,7 +27469,7 @@ - + @@ -27564,16 +27564,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -27583,23 +27583,23 @@ - - + + - - + + - - + + @@ -27607,7 +27607,7 @@ - + @@ -27615,7 +27615,7 @@ - + @@ -27626,7 +27626,7 @@ - + @@ -27738,16 +27738,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -27757,37 +27757,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -27796,8 +27796,8 @@ - - + + @@ -27805,7 +27805,7 @@ - + @@ -27813,7 +27813,7 @@ - + @@ -27824,7 +27824,7 @@ - + @@ -27961,16 +27961,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -27980,8 +27980,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -27990,30 +27990,30 @@ - - + + - - + + - - + + - - + + @@ -28022,8 +28022,8 @@ - - + + @@ -28031,8 +28031,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -28042,7 +28042,7 @@ - + @@ -28050,7 +28050,7 @@ - + @@ -28058,7 +28058,7 @@ - + @@ -28069,7 +28069,7 @@ - + @@ -28236,16 +28236,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -28255,37 +28255,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -28294,22 +28294,22 @@ - - + + - - + + - - + + @@ -28319,8 +28319,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -28329,23 +28329,23 @@ - - + + - - + + - - + + @@ -28354,7 +28354,7 @@ - + @@ -28362,7 +28362,7 @@ - + @@ -28370,7 +28370,7 @@ - + @@ -28381,7 +28381,7 @@ - + @@ -28518,16 +28518,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -28537,37 +28537,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -28576,8 +28576,8 @@ - - + + @@ -28585,8 +28585,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -28596,7 +28596,7 @@ - + @@ -28604,7 +28604,7 @@ - + @@ -28612,7 +28612,7 @@ - + @@ -28623,7 +28623,7 @@ - + @@ -28760,16 +28760,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -28779,22 +28779,22 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -28803,16 +28803,16 @@ - - + + - - + + @@ -28821,8 +28821,8 @@ - - + + @@ -28830,15 +28830,15 @@ - - + + - + @@ -28846,7 +28846,7 @@ - + @@ -28854,7 +28854,7 @@ - + @@ -28865,7 +28865,7 @@ - + @@ -28960,16 +28960,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -28979,23 +28979,23 @@ - - + + - - + + - - + + @@ -29003,7 +29003,7 @@ - + @@ -29011,7 +29011,7 @@ - + @@ -29022,7 +29022,7 @@ - + @@ -29856,16 +29856,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -29875,8 +29875,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -29885,22 +29885,22 @@ - - + + - - + + - - + + @@ -29909,22 +29909,22 @@ - - + + - - + + - - + + @@ -29934,8 +29934,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -29944,30 +29944,30 @@ - - + + - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -29976,16 +29976,16 @@ - - + + - - + + @@ -29993,16 +29993,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30014,8 +30014,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30024,38 +30024,38 @@ - - + + - - + + - - + + - - + + - - + + @@ -30063,16 +30063,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30084,8 +30084,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30094,23 +30094,23 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30119,30 +30119,30 @@ - - + + - - + + - - + + - - + + @@ -30151,22 +30151,22 @@ - - + + - - + + - - + + @@ -30176,8 +30176,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30187,8 +30187,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30198,22 +30198,22 @@ - - + + - - + + - - + + @@ -30224,8 +30224,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30234,23 +30234,23 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30259,16 +30259,16 @@ - - + + - - + + @@ -30276,16 +30276,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30297,8 +30297,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30307,37 +30307,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -30345,22 +30345,22 @@ - - + + - - + + - - + + @@ -30370,16 +30370,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30389,8 +30389,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30399,15 +30399,15 @@ - - + + - - + + @@ -30419,7 +30419,7 @@ - + @@ -30427,7 +30427,7 @@ - + @@ -30435,7 +30435,7 @@ - + @@ -30443,7 +30443,7 @@ - + @@ -30451,7 +30451,7 @@ - + @@ -30459,7 +30459,7 @@ - + @@ -30467,7 +30467,7 @@ - + @@ -30475,7 +30475,7 @@ - + @@ -30483,7 +30483,7 @@ - + @@ -30491,7 +30491,7 @@ - + @@ -30499,7 +30499,7 @@ - + @@ -30507,7 +30507,7 @@ - + @@ -30515,7 +30515,7 @@ - + @@ -30523,7 +30523,7 @@ - + @@ -30531,7 +30531,7 @@ - + @@ -30542,7 +30542,7 @@ - + @@ -30701,16 +30701,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30720,29 +30720,29 @@ - - + + - - + + - - + + - - + + @@ -30751,22 +30751,22 @@ - - + + - - + + - - + + @@ -30776,8 +30776,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -30786,15 +30786,15 @@ - - + + - - + + @@ -30803,7 +30803,7 @@ - + @@ -30811,7 +30811,7 @@ - + @@ -30819,7 +30819,7 @@ - + @@ -30830,7 +30830,7 @@ - + @@ -31257,16 +31257,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31276,8 +31276,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31286,30 +31286,30 @@ - - + + - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31318,22 +31318,22 @@ - - + + - - + + - - + + @@ -31342,22 +31342,22 @@ - - + + - - + + - - + + @@ -31367,8 +31367,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31377,15 +31377,15 @@ - - + + - - + + @@ -31394,16 +31394,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31415,8 +31415,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31425,23 +31425,23 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31450,22 +31450,22 @@ - - + + - - + + - - + + @@ -31474,22 +31474,22 @@ - - + + - - + + - - + + @@ -31499,8 +31499,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31509,15 +31509,15 @@ - - + + - - + + @@ -31526,16 +31526,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31548,7 +31548,7 @@ - + @@ -31556,7 +31556,7 @@ - + @@ -31564,7 +31564,7 @@ - + @@ -31572,7 +31572,7 @@ - + @@ -31580,7 +31580,7 @@ - + @@ -31588,7 +31588,7 @@ - + @@ -31596,7 +31596,7 @@ - + @@ -31604,7 +31604,7 @@ - + @@ -31615,7 +31615,7 @@ - + @@ -31710,16 +31710,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31729,23 +31729,23 @@ - - + + - - + + - - + + @@ -31753,7 +31753,7 @@ - + @@ -31761,7 +31761,7 @@ - + @@ -31772,7 +31772,7 @@ - + @@ -31917,16 +31917,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31936,37 +31936,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -31976,8 +31976,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -31986,15 +31986,15 @@ - - + + - - + + @@ -32003,7 +32003,7 @@ - + @@ -32011,7 +32011,7 @@ - + @@ -32019,7 +32019,7 @@ - + @@ -32030,7 +32030,7 @@ - + @@ -32492,8 +32492,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32502,8 +32502,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32514,8 +32514,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32524,8 +32524,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32535,8 +32535,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32546,8 +32546,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32557,8 +32557,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32568,8 +32568,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32579,8 +32579,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32590,8 +32590,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32601,8 +32601,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32613,8 +32613,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32623,8 +32623,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32635,8 +32635,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32645,8 +32645,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32657,8 +32657,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32667,8 +32667,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32679,8 +32679,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32689,8 +32689,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32701,8 +32701,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32711,8 +32711,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32722,8 +32722,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32733,8 +32733,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32745,8 +32745,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32755,8 +32755,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32767,8 +32767,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32777,8 +32777,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32788,8 +32788,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32799,8 +32799,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32811,8 +32811,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32821,8 +32821,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32833,8 +32833,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32843,8 +32843,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32855,8 +32855,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32865,8 +32865,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32877,8 +32877,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32887,8 +32887,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32898,8 +32898,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32910,8 +32910,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32920,8 +32920,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32932,8 +32932,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32942,8 +32942,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32954,8 +32954,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32964,8 +32964,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32976,8 +32976,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32986,8 +32986,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -32998,8 +32998,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33008,8 +33008,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33020,8 +33020,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33030,8 +33030,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33044,7 +33044,7 @@ - + @@ -33265,16 +33265,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33284,8 +33284,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33294,30 +33294,30 @@ - - + + - - + + - - + + - - + + @@ -33327,8 +33327,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33337,22 +33337,22 @@ - - + + - - + + - - + + @@ -33361,22 +33361,22 @@ - - + + - - + + - - + + @@ -33386,8 +33386,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33396,23 +33396,23 @@ - - + + - - + + - - + + @@ -33421,7 +33421,7 @@ - + @@ -33429,7 +33429,7 @@ - + @@ -33437,7 +33437,7 @@ - + @@ -33445,7 +33445,7 @@ - + @@ -33456,7 +33456,7 @@ - + @@ -33548,16 +33548,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33567,30 +33567,30 @@ - - + + - - + + - - + + - - + + @@ -33599,7 +33599,7 @@ - + @@ -33607,7 +33607,7 @@ - + @@ -33618,7 +33618,7 @@ - + @@ -33785,16 +33785,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33804,8 +33804,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33814,30 +33814,30 @@ - - + + - - + + - - + + - - + + @@ -33846,15 +33846,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33863,8 +33863,8 @@ - - + + @@ -33874,8 +33874,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -33884,23 +33884,23 @@ - - + + - - + + - - + + @@ -33909,7 +33909,7 @@ - + @@ -33917,7 +33917,7 @@ - + @@ -33925,7 +33925,7 @@ - + @@ -33936,7 +33936,7 @@ - + @@ -34095,16 +34095,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -34114,8 +34114,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -34124,22 +34124,22 @@ - - + + - - + + - - + + @@ -34148,22 +34148,22 @@ - - + + - - + + - - + + @@ -34173,8 +34173,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -34183,15 +34183,15 @@ - - + + - - + + @@ -34200,7 +34200,7 @@ - + @@ -34208,7 +34208,7 @@ - + @@ -34216,7 +34216,7 @@ - + @@ -34227,7 +34227,7 @@ - + @@ -34373,16 +34373,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -34392,37 +34392,37 @@ - - + + - - + + - - + + - - + + - - + + @@ -34432,8 +34432,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -34442,15 +34442,15 @@ - - + + - - + + @@ -34459,7 +34459,7 @@ - + @@ -34467,7 +34467,7 @@ - + @@ -34475,7 +34475,7 @@ - + @@ -34486,7 +34486,7 @@ - + @@ -34536,16 +34536,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -34555,7 +34555,7 @@ - + @@ -34566,7 +34566,7 @@ - + @@ -34662,16 +34662,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -34681,8 +34681,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -34691,31 +34691,31 @@ - - + + - - + + - - + + - - + + @@ -34724,7 +34724,7 @@ - + @@ -34732,7 +34732,7 @@ - + @@ -34743,7 +34743,7 @@ - + @@ -35193,16 +35193,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35212,8 +35212,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35222,16 +35222,16 @@ - - + + - - + + @@ -35239,8 +35239,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35249,16 +35249,16 @@ - - + + - - + + @@ -35266,8 +35266,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35276,16 +35276,16 @@ - - + + - - + + @@ -35293,8 +35293,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35303,8 +35303,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35313,8 +35313,8 @@ - - + + @@ -35323,8 +35323,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35333,30 +35333,30 @@ - - + + - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35365,16 +35365,16 @@ - - + + - - + + @@ -35382,16 +35382,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35403,8 +35403,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35413,23 +35413,23 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35439,8 +35439,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35450,8 +35450,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35464,7 +35464,7 @@ - + @@ -35472,7 +35472,7 @@ - + @@ -35480,7 +35480,7 @@ - + @@ -35488,7 +35488,7 @@ - + @@ -35496,7 +35496,7 @@ - + @@ -35504,7 +35504,7 @@ - + @@ -35512,7 +35512,7 @@ - + @@ -35520,7 +35520,7 @@ - + @@ -35528,7 +35528,7 @@ - + @@ -35536,7 +35536,7 @@ - + @@ -35547,7 +35547,7 @@ - + @@ -35642,16 +35642,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35661,23 +35661,23 @@ - - + + - - + + - - + + @@ -35685,7 +35685,7 @@ - + @@ -35693,7 +35693,7 @@ - + @@ -35704,7 +35704,7 @@ - + @@ -35912,16 +35912,16 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35931,7 +35931,7 @@ - + @@ -35939,8 +35939,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35949,30 +35949,30 @@ - - + + - - + + - - + + - - + + @@ -35982,15 +35982,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -35999,16 +35999,16 @@ - - + + - - + + @@ -36017,7 +36017,7 @@ - + @@ -36025,8 +36025,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -36035,22 +36035,22 @@ - - + + - - + + - - + + @@ -36059,8 +36059,8 @@ - - + + @@ -36068,7 +36068,7 @@ - + @@ -36076,7 +36076,7 @@ - + @@ -36087,7 +36087,7 @@ - + @@ -37430,22 +37430,22 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37455,8 +37455,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37466,8 +37466,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37476,46 +37476,46 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -37524,8 +37524,8 @@ - - + + @@ -37535,7 +37535,7 @@ - + @@ -37543,7 +37543,7 @@ - + @@ -37551,22 +37551,22 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37576,8 +37576,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37587,8 +37587,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37597,16 +37597,16 @@ - - + + - - + + @@ -37616,7 +37616,7 @@ - + @@ -37624,7 +37624,7 @@ - + @@ -37632,22 +37632,22 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37657,8 +37657,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37668,8 +37668,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37678,16 +37678,16 @@ - - + + - - + + @@ -37697,7 +37697,7 @@ - + @@ -37705,7 +37705,7 @@ - + @@ -37713,22 +37713,22 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37738,8 +37738,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37749,8 +37749,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37759,30 +37759,30 @@ - - + + - - + + - - + + - - + + @@ -37794,8 +37794,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37804,15 +37804,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37822,8 +37822,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37833,8 +37833,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37843,16 +37843,16 @@ - - + + - - + + @@ -37862,8 +37862,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37872,15 +37872,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37890,8 +37890,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37901,8 +37901,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37911,16 +37911,16 @@ - - + + - - + + @@ -37930,8 +37930,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37940,8 +37940,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37950,8 +37950,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37961,8 +37961,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37972,8 +37972,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -37982,16 +37982,16 @@ - - + + - - + + @@ -37999,8 +37999,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38009,16 +38009,16 @@ - - + + - - + + @@ -38028,7 +38028,7 @@ - + @@ -38036,7 +38036,7 @@ - + @@ -38044,7 +38044,7 @@ - + @@ -38052,7 +38052,7 @@ - + @@ -38060,7 +38060,7 @@ - + @@ -38068,7 +38068,7 @@ - + @@ -38076,7 +38076,7 @@ - + @@ -38084,7 +38084,7 @@ - + @@ -38092,7 +38092,7 @@ - + @@ -38100,22 +38100,22 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38125,8 +38125,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38136,8 +38136,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38146,23 +38146,23 @@ - - + + - - + + - - + + @@ -38170,15 +38170,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38187,8 +38187,8 @@ - - + + @@ -38200,7 +38200,7 @@ - + @@ -38208,7 +38208,7 @@ - + @@ -38216,22 +38216,22 @@ - - + + - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38241,8 +38241,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38252,8 +38252,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38262,16 +38262,16 @@ - - + + - - + + @@ -38281,7 +38281,7 @@ - + @@ -38289,7 +38289,7 @@ - + @@ -38297,8 +38297,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38307,8 +38307,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38317,8 +38317,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38328,8 +38328,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38339,8 +38339,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38349,16 +38349,16 @@ - - + + - - + + @@ -38368,7 +38368,7 @@ - + @@ -38376,7 +38376,7 @@ - + @@ -38384,8 +38384,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38394,15 +38394,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38412,8 +38412,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38423,8 +38423,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38433,16 +38433,16 @@ - - + + - - + + @@ -38452,7 +38452,7 @@ - + @@ -38460,7 +38460,7 @@ - + @@ -38468,8 +38468,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38478,15 +38478,15 @@ - - + + - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38496,8 +38496,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38507,8 +38507,8 @@ - - + + KEEP_LOCATION KEEP_SIZE KEEP_RATIO @@ -38517,16 +38517,16 @@ - - + + - - + + @@ -38536,7 +38536,7 @@ - + @@ -38544,7 +38544,7 @@ - + @@ -38555,6 +38555,6 @@ - + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.allocation b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.allocation deleted file mode 100644 index a996d2c..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.allocation +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics deleted file mode 100644 index bfc679e..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/cwa.pddc b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/cwa.pddc rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/representations.aird b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/representations.aird index 480355d..aef27f7 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/representations.aird +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/representations.aird @@ -9,7 +9,7 @@ default.usagemodel pathmap://PCM_MODELS/FailureTypes.repository pathmap://PCM_MODELS/PrimitiveTypes.repository - cwa.pddc + default.pddc default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/.project b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/.project rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.allocation b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.allocation rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.pddc b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.pddc rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.repository b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.repository rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.system b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.system rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.usagemodel b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/MaaS.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/representations.aird b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaS_Ticket_System_base/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/BranchingTest.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/BranchingTest.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/BranchingTest.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/BranchingTest.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/BranchingTest.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/BranchingTest.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/BranchingTest.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/BranchingTest.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/complexPseudoCycle.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/complexPseudoCycle.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/complexPseudoCycle.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/complexPseudoCycle.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/complexPseudoCycle.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/complexPseudoCycle.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/complexPseudoCycle.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/complexPseudoCycle.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/project.txt b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/project.txt deleted file mode 100644 index a624e94..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/project.txt +++ /dev/null @@ -1,12 +0,0 @@ - - - DFDTestModels - - - - - - - org.eclipse.sirius.nature.modelingproject - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/representations.aird deleted file mode 100644 index 8b43a36..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/representations.aird +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/DeadOutPin.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/DeadOutPin.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/DeadOutPin.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/DeadOutPin.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/DeadOutPin.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/DeadOutPin.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/DeadOutPin.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/DeadOutPin.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/minimal.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/minimal.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/minimal.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/minimal.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/minimal.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/minimal.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDTestModels/minimal.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/minimal.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/.project b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/.project rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/onlineshop.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/onlineshop.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/onlineshop.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/onlineshop.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/onlineshop.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/onlineshop.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFD/onlineshop.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/onlineshop.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/simpleLoopDFD/loopDFD.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/loopDFD.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/simpleLoopDFD/loopDFD.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/loopDFD.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/simpleLoopDFD/loopDFD.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/loopDFD.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/simpleLoopDFD/loopDFD.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/loopDFD.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/.project b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/.project rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/onlineshop.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/onlineshop.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/onlineshop.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/onlineshop.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/onlineshop.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/onlineshop.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShopDFDsimple/onlineshop.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/onlineshop.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/UnusedInput.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/UnusedInput.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/UnusedInput.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/UnusedInput.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/UnusedInput.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/UnusedInput.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/UnusedInput.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/UnusedInput.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/WrongFlowName.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/WrongFlowName.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/WrongFlowName.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/WrongFlowName.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/WrongFlowName.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/WrongFlowName.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DFDSimpleModels/WrongFlowName.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/WrongFlowName.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java index 627d73b..d7bcb4c 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java @@ -21,7 +21,7 @@ public ExpectedViolation(UUID nodeID, List vertexCharact } public boolean references(AbstractVertex element) { - return false; //element.getUniqueIdentifier().equals(this.nodeID); + return element.getUniqueIdentifier().equals(this.nodeID); } public List hasNodeCharacteristic(List actualCharacteristics) { diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java new file mode 100644 index 0000000..6f6eb46 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java @@ -0,0 +1,37 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class BranchingResult implements DFDExampleModelResult { + @Override + public String getModelName() { + return "Branching"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java new file mode 100644 index 0000000..b6922f5 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java @@ -0,0 +1,37 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class ComplexPseudoCycleResult implements DFDExampleModelResult { + @Override + public String getModelName() { + return "ComplexPseudoCycle"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java new file mode 100644 index 0000000..0a80737 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java @@ -0,0 +1,15 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.examplemodels.results.ExampleModelResult; + +import java.nio.file.Paths; + +public interface DFDExampleModelResult extends ExampleModelResult { + default String getDataFlowDiagram() { + return Paths.get(this.getBaseFolderName(), "dfd", this.getModelName(), String.format("%s.dataflowdiagram", this.getFileName())).toString(); + } + + default String getDataDictionary() { + return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.datadictionary", this.getFileName())).toString(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java new file mode 100644 index 0000000..52bfe96 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java @@ -0,0 +1,38 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class DeadOutPinResult implements DFDExampleModelResult { + @Override + public String getModelName() { + return "DeadOutPin"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} + diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java new file mode 100644 index 0000000..7b0d023 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java @@ -0,0 +1,37 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class MinimalResult implements DFDExampleModelResult { + @Override + public String getModelName() { + return "Minimal"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java new file mode 100644 index 0000000..f5d3cc6 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java @@ -0,0 +1,37 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class OnlineShopResult implements DFDExampleModelResult { + @Override + public String getModelName() { + return "OnlineShop"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java new file mode 100644 index 0000000..02f147e --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java @@ -0,0 +1,38 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class SimpleLoopResult implements DFDExampleModelResult { + @Override + public String getModelName() { + return "SimpleLoop"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} + diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java new file mode 100644 index 0000000..f3414ff --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java @@ -0,0 +1,37 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class SimpleOnlineShopResult implements DFDExampleModelResult { + @Override + public String getModelName() { + return "SimpleOnlineShop"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java new file mode 100644 index 0000000..e075b38 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java @@ -0,0 +1,38 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class UnusedInputResult implements DFDExampleModelResult { + @Override + public String getModelName() { + return "UnusedInput"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} + diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java new file mode 100644 index 0000000..f22919d --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java @@ -0,0 +1,38 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class WrongFlowNameResult implements DFDExampleModelResult { + @Override + public String getModelName() { + return "WrongFlowName"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} + diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java new file mode 100644 index 0000000..66bee0f --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java @@ -0,0 +1,53 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.analysis.dsl.selectors.Intersection; +import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class CoCarResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "casestudies"; + } + + @Override + public String getModelName() { + return "CoCarNextGen"; + } + + @Override + public String getFileName() { + return "AudiA6C8"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("GrantedRoles", ConstraintVariable.of("grantedRoles")) + .neverFlows() + .toVertex() + .withCharacteristic("AssignedRoles", ConstraintVariable.of("assignedRoles")) + .where() + .isNotEmpty(ConstraintVariable.of("grantedRoles")) + .isNotEmpty(ConstraintVariable.of("assignedRoles")) + .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual expected violations (should this be per constraint?) + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java new file mode 100644 index 0000000..14182cf --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java @@ -0,0 +1,46 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.analysis.dsl.selectors.Intersection; +import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +/** + * TODO: This test model tests a specific feature not a integration/E2E test + */ +public class CompositeResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "Composite"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("AssignedRole", ConstraintVariable.of("grantedRoles")) + .neverFlows() + .toVertex() + .withCharacteristic("AssignedRole", ConstraintVariable.of("assignedRoles")) + .where() + .isNotEmpty(ConstraintVariable.of("grantedRoles")) + .isNotEmpty(ConstraintVariable.of("assignedRoles")) + .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java new file mode 100644 index 0000000..26ecf1a --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java @@ -0,0 +1,47 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.analysis.dsl.selectors.Intersection; +import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; +public class CoronaWarnAppResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "casestudies"; + } + + @Override + public String getModelName() { + return "CoronaWarnApp"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("GrantedRoles", ConstraintVariable.of("grantedRoles")) + .neverFlows() + .toVertex() + .withCharacteristic("AssignedRoles", ConstraintVariable.of("assignedRoles")) + .where() + .isNotEmpty(ConstraintVariable.of("grantedRoles")) + .isNotEmpty(ConstraintVariable.of("assignedRoles")) + .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter actual expected violations (should this be per constraint?) + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java new file mode 100644 index 0000000..9bd998f --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java @@ -0,0 +1,46 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.analysis.dsl.selectors.Intersection; +import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +/** + * TODO: This test model tests a specific feature not a integration/E2E test + */ +public class IgnoredNodesResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "IgnoredNodes"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("AssignedRole", ConstraintVariable.of("grantedRoles")) + .neverFlows() + .toVertex() + .withCharacteristic("AssignedRole", ConstraintVariable.of("assignedRoles")) + .where() + .isNotEmpty(ConstraintVariable.of("grantedRoles")) + .isNotEmpty(ConstraintVariable.of("assignedRoles")) + .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java new file mode 100644 index 0000000..90568be --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java @@ -0,0 +1,53 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.analysis.dsl.selectors.Intersection; +import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +public class MaaSTicketSystemResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "casestudies"; + } + + @Override + public String getModelName() { + return "MaaSTicketSystem"; + } + + @Override + public String getFileName() { + return "MaaS"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + // TODO: What are the actual constraints here? + return new ConstraintDSL() + .ofData() + .withLabel("GrantedRoles", ConstraintVariable.of("grantedRoles")) + .neverFlows() + .toVertex() + .withCharacteristic("AssignedRoles", ConstraintVariable.of("assignedRoles")) + .where() + .isNotEmpty(ConstraintVariable.of("grantedRoles")) + .isNotEmpty(ConstraintVariable.of("assignedRoles")) + .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) + .create(); + } + + @Override + public List getExpectedViolations() { + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java new file mode 100644 index 0000000..d7ca32e --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java @@ -0,0 +1,46 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.analysis.dsl.selectors.Intersection; +import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; + +import java.util.List; + +/** + * TODO: This test model tests a specific feature not a integration/E2E test + */ +public class NodeCharacteristicsResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "NodeCharacteristics"; + } + + @Override + public AnalysisConstraint getDSLConstraint() { + // TODO: Enter actual constraint + return new ConstraintDSL() + .ofData() + .withLabel("AssignedRole", ConstraintVariable.of("grantedRoles")) + .neverFlows() + .toVertex() + .withCharacteristic("AssignedRole", ConstraintVariable.of("assignedRoles")) + .where() + .isNotEmpty(ConstraintVariable.of("grantedRoles")) + .isNotEmpty(ConstraintVariable.of("assignedRoles")) + .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) + .create(); + } + + @Override + public List getExpectedViolations() { + // TODO: Enter violations + return List.of(); + } + + @Override + public String toString() { + return this.getModelName(); + } +} From 1f03e5bfa9422c69a870473d2a609f492f1055c7 Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Sun, 8 Dec 2024 14:32:13 +0100 Subject: [PATCH 03/15] fix: fix reference to misnamed model --- .../models/pcm/BranchingOnlineShop/default.allocation | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.allocation index 989b284..9ee920e 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.allocation +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.allocation @@ -1,16 +1,16 @@ - + - + - + - + From 653abd3cc0e2b3b083b6af30b292822a198403d4 Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Mon, 13 Jan 2025 16:51:34 +0100 Subject: [PATCH 04/15] feat: remove dependency on unique ids --- .../results/ExpectedViolation.java | 18 ++++--- .../examplemodels/results/Identifier.java | 7 +++ .../results/dfd/DFDIdentifier.java | 30 +++++++++++ .../pcm/InternationalOnlineShopResult.java | 4 +- .../pcm/MultipleDeploymentsResult.java | 4 +- .../results/pcm/PCMIdentifier.java | 54 +++++++++++++++++++ .../results/pcm/TravelPlannerResult.java | 6 +-- .../results/pcm/VariableReturnResult.java | 4 +- 8 files changed, 110 insertions(+), 17 deletions(-) create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/Identifier.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDIdentifier.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMIdentifier.java diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java index d7bcb4c..3f56e3a 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java @@ -1,6 +1,6 @@ package org.dataflowanalysis.examplemodels.results; -import de.uka.ipd.sdq.identifier.Identifier; +import org.dataflowanalysis.analysis.core.AbstractTransposeFlowGraph; import org.dataflowanalysis.analysis.core.AbstractVertex; import org.dataflowanalysis.analysis.core.CharacteristicValue; import org.dataflowanalysis.analysis.core.DataCharacteristic; @@ -9,19 +9,21 @@ import java.util.*; public class ExpectedViolation { - private final UUID nodeID; + private final int flowGraphIndex; + private final Identifier identifier; private final List vertexCharacteristics; private final Map> dataCharacteristics; - public ExpectedViolation(UUID nodeID, List vertexCharacteristics, + public ExpectedViolation(int flowGraphIndex, Identifier identifier, List vertexCharacteristics, Map> dataCharacteristics) { - this.nodeID = nodeID; + this.flowGraphIndex = flowGraphIndex; + this.identifier = identifier; this.vertexCharacteristics = vertexCharacteristics; this.dataCharacteristics = dataCharacteristics; } - public boolean references(AbstractVertex element) { - return element.getUniqueIdentifier().equals(this.nodeID); + public boolean references(AbstractVertex element, int flowGraphIndex) { + return this.identifier.matches(element) && this.flowGraphIndex == flowGraphIndex; } public List hasNodeCharacteristic(List actualCharacteristics) { @@ -59,7 +61,7 @@ private boolean hasCharacteristicValue(ExpectedCharacteristic expectedCharacteri .anyMatch(it -> expectedCharacteristic.characteristicLiteral().equals(it.getValueName())); } - public UUID getNodeID() { - return nodeID; + public Identifier getIdentifier() { + return identifier; } } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/Identifier.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/Identifier.java new file mode 100644 index 0000000..3ae36ea --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/Identifier.java @@ -0,0 +1,7 @@ +package org.dataflowanalysis.examplemodels.results; + +import org.dataflowanalysis.analysis.core.AbstractVertex; + +public interface Identifier { + boolean matches(AbstractVertex vertex); +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDIdentifier.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDIdentifier.java new file mode 100644 index 0000000..dc79dc2 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDIdentifier.java @@ -0,0 +1,30 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +import org.dataflowanalysis.analysis.core.AbstractVertex; +import org.dataflowanalysis.analysis.dfd.core.DFDVertex; +import org.dataflowanalysis.examplemodels.results.Identifier; + +public class DFDIdentifier implements Identifier { + private final String id; + + public DFDIdentifier(String id) { + this.id = id; + } + + @Override + public boolean matches(AbstractVertex vertex) { + if (!(vertex instanceof DFDVertex dfdVertex)) { + return false; + } + return dfdVertex.getReferencedElement().getId().equals(this.id); + } + + public static DFDIdentifier of(String id) { + return new DFDIdentifier(id); + } + + @Override + public String toString() { + return String.format("DFD vertex with ID %s", this.id); + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java index aa37921..680129d 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java @@ -29,9 +29,9 @@ public AnalysisConstraint getDSLConstraint() { @Override public List getExpectedViolations() { return List.of( - new ExpectedViolation(UUID.fromString("74b8d8a8-d110-3c5a-aca0-0092db3ec931"), List.of(new ExpectedCharacteristic("ServerLocation", "nonEU")), + new ExpectedViolation(0, PCMIdentifier.of("_oGmXgYTjEeywmO_IpTxeAg", true), List.of(new ExpectedCharacteristic("ServerLocation", "nonEU")), Map.of("userData", List.of(new ExpectedCharacteristic("DataSensitivity", "Personal")))), - new ExpectedViolation(UUID.fromString("f362790a-49d7-3c22-8558-7232ba02d577"), List.of(new ExpectedCharacteristic("ServerLocation", "nonEU")), + new ExpectedViolation(0, PCMIdentifier.of("_oGmXgYTjEeywmO_IpTxeAg", false), List.of(new ExpectedCharacteristic("ServerLocation", "nonEU")), Map.of("userData", List.of(new ExpectedCharacteristic("DataSensitivity", "Personal"))))); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java index f33c155..6946a59 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java @@ -29,10 +29,10 @@ public AnalysisConstraint getDSLConstraint() { @Override public List getExpectedViolations() { return List.of( - new ExpectedViolation(UUID.fromString("838571d3-277b-392f-9ac4-6b4d4ceddf56"), + new ExpectedViolation(0, PCMIdentifier.of("_dQ568HQSEe2fd909RlIZZw", true), List.of(new ExpectedCharacteristic("ServerLocation", "nonEU"), new ExpectedCharacteristic("ServerLocation", "EU")), Map.of("userdata", List.of(new ExpectedCharacteristic("DataSensitivity", "Personal")))), - new ExpectedViolation(UUID.fromString("a9ea02e4-d182-3bb2-bf18-edae674488c7"), + new ExpectedViolation(0, PCMIdentifier.of("_dQ568XQSEe2fd909RlIZZw", false), List.of(new ExpectedCharacteristic("ServerLocation", "nonEU"), new ExpectedCharacteristic("ServerLocation", "EU")), Map.of("userdata", List.of(new ExpectedCharacteristic("DataSensitivity", "Personal"))))); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMIdentifier.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMIdentifier.java new file mode 100644 index 0000000..9a103bc --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMIdentifier.java @@ -0,0 +1,54 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +import org.dataflowanalysis.analysis.core.AbstractVertex; +import org.dataflowanalysis.analysis.pcm.core.AbstractPCMVertex; +import org.dataflowanalysis.analysis.pcm.core.CallReturnBehavior; +import org.dataflowanalysis.examplemodels.results.Identifier; + +import java.util.Optional; + +public class PCMIdentifier implements Identifier { + private final String id; + private final Optional calling; + + public PCMIdentifier(String id) { + this.id = id; + this.calling = Optional.empty(); + } + + public PCMIdentifier(String id, boolean calling) { + this.id = id; + this.calling = Optional.of(calling); + } + + @Override + public boolean matches(AbstractVertex vertex) { + if (!(vertex instanceof AbstractPCMVertex pcmVertex)) { + return false; + } + if (this.calling.isPresent() && vertex instanceof CallReturnBehavior callReturnBehavior) { + if (callReturnBehavior.isCalling() != this.calling.get()) { + return false; + } + } + return pcmVertex.getReferencedElement().getId().equals(this.id); + } + + public static PCMIdentifier of(String id) { + return new PCMIdentifier(id); + } + + public static PCMIdentifier of(String id, boolean calling) { + return new PCMIdentifier(id, calling); + } + + @Override + public String toString() { + if (this.calling.isPresent()) { + String callString = this.calling.get() ? "Calling" : "Returning"; + return String.format("%s PCM Vertex with ID %s", callString, this.id); + } else { + return String.format("PCM vertex with ID %s", this.id); + } + } +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java index 59712fa..29249b2 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java @@ -45,15 +45,15 @@ public AnalysisConstraint getDSLConstraint() { @Override public List getExpectedViolations() { return List.of( - new ExpectedViolation(UUID.fromString("2214df8e-6d69-3738-83a2-1b91df85e9af"), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), + new ExpectedViolation(0, PCMIdentifier.of("_vorK8fVeEeuMKba1Qn68bg", true), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), Map.of("flight", List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline")), "ccd", List.of(new ExpectedCharacteristic("GrantedRoles", "User")))), - new ExpectedViolation(UUID.fromString("5bdd20eb-7450-3772-974f-87e31009847e"), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), + new ExpectedViolation(0, PCMIdentifier.of("_7HCu4PViEeuMKba1Qn68bg", false), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), Map.of("flight", List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline")), "ccd", List.of(new ExpectedCharacteristic("GrantedRoles", "User")))), - new ExpectedViolation(UUID.fromString("207639fc-5022-354e-8ffd-7b20885b469e"), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), + new ExpectedViolation(0, PCMIdentifier.of("_vorK8vVeEeuMKba1Qn68bg", false), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), Map.of("flight", List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline")), "ccd", List.of(new ExpectedCharacteristic("GrantedRoles", "User")), "RETURN", diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java index 4a6edc1..5eaf90c 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java @@ -35,9 +35,9 @@ public AnalysisConstraint getDSLConstraint() { @Override public List getExpectedViolations() { return List.of( - new ExpectedViolation(UUID.fromString("faaf62e5-405f-385c-96f1-c01d378193a6"), List.of(new ExpectedCharacteristic("AssignedRole", "User")), + new ExpectedViolation(0, PCMIdentifier.of("_nOhAgILtEe2YyoqaKVkqog", false), List.of(new ExpectedCharacteristic("AssignedRole", "User")), Map.of("RETURN", List.of(new ExpectedCharacteristic("AssignedRole", "Admin")))), - new ExpectedViolation(UUID.fromString("843a03df-2250-3227-b4b2-108318912005"), List.of(new ExpectedCharacteristic("AssignedRole", "User")), + new ExpectedViolation(0, PCMIdentifier.of("_9M9DMoLsEe2YyoqaKVkqog", false), List.of(new ExpectedCharacteristic("AssignedRole", "User")), Map.of("data", List.of(new ExpectedCharacteristic("AssignedRole", "Admin"))))); } From 7619b5fd2893ba7948c4cde66aa427c973492486 Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Sat, 29 Mar 2025 20:40:25 +0100 Subject: [PATCH 05/15] feat(pcm-models): implement and add all violations and corresponding constraints --- .../CoronaWarnApp/default.nodecharacteristics | 70 ++++++------ .../pcm/CoronaWarnApp/default.repository | 100 +++++++++--------- .../pcm/CoronaWarnApp/default.usagemodel | 32 +++--- .../.project | 0 .../composite.system | 0 .../default.allocation | 0 .../default.nodecharacteristics | 0 .../default.repository | 0 .../default.resourceenvironment | 0 .../default.system | 0 .../default.usagemodel | 0 .../dic.pddc | 0 .../representations.aird | 0 .../.project | 0 .../default.allocation | 2 +- .../default.nodecharacteristics | 0 .../default.repository | 0 .../default.resourceenvironment | 0 .../default.system | 0 .../default.usagemodel | 0 .../dic.pddc | 0 .../representations.aird | 0 .../.project | 0 .../default.allocation | 0 .../default.nodecharacteristics | 0 .../default.repository | 0 .../default.resourceenvironment | 0 .../default.system | 0 .../default.usagemodel | 0 .../dic.pddc | 0 .../representations.aird | 0 .../results/ExampleModelResult.java | 3 +- .../results/dfd/BranchingResult.java | 10 +- .../results/dfd/ComplexPseudoCycleResult.java | 10 +- .../results/dfd/DeadOutPinResult.java | 10 +- .../results/dfd/MinimalResult.java | 10 +- .../results/dfd/OnlineShopResult.java | 10 +- .../results/dfd/SimpleLoopResult.java | 10 +- .../results/dfd/SimpleOnlineShopResult.java | 10 +- .../results/dfd/UnusedInputResult.java | 10 +- .../results/dfd/WrongFlowNameResult.java | 10 +- .../pcm/BranchingOnlineShopResult.java | 10 +- .../results/pcm/CoCarResult.java | 16 +-- .../results/pcm/CompositeResult.java | 29 +++-- .../results/pcm/CoronaWarnAppResult.java | 25 +++-- .../results/pcm/IgnoredNodesResult.java | 24 ++--- .../pcm/InternationalOnlineShopResult.java | 6 +- .../results/pcm/MaaSTicketSystemResult.java | 32 ++++-- .../pcm/MultipleDeploymentsResult.java | 6 +- .../pcm/NodeCharacteristicsResult.java | 21 ++-- .../results/pcm/TravelPlannerResult.java | 6 +- .../results/pcm/VariableReturnResult.java | 6 +- 52 files changed, 207 insertions(+), 271 deletions(-) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{CompositeCharacteristicsTest => CompositeCharacteristics}/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{CompositeCharacteristicsTest => CompositeCharacteristics}/composite.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{CompositeCharacteristicsTest => CompositeCharacteristics}/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{CompositeCharacteristicsTest => CompositeCharacteristics}/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{CompositeCharacteristicsTest => CompositeCharacteristics}/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{CompositeCharacteristicsTest => CompositeCharacteristics}/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{CompositeCharacteristicsTest => CompositeCharacteristics}/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{CompositeCharacteristicsTest => CompositeCharacteristics}/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{CompositeCharacteristicsTest => CompositeCharacteristics}/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{CompositeCharacteristicsTest => CompositeCharacteristics}/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{IgnoredNodeTest => IgnoredNodes}/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{IgnoredNodeTest => IgnoredNodes}/default.allocation (90%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{IgnoredNodeTest => IgnoredNodes}/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{IgnoredNodeTest => IgnoredNodes}/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{IgnoredNodeTest => IgnoredNodes}/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{IgnoredNodeTest => IgnoredNodes}/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{IgnoredNodeTest => IgnoredNodes}/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{IgnoredNodeTest => IgnoredNodes}/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{IgnoredNodeTest => IgnoredNodes}/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{NodeCharacteristicsTest => NodeCharacteristics}/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{NodeCharacteristicsTest => NodeCharacteristics}/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{NodeCharacteristicsTest => NodeCharacteristics}/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{NodeCharacteristicsTest => NodeCharacteristics}/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{NodeCharacteristicsTest => NodeCharacteristics}/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{NodeCharacteristicsTest => NodeCharacteristics}/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{NodeCharacteristicsTest => NodeCharacteristics}/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{NodeCharacteristicsTest => NodeCharacteristics}/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/models/pcm/{NodeCharacteristicsTest => NodeCharacteristics}/representations.aird (100%) diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.nodecharacteristics index e00b1dd..534588c 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.nodecharacteristics +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.nodecharacteristics @@ -2,121 +2,121 @@ - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.repository b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.repository index d2cc19c..671cedc 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.repository +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.repository @@ -38,8 +38,8 @@ - - + + @@ -286,8 +286,8 @@ - - + + @@ -354,8 +354,8 @@ - - + + @@ -443,16 +443,16 @@ - - + + - - + + @@ -476,8 +476,8 @@ - - + + @@ -500,8 +500,8 @@ - - + + @@ -525,16 +525,16 @@ - - + + - - + + @@ -718,8 +718,8 @@ - - + + @@ -744,8 +744,8 @@ - - + + @@ -765,8 +765,8 @@ - - + + @@ -782,8 +782,8 @@ - - + + @@ -937,8 +937,8 @@ - - + + @@ -1015,8 +1015,8 @@ - - + + @@ -1083,8 +1083,8 @@ - - + + @@ -1100,8 +1100,8 @@ - - + + @@ -1399,8 +1399,8 @@ - - + + @@ -1439,16 +1439,16 @@ - - + + - - + + @@ -1479,8 +1479,8 @@ - - + + @@ -1503,8 +1503,8 @@ - - + + @@ -1527,8 +1527,8 @@ - - + + @@ -1551,16 +1551,16 @@ - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.usagemodel index 6cef172..abc9d51 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.usagemodel +++ b/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.usagemodel @@ -51,8 +51,8 @@ - - + + @@ -62,8 +62,8 @@ - - + + @@ -83,8 +83,8 @@ - - + + @@ -104,8 +104,8 @@ - - + + @@ -125,8 +125,8 @@ - - + + @@ -180,8 +180,8 @@ - - + + @@ -211,8 +211,8 @@ - - + + @@ -231,8 +231,8 @@ - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/composite.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/composite.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/composite.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/composite.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristicsTest/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.allocation similarity index 90% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.allocation index 18ec7e9..a393b21 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.allocation +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.allocation @@ -1,7 +1,7 @@ - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodeTest/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristicsTest/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java index cdc49f2..b468ab0 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java @@ -1,6 +1,5 @@ package org.dataflowanalysis.examplemodels.results; -import org.dataflowanalysis.analysis.core.AbstractVertex; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.examplemodels.Activator; import org.eclipse.core.runtime.Plugin; @@ -26,7 +25,7 @@ default String getFileName() { String getModelName(); - AnalysisConstraint getDSLConstraint(); + List getDSLConstraints(); List getExpectedViolations(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java index 6f6eb46..88a7f8d 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java @@ -13,15 +13,9 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { + public List getDSLConstraints() { // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("DataSensitivity", "Personal") - .neverFlows() - .toVertex() - .withCharacteristic("ServerLocation", "nonEU") - .create(); + return List.of(); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java index b6922f5..c24f2ac 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java @@ -13,15 +13,9 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { + public List getDSLConstraints() { // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("DataSensitivity", "Personal") - .neverFlows() - .toVertex() - .withCharacteristic("ServerLocation", "nonEU") - .create(); + return List.of(); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java index 52bfe96..5a09862 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java @@ -13,15 +13,9 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { + public List getDSLConstraints() { // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("DataSensitivity", "Personal") - .neverFlows() - .toVertex() - .withCharacteristic("ServerLocation", "nonEU") - .create(); + return List.of(); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java index 7b0d023..a04808b 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java @@ -13,15 +13,9 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { + public List getDSLConstraints() { // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("DataSensitivity", "Personal") - .neverFlows() - .toVertex() - .withCharacteristic("ServerLocation", "nonEU") - .create(); + return List.of(); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java index f5d3cc6..43d9275 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java @@ -13,15 +13,9 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { + public List getDSLConstraints() { // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("DataSensitivity", "Personal") - .neverFlows() - .toVertex() - .withCharacteristic("ServerLocation", "nonEU") - .create(); + return List.of(); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java index 02f147e..c2bdc2a 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java @@ -13,15 +13,9 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { + public List getDSLConstraints() { // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("DataSensitivity", "Personal") - .neverFlows() - .toVertex() - .withCharacteristic("ServerLocation", "nonEU") - .create(); + return List.of(); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java index f3414ff..dfdeb45 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java @@ -13,15 +13,9 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { + public List getDSLConstraints() { // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("DataSensitivity", "Personal") - .neverFlows() - .toVertex() - .withCharacteristic("ServerLocation", "nonEU") - .create(); + return List.of(); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java index e075b38..503dc2e 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java @@ -13,15 +13,9 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { + public List getDSLConstraints() { // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("DataSensitivity", "Personal") - .neverFlows() - .toVertex() - .withCharacteristic("ServerLocation", "nonEU") - .create(); + return List.of(); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java index f22919d..6adfd49 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java @@ -13,15 +13,9 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { + public List getDSLConstraints() { // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("DataSensitivity", "Personal") - .neverFlows() - .toVertex() - .withCharacteristic("ServerLocation", "nonEU") - .create(); + return List.of(); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java index 6ac8f58..9d89ea9 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java @@ -2,13 +2,9 @@ import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.examplemodels.results.ExampleModelResult; -import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import java.util.List; -import java.util.Map; -import java.util.UUID; public class BranchingOnlineShopResult implements PCMExampleModelResult { @Override @@ -16,14 +12,14 @@ public String getModelName() { return "BranchingOnlineShop"; } @Override - public AnalysisConstraint getDSLConstraint() { - return new ConstraintDSL() + public List getDSLConstraints() { + return List.of(new ConstraintDSL() .ofData() .withLabel("DataSensitivity", "Personal") .neverFlows() .toVertex() .withCharacteristic("ServerLocation", "nonEU") - .create(); + .create()); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java index 66bee0f..38e888e 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java @@ -25,19 +25,9 @@ public String getFileName() { } @Override - public AnalysisConstraint getDSLConstraint() { - // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("GrantedRoles", ConstraintVariable.of("grantedRoles")) - .neverFlows() - .toVertex() - .withCharacteristic("AssignedRoles", ConstraintVariable.of("assignedRoles")) - .where() - .isNotEmpty(ConstraintVariable.of("grantedRoles")) - .isNotEmpty(ConstraintVariable.of("assignedRoles")) - .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) - .create(); + public List getDSLConstraints() { + // TODO: Does not exist + return List.of(); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java index 14182cf..acc8fb7 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java @@ -2,40 +2,35 @@ import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.analysis.dsl.selectors.Intersection; -import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.analysis.pcm.core.seff.SEFFPCMVertex; +import org.dataflowanalysis.analysis.pcm.core.user.UserPCMVertex; +import org.dataflowanalysis.analysis.pcm.dsl.PCMVertexType; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import java.util.ArrayList; import java.util.List; -/** - * TODO: This test model tests a specific feature not a integration/E2E test - */ public class CompositeResult implements PCMExampleModelResult { @Override public String getModelName() { - return "Composite"; + return "CompositeCharacteristics"; } @Override - public AnalysisConstraint getDSLConstraint() { - // TODO: Enter actual constraint - return new ConstraintDSL() + public List getDSLConstraints() { + List constraints = new ArrayList<>(); + constraints.add(new ConstraintDSL() .ofData() - .withLabel("AssignedRole", ConstraintVariable.of("grantedRoles")) .neverFlows() .toVertex() - .withCharacteristic("AssignedRole", ConstraintVariable.of("assignedRoles")) - .where() - .isNotEmpty(ConstraintVariable.of("grantedRoles")) - .isNotEmpty(ConstraintVariable.of("assignedRoles")) - .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) - .create(); + .with((vertex) -> vertex instanceof UserPCMVertex && vertex.getAllVertexCharacteristics().size() != 1) + .with((vertex) -> vertex instanceof SEFFPCMVertex && vertex.getAllVertexCharacteristics().size() != 3) + .create()); + return constraints; } @Override public List getExpectedViolations() { - // TODO: Enter violations return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java index 26ecf1a..e26e6c9 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java @@ -6,6 +6,7 @@ import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import java.util.ArrayList; import java.util.List; public class CoronaWarnAppResult implements PCMExampleModelResult { @Override @@ -19,24 +20,26 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { - // TODO: Enter actual constraint - return new ConstraintDSL() + public List getDSLConstraints() { + // TODO: This are not even good constraints... + List constraints = new ArrayList<>(); + constraints.add(new ConstraintDSL() .ofData() - .withLabel("GrantedRoles", ConstraintVariable.of("grantedRoles")) .neverFlows() .toVertex() - .withCharacteristic("AssignedRoles", ConstraintVariable.of("assignedRoles")) - .where() - .isNotEmpty(ConstraintVariable.of("grantedRoles")) - .isNotEmpty(ConstraintVariable.of("assignedRoles")) - .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) - .create(); + .withCharacteristic("Location", "IllegalLocation") + .create()); + constraints.add(new ConstraintDSL() + .ofData() + .withLabel("Status", "Leaked") + .neverFlows() + .toVertex() + .create()); + return constraints; } @Override public List getExpectedViolations() { - // TODO: Enter actual expected violations (should this be per constraint?) return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java index 9bd998f..e0ccf8a 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java @@ -4,9 +4,12 @@ import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.analysis.dsl.selectors.Intersection; import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.analysis.pcm.dsl.PCMVertexType; +import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import java.util.List; +import java.util.Map; /** * TODO: This test model tests a specific feature not a integration/E2E test @@ -18,25 +21,20 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { - // TODO: Enter actual constraint - return new ConstraintDSL() - .ofData() - .withLabel("AssignedRole", ConstraintVariable.of("grantedRoles")) + public List getDSLConstraints() { + return List.of(new ConstraintDSL() + .fromNode() + .withType(PCMVertexType.CALLING) + .withType(PCMVertexType.USER) .neverFlows() .toVertex() - .withCharacteristic("AssignedRole", ConstraintVariable.of("assignedRoles")) - .where() - .isNotEmpty(ConstraintVariable.of("grantedRoles")) - .isNotEmpty(ConstraintVariable.of("assignedRoles")) - .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) - .create(); + .with((node) -> !node.getAllDataCharacteristics().isEmpty()) + .create()); } @Override public List getExpectedViolations() { - // TODO: Enter violations - return List.of(); + return List.of(new ExpectedViolation(0, new PCMIdentifier("_LTpZcKpIEe6ICOKQQaQogw"), List.of(), Map.of("RETURN", List.of(new ExpectedCharacteristic("DataVisibility", "User"))))); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java index 680129d..d0d61b4 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java @@ -16,14 +16,14 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { - return new ConstraintDSL() + public List getDSLConstraints() { + return List.of(new ConstraintDSL() .ofData() .withLabel("DataSensitivity", "Personal") .neverFlows() .toVertex() .withCharacteristic("ServerLocation", "nonEU") - .create(); + .create()); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java index 90568be..8ce15de 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java @@ -6,6 +6,7 @@ import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import java.util.ArrayList; import java.util.List; public class MaaSTicketSystemResult implements PCMExampleModelResult { @@ -25,24 +26,33 @@ public String getFileName() { } @Override - public AnalysisConstraint getDSLConstraint() { - // TODO: Enter actual constraint - // TODO: What are the actual constraints here? - return new ConstraintDSL() + public List getDSLConstraints() { + List constraints = new ArrayList<>(); + constraints.add(new ConstraintDSL() + .fromNode() + .neverFlows() + .toVertex() + .withCharacteristic("Role", "MaliciousActor") + .create()); + constraints.add(new ConstraintDSL() + .ofData() + .withLabel("DataType", "LoginData") + .neverFlows() + .toVertex() + .withCharacteristic("Role", "Customer") + .create()); + constraints.add(new ConstraintDSL() .ofData() - .withLabel("GrantedRoles", ConstraintVariable.of("grantedRoles")) + .withLabel("Origin", "Leaked") .neverFlows() .toVertex() - .withCharacteristic("AssignedRoles", ConstraintVariable.of("assignedRoles")) - .where() - .isNotEmpty(ConstraintVariable.of("grantedRoles")) - .isNotEmpty(ConstraintVariable.of("assignedRoles")) - .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) - .create(); + .create()); + return constraints; } @Override public List getExpectedViolations() { + // TODO: Enter violations return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java index 6946a59..a62ee0f 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java @@ -16,14 +16,14 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { - return new ConstraintDSL() + public List getDSLConstraints() { + return List.of(new ConstraintDSL() .ofData() .withLabel("DataSensitivity", "Personal") .neverFlows() .toVertex() .withCharacteristic("ServerLocation", "nonEU") - .create(); + .create()); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java index d7ca32e..cc93d9b 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java @@ -4,8 +4,11 @@ import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.analysis.dsl.selectors.Intersection; import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; +import org.dataflowanalysis.analysis.pcm.core.seff.SEFFPCMVertex; +import org.dataflowanalysis.analysis.pcm.core.user.UserPCMVertex; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import java.util.ArrayList; import java.util.List; /** @@ -18,24 +21,20 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { - // TODO: Enter actual constraint - return new ConstraintDSL() + public List getDSLConstraints() { + List constraints = new ArrayList<>(); + constraints.add(new ConstraintDSL() .ofData() - .withLabel("AssignedRole", ConstraintVariable.of("grantedRoles")) .neverFlows() .toVertex() - .withCharacteristic("AssignedRole", ConstraintVariable.of("assignedRoles")) - .where() - .isNotEmpty(ConstraintVariable.of("grantedRoles")) - .isNotEmpty(ConstraintVariable.of("assignedRoles")) - .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) - .create(); + .with((vertex) -> vertex instanceof UserPCMVertex && vertex.getAllVertexCharacteristics().size() != 1) + .with((vertex) -> vertex instanceof SEFFPCMVertex && vertex.getAllVertexCharacteristics().size() != 2) + .create()); + return constraints; } @Override public List getExpectedViolations() { - // TODO: Enter violations return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java index 29249b2..166e437 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java @@ -28,8 +28,8 @@ public String getFileName() { } @Override - public AnalysisConstraint getDSLConstraint() { - return new ConstraintDSL() + public List getDSLConstraints() { + return List.of(new ConstraintDSL() .ofData() .withLabel("GrantedRoles", ConstraintVariable.of("grantedRoles")) .neverFlows() @@ -39,7 +39,7 @@ public AnalysisConstraint getDSLConstraint() { .isNotEmpty(ConstraintVariable.of("grantedRoles")) .isNotEmpty(ConstraintVariable.of("assignedRoles")) .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) - .create(); + .create()); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java index 5eaf90c..ed62f22 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java @@ -18,8 +18,8 @@ public String getModelName() { } @Override - public AnalysisConstraint getDSLConstraint() { - return new ConstraintDSL() + public List getDSLConstraints() { + return List.of(new ConstraintDSL() .ofData() .withLabel("AssignedRole", ConstraintVariable.of("grantedRoles")) .neverFlows() @@ -29,7 +29,7 @@ public AnalysisConstraint getDSLConstraint() { .isNotEmpty(ConstraintVariable.of("grantedRoles")) .isNotEmpty(ConstraintVariable.of("assignedRoles")) .isEmpty(Intersection.of(ConstraintVariable.of("grantedRoles"), ConstraintVariable.of("assignedRoles"))) - .create(); + .create()); } @Override From 4abfce992fd7a29d1a85967f89dfb5a2f8034e9b Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Sun, 30 Mar 2025 13:44:16 +0200 Subject: [PATCH 06/15] feat(dfd-models): implement expected violations for dfd models --- ....datadictionary => default.datadictionary} | 0 ...ataflowdiagram => default.dataflowdiagram} | 44 ++++++------- ....datadictionary => default.datadictionary} | 0 ...ataflowdiagram => default.dataflowdiagram} | 34 +++++----- ....datadictionary => default.datadictionary} | 0 ...ataflowdiagram => default.dataflowdiagram} | 8 +-- ....datadictionary => default.datadictionary} | 0 ...ataflowdiagram => default.dataflowdiagram} | 36 +++++------ .../models/dfd/OnlineShop/.project | 18 ------ ....datadictionary => default.datadictionary} | 0 ...ataflowdiagram => default.dataflowdiagram} | 50 +++++++-------- ....datadictionary => default.datadictionary} | 0 ...ataflowdiagram => default.dataflowdiagram} | 32 +++++----- .../models/dfd/SimpleOnlineShop/.project | 18 ------ ....datadictionary => default.datadictionary} | 0 ...ataflowdiagram => default.dataflowdiagram} | 62 +++++++++---------- ....datadictionary => default.datadictionary} | 0 ...ataflowdiagram => default.dataflowdiagram} | 20 +++--- ....datadictionary => default.datadictionary} | 0 ...ataflowdiagram => default.dataflowdiagram} | 14 ++--- .../results/ExpectedViolation.java | 37 ++++++++++- .../results/dfd/BranchingResult.java | 9 ++- .../results/dfd/ComplexPseudoCycleResult.java | 4 +- .../results/dfd/DFDExampleModelResult.java | 2 +- .../results/dfd/DeadOutPinResult.java | 4 +- .../results/dfd/MinimalResult.java | 4 +- .../results/dfd/OnlineShopResult.java | 18 ++++-- .../results/dfd/SimpleLoopResult.java | 4 +- .../results/dfd/SimpleOnlineShopResult.java | 20 ++++-- .../results/dfd/UnusedInputResult.java | 4 +- .../results/dfd/WrongFlowNameResult.java | 4 +- 31 files changed, 234 insertions(+), 212 deletions(-) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/{BranchingTest.datadictionary => default.datadictionary} (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/{BranchingTest.dataflowdiagram => default.dataflowdiagram} (53%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/{complexPseudoCycle.datadictionary => default.datadictionary} (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/{complexPseudoCycle.dataflowdiagram => default.dataflowdiagram} (51%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/{DeadOutPin.datadictionary => default.datadictionary} (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/{DeadOutPin.dataflowdiagram => default.dataflowdiagram} (67%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/{minimal.datadictionary => default.datadictionary} (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/{minimal.dataflowdiagram => default.dataflowdiagram} (56%) delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/.project rename bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/{onlineshop.datadictionary => default.datadictionary} (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/{onlineshop.dataflowdiagram => default.dataflowdiagram} (54%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/{loopDFD.datadictionary => default.datadictionary} (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/{loopDFD.dataflowdiagram => default.dataflowdiagram} (51%) delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/.project rename bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/{onlineshop.datadictionary => default.datadictionary} (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/{onlineshop.dataflowdiagram => default.dataflowdiagram} (52%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/{UnusedInput.datadictionary => default.datadictionary} (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/{UnusedInput.dataflowdiagram => default.dataflowdiagram} (59%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/{WrongFlowName.datadictionary => default.datadictionary} (100%) rename bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/{WrongFlowName.dataflowdiagram => default.dataflowdiagram} (64%) diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/BranchingTest.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/BranchingTest.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/BranchingTest.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/default.dataflowdiagram similarity index 53% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/BranchingTest.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/default.dataflowdiagram index 5944167..9947e1f 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/BranchingTest.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/default.dataflowdiagram @@ -1,47 +1,47 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/complexPseudoCycle.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/complexPseudoCycle.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/complexPseudoCycle.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/default.dataflowdiagram similarity index 51% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/complexPseudoCycle.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/default.dataflowdiagram index c3b326a..a54abbd 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/complexPseudoCycle.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/default.dataflowdiagram @@ -1,42 +1,42 @@ - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/DeadOutPin.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/DeadOutPin.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/DeadOutPin.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/default.dataflowdiagram similarity index 67% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/DeadOutPin.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/default.dataflowdiagram index f0b7058..2e6c5fc 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/DeadOutPin.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/default.dataflowdiagram @@ -1,13 +1,13 @@ - - + + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/minimal.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/minimal.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/minimal.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/default.dataflowdiagram similarity index 56% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/minimal.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/default.dataflowdiagram index 8c23282..55b983b 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/minimal.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/default.dataflowdiagram @@ -1,39 +1,39 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/.project b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/.project deleted file mode 100644 index 16cb9f7..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/.project +++ /dev/null @@ -1,18 +0,0 @@ - - - OnlineShopDFD - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - - org.eclipse.sirius.nature.modelingproject - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/onlineshop.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/onlineshop.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/onlineshop.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/default.dataflowdiagram similarity index 54% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/onlineshop.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/default.dataflowdiagram index efa483a..d90a2d8 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/onlineshop.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/default.dataflowdiagram @@ -1,58 +1,58 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/loopDFD.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/loopDFD.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/loopDFD.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/default.dataflowdiagram similarity index 51% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/loopDFD.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/default.dataflowdiagram index c9e8a6f..d1cf8bc 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/loopDFD.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/default.dataflowdiagram @@ -1,35 +1,35 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/.project b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/.project deleted file mode 100644 index 655ed7e..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/.project +++ /dev/null @@ -1,18 +0,0 @@ - - - OnlineShopDFDsimple - - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - - org.eclipse.sirius.nature.modelingproject - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/onlineshop.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/onlineshop.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/onlineshop.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/default.dataflowdiagram similarity index 52% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/onlineshop.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/default.dataflowdiagram index d25520a..005cd4b 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/onlineshop.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/default.dataflowdiagram @@ -1,70 +1,70 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - + - + - + - - + + - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/UnusedInput.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/UnusedInput.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/UnusedInput.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/default.dataflowdiagram similarity index 59% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/UnusedInput.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/default.dataflowdiagram index fa2c476..e547efe 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/UnusedInput.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/default.dataflowdiagram @@ -1,27 +1,27 @@ - - + + - - + + - - + + - + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/WrongFlowName.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/WrongFlowName.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/WrongFlowName.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/default.dataflowdiagram similarity index 64% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/WrongFlowName.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/default.dataflowdiagram index b269f1c..26f0a3b 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/WrongFlowName.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/default.dataflowdiagram @@ -1,20 +1,20 @@ - - + + - - + + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java index 3f56e3a..aa38c1e 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java @@ -1,10 +1,8 @@ package org.dataflowanalysis.examplemodels.results; -import org.dataflowanalysis.analysis.core.AbstractTransposeFlowGraph; import org.dataflowanalysis.analysis.core.AbstractVertex; import org.dataflowanalysis.analysis.core.CharacteristicValue; import org.dataflowanalysis.analysis.core.DataCharacteristic; -import org.dataflowanalysis.analysis.pcm.core.AbstractPCMVertex; import java.util.*; @@ -28,7 +26,12 @@ public boolean references(AbstractVertex element, int flowGraphIndex) { public List hasNodeCharacteristic(List actualCharacteristics) { return this.vertexCharacteristics.stream().filter(it -> !this.hasCharacteristicValue(it, actualCharacteristics)).toList(); + } + public List hasIncorrectNodeCharacteristics(List actualCharacteristics) { + return actualCharacteristics.stream() + .filter(it -> !this.hasExpectedCharacteristic(this.vertexCharacteristics, it)) + .toList(); } public Map> hasDataCharacteristics(List actualDataCharacteristics) { @@ -55,12 +58,42 @@ public Map> hasDataCharacteristics(List> hasMissingDataCharacteristics(List actualDataCharacteristics) { + Map> missingDataCharacteristics = new HashMap<>(); + for (var actualDataCharacteristic : actualDataCharacteristics) { + Optional> expectedCharacteristics = this.dataCharacteristics.entrySet().stream() + .filter(it -> it.getKey().equals(actualDataCharacteristic.getVariableName())) + .map(Map.Entry::getValue) + .findAny(); + if (expectedCharacteristics.isEmpty()) { + missingDataCharacteristics.put(actualDataCharacteristic.getVariableName(), actualDataCharacteristic.getAllCharacteristics()); + continue; + } + List incorrectCharacteristics = new ArrayList<>(); + for (var actualCharacteristic : actualDataCharacteristic.getAllCharacteristics()) { + if (!this.hasExpectedCharacteristic(expectedCharacteristics.get(), actualCharacteristic)) { + incorrectCharacteristics.add(actualCharacteristic); + } + } + if (!incorrectCharacteristics.isEmpty()) { + missingDataCharacteristics.put(actualDataCharacteristic.getVariableName(), incorrectCharacteristics); + } + } + return missingDataCharacteristics; + } + private boolean hasCharacteristicValue(ExpectedCharacteristic expectedCharacteristic, List actualCharacteristics) { return actualCharacteristics.stream() .filter(it -> expectedCharacteristic.characteristicType().equals(it.getTypeName())) .anyMatch(it -> expectedCharacteristic.characteristicLiteral().equals(it.getValueName())); } + private boolean hasExpectedCharacteristic(List expectedCharacteristics, CharacteristicValue actualCharacteristic) { + return expectedCharacteristics.stream() + .filter(it -> it.characteristicType().equals(actualCharacteristic.getTypeName())) + .anyMatch(it -> it.characteristicLiteral().equals(actualCharacteristic.getValueName())); + } + public Identifier getIdentifier() { return identifier; } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java index 88a7f8d..9ad4bb3 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java @@ -14,13 +14,16 @@ public String getModelName() { @Override public List getDSLConstraints() { - // TODO: Enter actual constraint - return List.of(); + return List.of(new ConstraintDSL() + .ofData() + .neverFlows() + .toVertex() + .with((vertex) -> vertex.getAllVertexCharacteristics().isEmpty()) + .create()); } @Override public List getExpectedViolations() { - // TODO: Enter actual violations return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java index c24f2ac..c62f0d6 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java @@ -14,13 +14,13 @@ public String getModelName() { @Override public List getDSLConstraints() { - // TODO: Enter actual constraint + // TODO: Has no constraints return List.of(); } @Override public List getExpectedViolations() { - // TODO: Enter actual violations + // TODO: Has no constraints; Therefore no expected violations return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java index 0a80737..f7749b3 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java @@ -10,6 +10,6 @@ default String getDataFlowDiagram() { } default String getDataDictionary() { - return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.datadictionary", this.getFileName())).toString(); + return Paths.get(this.getBaseFolderName(), "dfd", this.getModelName(), String.format("%s.datadictionary", this.getFileName())).toString(); } } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java index 5a09862..320afa3 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java @@ -14,13 +14,13 @@ public String getModelName() { @Override public List getDSLConstraints() { - // TODO: Enter actual constraint + // TODO: Has no constraints return List.of(); } @Override public List getExpectedViolations() { - // TODO: Enter actual violations + // TODO: Has no constraints; Therefore no expected violations return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java index a04808b..196eda8 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java @@ -14,13 +14,13 @@ public String getModelName() { @Override public List getDSLConstraints() { - // TODO: Enter actual constraint + // TODO: Has no constraints return List.of(); } @Override public List getExpectedViolations() { - // TODO: Enter actual violations + // TODO: Has no constraints; Therefore no expected violations return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java index 43d9275..1b81ee5 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java @@ -2,9 +2,11 @@ import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import java.util.List; +import java.util.Map; public class OnlineShopResult implements DFDExampleModelResult { @Override @@ -14,14 +16,22 @@ public String getModelName() { @Override public List getDSLConstraints() { - // TODO: Enter actual constraint - return List.of(); + return List.of(new ConstraintDSL() + .ofData() + .withLabel("Sensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("Location", "nonEU") + .create()); } @Override public List getExpectedViolations() { - // TODO: Enter actual violations - return List.of(); + return List.of(new ExpectedViolation(2, new DFDIdentifier("_U27Lor6CEe6fAKdvyu1GEg"), List.of(new ExpectedCharacteristic("Location", "nonEU")), + Map.of("_zWPQ8L6GEe6fAKdvyu1GEg", List.of( + new ExpectedCharacteristic("Sensitivity", "Personal"), + new ExpectedCharacteristic("Encryption", "Encrypted") + )))); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java index c2bdc2a..26035ce 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java @@ -14,13 +14,13 @@ public String getModelName() { @Override public List getDSLConstraints() { - // TODO: Enter actual constraint + // TODO: Has no constraints return List.of(); } @Override public List getExpectedViolations() { - // TODO: Enter actual violations + // TODO: Has no constraints; Therefore no expected violations return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java index dfdeb45..7c86c16 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java @@ -2,9 +2,11 @@ import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import java.util.List; +import java.util.Map; public class SimpleOnlineShopResult implements DFDExampleModelResult { @Override @@ -14,14 +16,24 @@ public String getModelName() { @Override public List getDSLConstraints() { - // TODO: Enter actual constraint - return List.of(); + + return List.of(new ConstraintDSL() + .ofData() + .withLabel("Sensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("Location", "nonEU") + .create()); } @Override public List getExpectedViolations() { - // TODO: Enter actual violations - return List.of(); + return List.of(new ExpectedViolation(1, new DFDIdentifier("_U27Lor6CEe6fAKdvyu1GEg"), + List.of(new ExpectedCharacteristic("Location", "nonEU")), + Map.of("_448GwMBCEe62ZOq30ePU7Q", List.of( + new ExpectedCharacteristic("Sensitivity", "Personal"), + new ExpectedCharacteristic("Encryption", "Encrypted") + )))); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java index 503dc2e..407d696 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java @@ -14,13 +14,13 @@ public String getModelName() { @Override public List getDSLConstraints() { - // TODO: Enter actual constraint + // TODO: Has no constraints return List.of(); } @Override public List getExpectedViolations() { - // TODO: Enter actual violations + // TODO: Has no constraints; Therefore no expected violations return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java index 6adfd49..1dc081b 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java @@ -14,13 +14,13 @@ public String getModelName() { @Override public List getDSLConstraints() { - // TODO: Enter actual constraint + // TODO: Has no constraints return List.of(); } @Override public List getExpectedViolations() { - // TODO: Enter actual violations + // TODO: Has no constraints; Therefore no expected violations return List.of(); } From e8bd3b69368aa6e4edc30dbf1107168b9e9bfa2a Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Tue, 1 Apr 2025 13:45:29 +0200 Subject: [PATCH 07/15] feat: add pcm extension test models --- .../CharacteristicTypes.characteristics | 19 + .../Characteristics.characteristics | 19 + .../pcm/BankBranches/newAllocation.allocation | 17 + .../pcm/BankBranches/newRepository.repository | 229 + ...newResourceEnvironment.resourceenvironment | 11 + .../models/pcm/BankBranches/newSystem.system | 50 + .../pcm/BankBranches/newUsageModel.usagemodel | 443 + .../CharacteristicTypes.characteristics | 9 + .../pcm/ContactSMS/newAllocation.allocation | 17 + .../pcm/ContactSMS/newRepository.repository | 147 + ...newResourceEnvironment.resourceenvironment | 24 + ...onment.resourceenvironment.characteristics | 11 + .../models/pcm/ContactSMS/newSystem.system | 32 + .../pcm/ContactSMS/newUsageModel.usagemodel | 90 + .../newUsageModel.usagemodel.characteristics | 7 + .../pcm/ContactSMS/representations.aird | 3311 +++ .../CharacteristicTypes.characteristics | 10 + .../Characteristics.characteristics | 15 + .../DistanceTracker/newAllocation.allocation | 17 + .../DistanceTracker/newRepository.repository | 243 + ...newResourceEnvironment.resourceenvironment | 24 + .../pcm/DistanceTracker/newSystem.system | 32 + .../DistanceTracker/newUsageModel.usagemodel | 74 + .../CharacteristicTypes.characteristics | 10 + .../Characteristics.characteristics | 15 + .../FlightControl/newAllocation.allocation | 21 + .../FlightControl/newRepository.repository | 304 + ...newResourceEnvironment.resourceenvironment | 29 + .../models/pcm/FlightControl/newSystem.system | 65 + .../FlightControl/newUsageModel.usagemodel | 142 + .../CharacteristicTypes.characteristics | 12 + .../pcm/FriendMap/newAllocation.allocation | 25 + .../pcm/FriendMap/newRepository.repository | 258 + ...newResourceEnvironment.resourceenvironment | 34 + ...onment.resourceenvironment.characteristics | 19 + .../pcm/FriendMap/newUsageModel.usagemodel | 88 + .../newUsageModel.usagemodel.characteristics | 7 + .../models/pcm/FriendMap/newsystem.system | 42 + .../models/pcm/FriendMap/representations.aird | 4318 ++++ .../characteristicTypes.characteristics | 10 + .../pcm/HealthRecord/newAllocation.allocation | 25 + .../pcm/HealthRecord/newRepository.repository | 359 + ...newResourceEnvironment.resourceenvironment | 4 + .../models/pcm/HealthRecord/newSystem.system | 51 + .../pcm/HealthRecord/newUsageModel.usagemodel | 267 + .../newUsageModel.usagemodel.characteristics | 18 + .../pcm/HealthRecord/representations.aird | 7380 +++++++ .../CharacteristicTypes.characteristics | 12 + .../pcm/Hospital/newAllocation.allocation | 17 + .../pcm/Hospital/newRepository.repository | 262 + ...newResourceEnvironment.resourceenvironment | 13 + ...onment.resourceenvironment.characteristics | 7 + .../models/pcm/Hospital/newSystem.system | 34 + .../pcm/Hospital/newUsageModel.usagemodel | 177 + .../newUsageModel.usagemodel.characteristics | 15 + .../models/pcm/Hospital/representations.aird | 4484 ++++ .../CharacteristicTypes.characteristics | 11 + .../Characteristics.characteristics | 24 + .../pcm/ImageSharing/newAllocation.allocation | 9 + .../pcm/ImageSharing/newRepository.repository | 21 + ...newResourceEnvironment.resourceenvironment | 4 + .../models/pcm/ImageSharing/newSystem.system | 22 + .../pcm/ImageSharing/newUsageModel.usagemodel | 87 + .../pcm/LoyaltyCard/LoyaltyCard.allocation | 29 + .../pcm/LoyaltyCard/LoyaltyCard.datamodel | 39 + .../models/pcm/LoyaltyCard/LoyaltyCard.dfd | 1034 + .../LoyaltyCard.organizationenvironmentmodel | 7 + .../pcm/LoyaltyCard/LoyaltyCard.repository | 614 + .../LoyaltyCard.resourceenvironment | 14 + .../models/pcm/LoyaltyCard/LoyaltyCard.system | 55 + .../MakeStorePurchaseOnline.bpusagemodel | 19 + ...orePurchaseWithLoyaltyProgram.bpusagemodel | 19 + ... Advertisements and Discounts.bpusagemodel | 48 + .../RegisterLoyaltyCustomer.usagemodel | 24 + .../RegisterOnlineCustomer.usagemodel | 24 + .../Solve Customer Problem.bpusagemodel | 17 + .../models/pcm/LoyaltyCard/expected_dd.xmi | 51 + .../models/pcm/LoyaltyCard/expected_dfd.xmi | 1422 ++ .../CharacteristicTypes.characteristics | 24 + .../Characteristics.characteristics | 19 + .../pcm/PrivateTaxi/newAllocation.allocation | 21 + .../pcm/PrivateTaxi/newRepository.repository | 949 + ...newResourceEnvironment.resourceenvironment | 13 + .../models/pcm/PrivateTaxi/newSystem.system | 114 + .../pcm/PrivateTaxi/newUsageModel.usagemodel | 207 + .../pcm/PrivateTaxi/representations.aird | 17237 ++++++++++++++++ .../pcm/TravelPlanner/My.characteristics | 10 + .../models/pcm/TravelPlanner/expected.xmi | 540 + .../models/pcm/TravelPlanner/expected_dd.xmi | 10 + .../models/pcm/TravelPlanner/expected_dfd.xmi | 642 + .../pcm/TravelPlanner/newAssembly.system | 71 + .../TravelPlanner/newRepository.repository | 254 + .../TravelPlanner/newUsageModel.usagemodel | 75 + .../results/pcm/BankBranchesResult.java | 5 + .../results/pcm/ContactSMSResult.java | 5 + .../results/pcm/DistanceTrackerResult.java | 5 + .../results/pcm/FlightControlResult.java | 5 + .../results/pcm/FriendMapResult.java | 5 + .../results/pcm/HealthRecordResult.java | 5 + .../results/pcm/HospitalResult.java | 5 + .../results/pcm/ImageSharingResult.java | 5 + .../results/pcm/LoyaltyCardResult.java | 5 + .../results/pcm/PrivateTaxiResult.java | 5 + 103 files changed, 47205 insertions(+) create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/CharacteristicTypes.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/Characteristics.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newAllocation.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newRepository.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newResourceEnvironment.resourceenvironment create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newSystem.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/CharacteristicTypes.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newAllocation.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newRepository.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newSystem.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/representations.aird create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/CharacteristicTypes.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/Characteristics.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newAllocation.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newRepository.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newSystem.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/CharacteristicTypes.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/Characteristics.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newAllocation.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newRepository.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newResourceEnvironment.resourceenvironment create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newSystem.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/CharacteristicTypes.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newAllocation.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newRepository.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newsystem.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/representations.aird create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/characteristicTypes.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newAllocation.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newRepository.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newResourceEnvironment.resourceenvironment create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newSystem.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/representations.aird create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/CharacteristicTypes.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newAllocation.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newRepository.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newSystem.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/representations.aird create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/CharacteristicTypes.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/Characteristics.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newAllocation.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newRepository.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newResourceEnvironment.resourceenvironment create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newSystem.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.datamodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.dfd create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dd.xmi create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dfd.xmi create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/CharacteristicTypes.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/Characteristics.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newAllocation.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newRepository.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newSystem.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/representations.aird create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/My.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected.xmi create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dd.xmi create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dfd.xmi create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newAssembly.system create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newRepository.repository create mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BankBranchesResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ContactSMSResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/DistanceTrackerResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FlightControlResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FriendMapResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HealthRecordResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HospitalResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ImageSharingResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/LoyaltyCardResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PrivateTaxiResult.java diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/CharacteristicTypes.characteristics new file mode 100644 index 0000000..9d7ac95 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/CharacteristicTypes.characteristics @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/Characteristics.characteristics new file mode 100644 index 0000000..df4b322 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/Characteristics.characteristics @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newAllocation.allocation new file mode 100644 index 0000000..b98497f --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newAllocation.allocation @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newRepository.repository new file mode 100644 index 0000000..e270031 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newRepository.repository @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newResourceEnvironment.resourceenvironment new file mode 100644 index 0000000..9cc6f0f --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newResourceEnvironment.resourceenvironment @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newSystem.system new file mode 100644 index 0000000..bd48939 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newSystem.system @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newUsageModel.usagemodel new file mode 100644 index 0000000..5da4038 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newUsageModel.usagemodel @@ -0,0 +1,443 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/CharacteristicTypes.characteristics new file mode 100644 index 0000000..0249d98 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/CharacteristicTypes.characteristics @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newAllocation.allocation new file mode 100644 index 0000000..5b0bdb9 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newAllocation.allocation @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newRepository.repository new file mode 100644 index 0000000..0e99a97 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newRepository.repository @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment new file mode 100644 index 0000000..b39e2ce --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics new file mode 100644 index 0000000..8c93fc5 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newSystem.system new file mode 100644 index 0000000..c62ab3c --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newSystem.system @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel new file mode 100644 index 0000000..efb5220 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel.characteristics new file mode 100644 index 0000000..0baa64c --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel.characteristics @@ -0,0 +1,7 @@ + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/representations.aird new file mode 100644 index 0000000..e3106f8 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/representations.aird @@ -0,0 +1,3311 @@ + + + + CharacteristicTypes.characteristics + newRepository.repository + pathmap://PCM_MODELS/Palladio.resourcetype + pathmap://PCM_MODELS/PrimitiveTypes.repository + pathmap://PCM_MODELS/FailureTypes.repository + newSystem.system + newResourceEnvironment.resourceenvironment + newAllocation.allocation + newUsageModel.usagemodel + newUsageModel.usagemodel.characteristics + newResourceEnvironment.resourceenvironment.characteristics + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/CharacteristicTypes.characteristics new file mode 100644 index 0000000..dd727af --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/CharacteristicTypes.characteristics @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/Characteristics.characteristics new file mode 100644 index 0000000..348dda3 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/Characteristics.characteristics @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newAllocation.allocation new file mode 100644 index 0000000..536a63f --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newAllocation.allocation @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newRepository.repository new file mode 100644 index 0000000..c2e79a6 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newRepository.repository @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment new file mode 100644 index 0000000..788aaaf --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newSystem.system new file mode 100644 index 0000000..4fab0a2 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newSystem.system @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newUsageModel.usagemodel new file mode 100644 index 0000000..e9e437b --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newUsageModel.usagemodel @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/CharacteristicTypes.characteristics new file mode 100644 index 0000000..8044e5a --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/CharacteristicTypes.characteristics @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/Characteristics.characteristics new file mode 100644 index 0000000..6aebf87 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/Characteristics.characteristics @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newAllocation.allocation new file mode 100644 index 0000000..c35a0d4 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newAllocation.allocation @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newRepository.repository new file mode 100644 index 0000000..31c5aa4 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newRepository.repository @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newResourceEnvironment.resourceenvironment new file mode 100644 index 0000000..4836a98 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newResourceEnvironment.resourceenvironment @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newSystem.system new file mode 100644 index 0000000..e98b4bd --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newSystem.system @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newUsageModel.usagemodel new file mode 100644 index 0000000..b4647b9 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newUsageModel.usagemodel @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/CharacteristicTypes.characteristics new file mode 100644 index 0000000..384f928 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/CharacteristicTypes.characteristics @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newAllocation.allocation new file mode 100644 index 0000000..86c8eda --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newAllocation.allocation @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newRepository.repository new file mode 100644 index 0000000..f2721aa --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newRepository.repository @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment new file mode 100644 index 0000000..d894e7c --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics new file mode 100644 index 0000000..3e90e7f --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel new file mode 100644 index 0000000..359d6c2 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel.characteristics new file mode 100644 index 0000000..f1f3ba6 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel.characteristics @@ -0,0 +1,7 @@ + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newsystem.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newsystem.system new file mode 100644 index 0000000..d56c5d5 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newsystem.system @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/representations.aird new file mode 100644 index 0000000..002bbc0 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/representations.aird @@ -0,0 +1,4318 @@ + + + + newRepository.repository + pathmap://PCM_MODELS/Palladio.resourcetype + pathmap://PCM_MODELS/PrimitiveTypes.repository + pathmap://PCM_MODELS/FailureTypes.repository + CharacteristicTypes.characteristics + newsystem.system + newResourceEnvironment.resourceenvironment + newAllocation.allocation + newResourceEnvironment.resourceenvironment.characteristics + newUsageModel.usagemodel + newUsageModel.usagemodel.characteristics + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/characteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/characteristicTypes.characteristics new file mode 100644 index 0000000..173eae0 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/characteristicTypes.characteristics @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newAllocation.allocation new file mode 100644 index 0000000..8e11669 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newAllocation.allocation @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newRepository.repository new file mode 100644 index 0000000..5ea7f2a --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newRepository.repository @@ -0,0 +1,359 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newResourceEnvironment.resourceenvironment new file mode 100644 index 0000000..4c03288 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newResourceEnvironment.resourceenvironment @@ -0,0 +1,4 @@ + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newSystem.system new file mode 100644 index 0000000..f566385 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newSystem.system @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel new file mode 100644 index 0000000..fe14c94 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel.characteristics new file mode 100644 index 0000000..39dc7e8 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel.characteristics @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/representations.aird new file mode 100644 index 0000000..75e1dc8 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/representations.aird @@ -0,0 +1,7380 @@ + + + + newRepository.repository + pathmap://PCM_MODELS/Palladio.resourcetype + pathmap://PCM_MODELS/PrimitiveTypes.repository + pathmap://PCM_MODELS/FailureTypes.repository + characteristicTypes.characteristics + newSystem.system + newResourceEnvironment.resourceenvironment + newAllocation.allocation + newUsageModel.usagemodel + newUsageModel.usagemodel.characteristics + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/CharacteristicTypes.characteristics new file mode 100644 index 0000000..f2af039 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/CharacteristicTypes.characteristics @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newAllocation.allocation new file mode 100644 index 0000000..0c20780 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newAllocation.allocation @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newRepository.repository new file mode 100644 index 0000000..64498b5 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newRepository.repository @@ -0,0 +1,262 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment new file mode 100644 index 0000000..cff7cab --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics new file mode 100644 index 0000000..88b2483 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics @@ -0,0 +1,7 @@ + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newSystem.system new file mode 100644 index 0000000..bcf9197 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newSystem.system @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel new file mode 100644 index 0000000..80468fc --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel.characteristics new file mode 100644 index 0000000..f695476 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel.characteristics @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/representations.aird new file mode 100644 index 0000000..f98b4ad --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/representations.aird @@ -0,0 +1,4484 @@ + + + + newRepository.repository + pathmap://PCM_MODELS/Palladio.resourcetype + pathmap://PCM_MODELS/PrimitiveTypes.repository + pathmap://PCM_MODELS/FailureTypes.repository + CharacteristicTypes.characteristics + newSystem.system + newResourceEnvironment.resourceenvironment + newResourceEnvironment.resourceenvironment.characteristics + newAllocation.allocation + newUsageModel.usagemodel + newUsageModel.usagemodel.characteristics + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/CharacteristicTypes.characteristics new file mode 100644 index 0000000..cc2197d --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/CharacteristicTypes.characteristics @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/Characteristics.characteristics new file mode 100644 index 0000000..d7ba719 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/Characteristics.characteristics @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newAllocation.allocation new file mode 100644 index 0000000..73859bd --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newAllocation.allocation @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newRepository.repository new file mode 100644 index 0000000..d113fd7 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newRepository.repository @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newResourceEnvironment.resourceenvironment new file mode 100644 index 0000000..54c2663 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newResourceEnvironment.resourceenvironment @@ -0,0 +1,4 @@ + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newSystem.system new file mode 100644 index 0000000..069903b --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newSystem.system @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newUsageModel.usagemodel new file mode 100644 index 0000000..d83314a --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newUsageModel.usagemodel @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.allocation new file mode 100644 index 0000000..9e355f8 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.allocation @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.datamodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.datamodel new file mode 100644 index 0000000..1094555 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.datamodel @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.dfd b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.dfd new file mode 100644 index 0000000..125e980 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.dfd @@ -0,0 +1,1034 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel new file mode 100644 index 0000000..9f0ad0a --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel @@ -0,0 +1,7 @@ + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.repository new file mode 100644 index 0000000..910ad95 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.repository @@ -0,0 +1,614 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment new file mode 100644 index 0000000..eb52aba --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.system new file mode 100644 index 0000000..aff1f3e --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.system @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel new file mode 100644 index 0000000..763164e --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel new file mode 100644 index 0000000..0705068 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel new file mode 100644 index 0000000..bb6ab5b --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel new file mode 100644 index 0000000..3cd1d9a --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel new file mode 100644 index 0000000..c16a5b9 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel new file mode 100644 index 0000000..29242a0 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dd.xmi b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dd.xmi new file mode 100644 index 0000000..c7e92a6 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dd.xmi @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dfd.xmi b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dfd.xmi new file mode 100644 index 0000000..25a95a1 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dfd.xmi @@ -0,0 +1,1422 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/CharacteristicTypes.characteristics new file mode 100644 index 0000000..585b0dd --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/CharacteristicTypes.characteristics @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/Characteristics.characteristics new file mode 100644 index 0000000..f91edee --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/Characteristics.characteristics @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newAllocation.allocation new file mode 100644 index 0000000..e63d050 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newAllocation.allocation @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newRepository.repository new file mode 100644 index 0000000..d1b3fb4 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newRepository.repository @@ -0,0 +1,949 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment new file mode 100644 index 0000000..9e3e54d --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newSystem.system new file mode 100644 index 0000000..b860372 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newSystem.system @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newUsageModel.usagemodel new file mode 100644 index 0000000..6689327 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newUsageModel.usagemodel @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/representations.aird new file mode 100644 index 0000000..5eb8ceb --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/representations.aird @@ -0,0 +1,17237 @@ + + + + CharacteristicTypes.characteristics + Characteristics.characteristics + newAllocation.allocation + newResourceEnvironment.resourceenvironment + newSystem.system + newRepository.repository + platform:/plugin/org.palladiosimulator.dataflow.confidentiality.pcm.model.profile/profile.emfprofile_diagram + newUsageModel.usagemodel + pathmap://PCM_MODELS/FailureTypes.repository + pathmap://PCM_MODELS/Palladio.resourcetype + pathmap://PCM_MODELS/PrimitiveTypes.repository + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/My.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/My.characteristics new file mode 100644 index 0000000..aa93664 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/My.characteristics @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected.xmi b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected.xmi new file mode 100644 index 0000000..f9b4add --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected.xmi @@ -0,0 +1,540 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dd.xmi b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dd.xmi new file mode 100644 index 0000000..daa2ec9 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dd.xmi @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dfd.xmi b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dfd.xmi new file mode 100644 index 0000000..8447dd8 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dfd.xmi @@ -0,0 +1,642 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newAssembly.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newAssembly.system new file mode 100644 index 0000000..5a24851 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newAssembly.system @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newRepository.repository new file mode 100644 index 0000000..7400833 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newRepository.repository @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newUsageModel.usagemodel new file mode 100644 index 0000000..b35936c --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newUsageModel.usagemodel @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BankBranchesResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BankBranchesResult.java new file mode 100644 index 0000000..ca6a8bc --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BankBranchesResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +public class BankBranchesResult { + //TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ContactSMSResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ContactSMSResult.java new file mode 100644 index 0000000..7ea3403 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ContactSMSResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +public class ContactSMSResult { + //TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/DistanceTrackerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/DistanceTrackerResult.java new file mode 100644 index 0000000..03541de --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/DistanceTrackerResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +public class DistanceTrackerResult { + //TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FlightControlResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FlightControlResult.java new file mode 100644 index 0000000..6d5c3c9 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FlightControlResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +public class FlightControlResult { + //TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FriendMapResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FriendMapResult.java new file mode 100644 index 0000000..cbbccff --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FriendMapResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +public class FriendMapResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HealthRecordResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HealthRecordResult.java new file mode 100644 index 0000000..dedfbf6 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HealthRecordResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +public class HealthRecordResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HospitalResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HospitalResult.java new file mode 100644 index 0000000..8b25b95 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HospitalResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +public class HospitalResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ImageSharingResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ImageSharingResult.java new file mode 100644 index 0000000..4b7213b --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ImageSharingResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +public class ImageSharingResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/LoyaltyCardResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/LoyaltyCardResult.java new file mode 100644 index 0000000..cd754af --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/LoyaltyCardResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +public class LoyaltyCardResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PrivateTaxiResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PrivateTaxiResult.java new file mode 100644 index 0000000..c48b469 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PrivateTaxiResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +public class PrivateTaxiResult { + // TODO +} From 579f228cf49b8214f3a3c03c7ddd30492d7429d7 Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Mon, 7 Apr 2025 16:45:43 +0200 Subject: [PATCH 08/15] refactor: rename casestudies to scenarios --- .../dfd/TUHH-Models/anilallewar/anilallewar_0.datadictionary | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_0.json | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_11.datadictionary | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_11.json | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_12.datadictionary | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_12.json | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_18.datadictionary | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_18.json | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_6.datadictionary | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_6.json | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_7.datadictionary | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_7.json | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_8.datadictionary | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_8.json | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_9.datadictionary | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram | 0 .../dfd/TUHH-Models/anilallewar/anilallewar_9.json | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_0.datadictionary | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_0.json | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_12.datadictionary | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_12.json | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_18.datadictionary | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_18.json | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_2.datadictionary | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_2.json | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_4.datadictionary | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_4.json | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_6.datadictionary | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_6.json | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_7.datadictionary | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_7.json | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_8.datadictionary | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram | 0 .../dfd/TUHH-Models/apssouza22/apssouza22_8.json | 0 .../callistaenterprise/callistaenterprise_0.datadictionary | 0 .../callistaenterprise/callistaenterprise_0.dataflowdiagram | 0 .../dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.json | 0 .../callistaenterprise/callistaenterprise_11.datadictionary | 0 .../callistaenterprise/callistaenterprise_11.dataflowdiagram | 0 .../dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.json | 0 .../callistaenterprise/callistaenterprise_18.datadictionary | 0 .../callistaenterprise/callistaenterprise_18.dataflowdiagram | 0 .../dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.json | 0 .../callistaenterprise/callistaenterprise_2.datadictionary | 0 .../callistaenterprise/callistaenterprise_2.dataflowdiagram | 0 .../dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.json | 0 .../callistaenterprise/callistaenterprise_6.datadictionary | 0 .../callistaenterprise/callistaenterprise_6.dataflowdiagram | 0 .../dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.json | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json | 0 .../dfd/TUHH-Models/ewolff/ewolff_10.datadictionary | 0 .../dfd/TUHH-Models/ewolff/ewolff_10.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff/ewolff_10.json | 0 .../dfd/TUHH-Models/ewolff/ewolff_12.datadictionary | 0 .../dfd/TUHH-Models/ewolff/ewolff_12.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff/ewolff_12.json | 0 .../dfd/TUHH-Models/ewolff/ewolff_18.datadictionary | 0 .../dfd/TUHH-Models/ewolff/ewolff_18.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff/ewolff_18.json | 0 .../dfd/TUHH-Models/ewolff/ewolff_5.datadictionary | 0 .../dfd/TUHH-Models/ewolff/ewolff_5.dataflowdiagram | 0 .../dfd/TUHH-Models/ewolff/ewolff_5.json | 0 .../fernandoabcampos/fernandoabcampos_18.datadictionary | 0 .../fernandoabcampos/fernandoabcampos_18.dataflowdiagram | 0 .../dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_0.datadictionary | 0 .../TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_0.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_10.datadictionary | 0 .../georgwittberger/georgwittberger_10.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_10.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_11.datadictionary | 0 .../georgwittberger/georgwittberger_11.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_11.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_12.datadictionary | 0 .../georgwittberger/georgwittberger_12.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_12.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_18.datadictionary | 0 .../georgwittberger/georgwittberger_18.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_18.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_2.datadictionary | 0 .../TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_2.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_3.datadictionary | 0 .../TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_3.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_4.datadictionary | 0 .../TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_4.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_5.datadictionary | 0 .../TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_5.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_6.datadictionary | 0 .../TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_6.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_7.datadictionary | 0 .../TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_7.json | 0 .../TUHH-Models/georgwittberger/georgwittberger_8.datadictionary | 0 .../TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram | 0 .../dfd/TUHH-Models/georgwittberger/georgwittberger_8.json | 0 .../dfd/TUHH-Models/jferrater/jferrater_0.datadictionary | 0 .../dfd/TUHH-Models/jferrater/jferrater_0.dataflowdiagram | 0 .../dfd/TUHH-Models/jferrater/jferrater_0.json | 0 .../dfd/TUHH-Models/jferrater/jferrater_18.datadictionary | 0 .../dfd/TUHH-Models/jferrater/jferrater_18.dataflowdiagram | 0 .../dfd/TUHH-Models/jferrater/jferrater_18.json | 0 .../dfd/TUHH-Models/jferrater/jferrater_2.datadictionary | 0 .../dfd/TUHH-Models/jferrater/jferrater_2.dataflowdiagram | 0 .../dfd/TUHH-Models/jferrater/jferrater_2.json | 0 .../dfd/TUHH-Models/jferrater/jferrater_3.datadictionary | 0 .../dfd/TUHH-Models/jferrater/jferrater_3.dataflowdiagram | 0 .../dfd/TUHH-Models/jferrater/jferrater_3.json | 0 .../dfd/TUHH-Models/jferrater/jferrater_5.datadictionary | 0 .../dfd/TUHH-Models/jferrater/jferrater_5.dataflowdiagram | 0 .../dfd/TUHH-Models/jferrater/jferrater_5.json | 0 .../dfd/TUHH-Models/jferrater/jferrater_6.datadictionary | 0 .../dfd/TUHH-Models/jferrater/jferrater_6.dataflowdiagram | 0 .../dfd/TUHH-Models/jferrater/jferrater_6.json | 0 .../dfd/TUHH-Models/jferrater/jferrater_7.datadictionary | 0 .../dfd/TUHH-Models/jferrater/jferrater_7.dataflowdiagram | 0 .../dfd/TUHH-Models/jferrater/jferrater_7.json | 0 .../dfd/TUHH-Models/jferrater/jferrater_8.datadictionary | 0 .../dfd/TUHH-Models/jferrater/jferrater_8.dataflowdiagram | 0 .../dfd/TUHH-Models/jferrater/jferrater_8.json | 0 .../dfd/TUHH-Models/jferrater/jferrater_9.datadictionary | 0 .../dfd/TUHH-Models/jferrater/jferrater_9.dataflowdiagram | 0 .../dfd/TUHH-Models/jferrater/jferrater_9.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary | 0 .../koushikkothagal/koushikkothagal_10.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary | 0 .../koushikkothagal/koushikkothagal_11.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary | 0 .../koushikkothagal/koushikkothagal_12.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary | 0 .../koushikkothagal/koushikkothagal_18.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.json | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary | 0 .../TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram | 0 .../dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.json | 0 .../dfd/TUHH-Models/mdeket/mdeket_5.datadictionary | 0 .../dfd/TUHH-Models/mdeket/mdeket_5.dataflowdiagram | 0 .../dfd/TUHH-Models/mdeket/mdeket_5.json | 0 .../mudigal-technologies/mudigal-technologies_0.datadictionary | 0 .../mudigal-technologies/mudigal-technologies_0.dataflowdiagram | 0 .../TUHH-Models/mudigal-technologies/mudigal-technologies_0.json | 0 .../mudigal-technologies/mudigal-technologies_11.datadictionary | 0 .../mudigal-technologies/mudigal-technologies_11.dataflowdiagram | 0 .../TUHH-Models/mudigal-technologies/mudigal-technologies_11.json | 0 .../mudigal-technologies/mudigal-technologies_18.datadictionary | 0 .../mudigal-technologies/mudigal-technologies_18.dataflowdiagram | 0 .../TUHH-Models/mudigal-technologies/mudigal-technologies_18.json | 0 .../mudigal-technologies/mudigal-technologies_2.datadictionary | 0 .../mudigal-technologies/mudigal-technologies_2.dataflowdiagram | 0 .../TUHH-Models/mudigal-technologies/mudigal-technologies_2.json | 0 .../mudigal-technologies/mudigal-technologies_4.datadictionary | 0 .../mudigal-technologies/mudigal-technologies_4.dataflowdiagram | 0 .../TUHH-Models/mudigal-technologies/mudigal-technologies_4.json | 0 .../mudigal-technologies/mudigal-technologies_5.datadictionary | 0 .../mudigal-technologies/mudigal-technologies_5.dataflowdiagram | 0 .../TUHH-Models/mudigal-technologies/mudigal-technologies_5.json | 0 .../mudigal-technologies/mudigal-technologies_7.datadictionary | 0 .../mudigal-technologies/mudigal-technologies_7.dataflowdiagram | 0 .../TUHH-Models/mudigal-technologies/mudigal-technologies_7.json | 0 .../mudigal-technologies/mudigal-technologies_8.datadictionary | 0 .../mudigal-technologies/mudigal-technologies_8.dataflowdiagram | 0 .../TUHH-Models/mudigal-technologies/mudigal-technologies_8.json | 0 .../dfd/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary | 0 .../dfd/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram | 0 .../dfd/TUHH-Models/rohitghatol/rohitghatol_10.json | 0 .../dfd/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary | 0 .../dfd/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram | 0 .../dfd/TUHH-Models/rohitghatol/rohitghatol_12.json | 0 .../dfd/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary | 0 .../dfd/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram | 0 .../dfd/TUHH-Models/rohitghatol/rohitghatol_18.json | 0 .../spring-petclinic/spring-petclinic_0.datadictionary | 0 .../spring-petclinic/spring-petclinic_0.dataflowdiagram | 0 .../dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.json | 0 .../spring-petclinic/spring-petclinic_18.datadictionary | 0 .../spring-petclinic/spring-petclinic_18.dataflowdiagram | 0 .../dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.json | 0 .../spring-petclinic/spring-petclinic_2.datadictionary | 0 .../spring-petclinic/spring-petclinic_2.dataflowdiagram | 0 .../dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.json | 0 .../spring-petclinic/spring-petclinic_3.datadictionary | 0 .../spring-petclinic/spring-petclinic_3.dataflowdiagram | 0 .../dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.json | 0 .../spring-petclinic/spring-petclinic_5.datadictionary | 0 .../spring-petclinic/spring-petclinic_5.dataflowdiagram | 0 .../dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.json | 0 .../spring-petclinic/spring-petclinic_6.datadictionary | 0 .../spring-petclinic/spring-petclinic_6.dataflowdiagram | 0 .../dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.json | 0 .../spring-petclinic/spring-petclinic_7.datadictionary | 0 .../spring-petclinic/spring-petclinic_7.dataflowdiagram | 0 .../dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.json | 0 .../spring-petclinic/spring-petclinic_8.datadictionary | 0 .../spring-petclinic/spring-petclinic_8.dataflowdiagram | 0 .../dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.json | 0 .../spring-petclinic/spring-petclinic_9.datadictionary | 0 .../spring-petclinic/spring-petclinic_9.dataflowdiagram | 0 .../dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.json | 0 .../dfd/TUHH-Models/sqshq/sqshq_0.datadictionary | 0 .../dfd/TUHH-Models/sqshq/sqshq_0.dataflowdiagram | 0 .../{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_0.json | 0 .../dfd/TUHH-Models/sqshq/sqshq_10.datadictionary | 0 .../dfd/TUHH-Models/sqshq/sqshq_10.dataflowdiagram | 0 .../dfd/TUHH-Models/sqshq/sqshq_10.json | 0 .../dfd/TUHH-Models/sqshq/sqshq_11.datadictionary | 0 .../dfd/TUHH-Models/sqshq/sqshq_11.dataflowdiagram | 0 .../dfd/TUHH-Models/sqshq/sqshq_11.json | 0 .../dfd/TUHH-Models/sqshq/sqshq_12.datadictionary | 0 .../dfd/TUHH-Models/sqshq/sqshq_12.dataflowdiagram | 0 .../dfd/TUHH-Models/sqshq/sqshq_12.json | 0 .../dfd/TUHH-Models/sqshq/sqshq_18.datadictionary | 0 .../dfd/TUHH-Models/sqshq/sqshq_18.dataflowdiagram | 0 .../dfd/TUHH-Models/sqshq/sqshq_18.json | 0 .../dfd/TUHH-Models/sqshq/sqshq_6.datadictionary | 0 .../dfd/TUHH-Models/sqshq/sqshq_6.dataflowdiagram | 0 .../{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_6.json | 0 .../dfd/TUHH-Models/sqshq/sqshq_7.datadictionary | 0 .../dfd/TUHH-Models/sqshq/sqshq_7.dataflowdiagram | 0 .../{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_7.json | 0 .../dfd/TUHH-Models/sqshq/sqshq_8.datadictionary | 0 .../dfd/TUHH-Models/sqshq/sqshq_8.dataflowdiagram | 0 .../{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_8.json | 0 .../dfd/TUHH-Models/sqshq/sqshq_9.datadictionary | 0 .../dfd/TUHH-Models/sqshq/sqshq_9.dataflowdiagram | 0 .../{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_9.json | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_0.datadictionary | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_0.json | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_18.datadictionary | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_18.json | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_2.datadictionary | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_2.json | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_3.datadictionary | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_3.json | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_4.datadictionary | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_4.json | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_5.datadictionary | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_5.json | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_6.datadictionary | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_6.json | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_7.datadictionary | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_7.json | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_8.datadictionary | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_8.json | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_9.datadictionary | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram | 0 .../dfd/TUHH-Models/yidongnan/yidongnan_9.json | 0 .../{casestudies => scenarios}/pcm/CoCarNextGen/.project | 0 .../pcm/CoCarNextGen/AudiA6C8.allocation | 0 .../pcm/CoCarNextGen/AudiA6C8.nodecharacteristics | 0 .../{casestudies => scenarios}/pcm/CoCarNextGen/AudiA6C8.pddc | 0 .../pcm/CoCarNextGen/AudiA6C8.repository | 0 .../pcm/CoCarNextGen/AudiA6C8.resourceenvironment | 0 .../{casestudies => scenarios}/pcm/CoCarNextGen/AudiA6C8.system | 0 .../pcm/CoCarNextGen/AudiA6C8.usagemodel | 0 .../pcm/CoCarNextGen/CoCarNextGen.repository | 0 .../pcm/CoCarNextGen/CoCarNextGen.resourceenvironment | 0 .../pcm/CoCarNextGen/representations.aird | 0 .../{casestudies => scenarios}/pcm/CoronaWarnApp/.project | 0 .../pcm/CoronaWarnApp/default.allocation | 0 .../pcm/CoronaWarnApp/default.datadictionary | 0 .../pcm/CoronaWarnApp/default.dataflowdiagram | 0 .../pcm/CoronaWarnApp/default.nodecharacteristics | 0 .../{casestudies => scenarios}/pcm/CoronaWarnApp/default.pddc | 0 .../pcm/CoronaWarnApp/default.repository | 0 .../pcm/CoronaWarnApp/default.resourceenvironment | 0 .../{casestudies => scenarios}/pcm/CoronaWarnApp/default.system | 0 .../pcm/CoronaWarnApp/default.usagemodel | 0 .../pcm/CoronaWarnApp/representations.aird | 0 .../{casestudies => scenarios}/pcm/MaaSTicketSystem/.project | 0 .../pcm/MaaSTicketSystem/MaaS.allocation | 0 .../pcm/MaaSTicketSystem/MaaS.nodecharacteristics | 0 .../{casestudies => scenarios}/pcm/MaaSTicketSystem/MaaS.pddc | 0 .../pcm/MaaSTicketSystem/MaaS.repository | 0 .../pcm/MaaSTicketSystem/MaaS.resourceenvironment | 0 .../{casestudies => scenarios}/pcm/MaaSTicketSystem/MaaS.system | 0 .../pcm/MaaSTicketSystem/MaaS.usagemodel | 0 .../pcm/MaaSTicketSystem/representations.aird | 0 .../{casestudies => scenarios}/pcm/TravelPlanner/.project | 0 .../pcm/TravelPlanner/representations.aird | 0 .../pcm/TravelPlanner/travelPlanner.allocation | 0 .../pcm/TravelPlanner/travelPlanner.nodecharacteristics | 0 .../pcm/TravelPlanner/travelPlanner.pddc | 0 .../pcm/TravelPlanner/travelPlanner.repository | 0 .../pcm/TravelPlanner/travelPlanner.resourceenvironment | 0 .../pcm/TravelPlanner/travelPlanner.system | 0 .../pcm/TravelPlanner/travelPlanner.usagemodel | 0 370 files changed, 0 insertions(+), 0 deletions(-) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/anilallewar/anilallewar_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/apssouza22/apssouza22_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_10.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_10.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_10.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/ewolff/ewolff_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_10.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_10.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_10.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/georgwittberger/georgwittberger_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/jferrater/jferrater_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mdeket/mdeket_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mdeket/mdeket_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mdeket/mdeket_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/rohitghatol/rohitghatol_10.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/rohitghatol/rohitghatol_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/rohitghatol/rohitghatol_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_10.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_10.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_10.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_11.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_11.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_11.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_12.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_12.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_12.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/sqshq/sqshq_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_0.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_0.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_18.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_18.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_2.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_2.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_3.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_3.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_4.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_4.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_5.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_5.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_6.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_6.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_7.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_7.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_8.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_8.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_9.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/dfd/TUHH-Models/yidongnan/yidongnan_9.json (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/AudiA6C8.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/AudiA6C8.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/AudiA6C8.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/AudiA6C8.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/AudiA6C8.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/AudiA6C8.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/CoCarNextGen.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/CoCarNextGen.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoCarNextGen/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/default.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/default.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/default.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/CoronaWarnApp/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/MaaSTicketSystem/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/MaaSTicketSystem/MaaS.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/MaaSTicketSystem/MaaS.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/MaaSTicketSystem/MaaS.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/MaaSTicketSystem/MaaS.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/MaaSTicketSystem/MaaS.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/MaaSTicketSystem/MaaS.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/MaaSTicketSystem/MaaS.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/MaaSTicketSystem/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/TravelPlanner/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/TravelPlanner/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/TravelPlanner/travelPlanner.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/TravelPlanner/travelPlanner.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/TravelPlanner/travelPlanner.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/TravelPlanner/travelPlanner.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/TravelPlanner/travelPlanner.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/TravelPlanner/travelPlanner.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{casestudies => scenarios}/pcm/TravelPlanner/travelPlanner.usagemodel (100%) diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_11.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_12.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_6.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_7.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_8.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/anilallewar/anilallewar_9.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/anilallewar/anilallewar_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_12.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_2.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_4.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_6.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_7.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/apssouza22/apssouza22_8.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/apssouza22/apssouza22_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/callistaenterprise/callistaenterprise_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff-kafka/ewolff-kafka_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_10.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_10.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_10.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_10.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_10.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_10.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_10.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_12.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/ewolff/ewolff_5.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/ewolff/ewolff_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/fernandoabcampos/fernandoabcampos_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_10.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_10.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_10.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_10.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_10.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_10.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_10.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_11.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_12.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_2.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_3.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_4.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_5.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_6.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_7.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/georgwittberger/georgwittberger_8.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/georgwittberger/georgwittberger_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_2.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_3.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_5.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_6.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_7.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_8.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/jferrater/jferrater_9.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/jferrater/jferrater_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_1.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_10.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/koushikkothagal/koushikkothagal_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mdeket/mdeket_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mdeket/mdeket_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mdeket/mdeket_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mdeket/mdeket_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mdeket/mdeket_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mdeket/mdeket_5.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mdeket/mdeket_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/mudigal-technologies/mudigal-technologies_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_10.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_10.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_10.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_10.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_10.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_12.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/rohitghatol/rohitghatol_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/rohitghatol/rohitghatol_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/spring-petclinic/spring-petclinic_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_10.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_10.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_10.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_10.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_10.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_10.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_10.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_11.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_11.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_11.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_11.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_11.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_11.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_11.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_12.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_12.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_12.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_12.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_12.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_12.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_12.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_6.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_7.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_8.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/sqshq/sqshq_9.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/sqshq/sqshq_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_0.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_0.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_0.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_0.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_0.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_0.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_18.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_18.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_18.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_18.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_18.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_18.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_2.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_2.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_2.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_2.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_2.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_2.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_3.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_3.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_3.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_3.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_3.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_3.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_4.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_4.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_4.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_4.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_4.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_4.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_5.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_5.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_5.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_5.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_5.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_5.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_6.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_6.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_6.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_6.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_6.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_6.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_7.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_7.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_7.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_7.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_7.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_7.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_8.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_8.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_8.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_8.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_8.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_8.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_9.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_9.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_9.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.json b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_9.json similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/dfd/TUHH-Models/yidongnan/yidongnan_9.json rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/TUHH-Models/yidongnan/yidongnan_9.json diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/AudiA6C8.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/CoCarNextGen.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/CoCarNextGen.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/CoCarNextGen.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/CoCarNextGen.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/CoCarNextGen.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/CoCarNextGen.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/CoCarNextGen.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/CoCarNextGen.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoCarNextGen/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/CoronaWarnApp/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/MaaS.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/MaaSTicketSystem/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/pcm/TravelPlanner/travelPlanner.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.usagemodel From 4679c1229465f583c9f0fa26da7bc2e1b564f80e Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Mon, 7 Apr 2025 16:52:58 +0200 Subject: [PATCH 09/15] refactor(models): move pcm models with real constraint to scenarios --- .../pcm/TravelPlanner/My.characteristics | 10 - .../models/pcm/TravelPlanner/expected.xmi | 540 --------------- .../models/pcm/TravelPlanner/expected_dd.xmi | 10 - .../models/pcm/TravelPlanner/expected_dfd.xmi | 642 ------------------ .../pcm/TravelPlanner/newAssembly.system | 71 -- .../TravelPlanner/newRepository.repository | 254 ------- .../TravelPlanner/newUsageModel.usagemodel | 75 -- .../CharacteristicTypes.characteristics | 0 .../Characteristics.characteristics | 0 .../pcm/BankBranches/newAllocation.allocation | 0 .../pcm/BankBranches/newRepository.repository | 0 ...newResourceEnvironment.resourceenvironment | 0 .../pcm/BankBranches/newSystem.system | 0 .../pcm/BankBranches/newUsageModel.usagemodel | 0 .../pcm/BranchingOnlineShop/.project | 0 .../BranchingOnlineShop/default.allocation | 0 .../default.nodecharacteristics | 0 .../BranchingOnlineShop/default.repository | 0 .../default.resourceenvironment | 0 .../pcm/BranchingOnlineShop/default.system | 0 .../BranchingOnlineShop/default.usagemodel | 0 .../pcm/BranchingOnlineShop/dic.pddc | 0 .../BranchingOnlineShop/representations.aird | 0 .../CharacteristicTypes.characteristics | 0 .../pcm/ContactSMS/newAllocation.allocation | 0 .../pcm/ContactSMS/newRepository.repository | 0 ...newResourceEnvironment.resourceenvironment | 0 ...onment.resourceenvironment.characteristics | 0 .../pcm/ContactSMS/newSystem.system | 0 .../pcm/ContactSMS/newUsageModel.usagemodel | 0 .../newUsageModel.usagemodel.characteristics | 0 .../pcm/ContactSMS/representations.aird | 0 .../CharacteristicTypes.characteristics | 0 .../Characteristics.characteristics | 0 .../DistanceTracker/newAllocation.allocation | 0 .../DistanceTracker/newRepository.repository | 0 ...newResourceEnvironment.resourceenvironment | 0 .../pcm/DistanceTracker/newSystem.system | 0 .../DistanceTracker/newUsageModel.usagemodel | 0 .../CharacteristicTypes.characteristics | 0 .../Characteristics.characteristics | 0 .../FlightControl/newAllocation.allocation | 0 .../FlightControl/newRepository.repository | 0 ...newResourceEnvironment.resourceenvironment | 0 .../pcm/FlightControl/newSystem.system | 0 .../FlightControl/newUsageModel.usagemodel | 0 .../CharacteristicTypes.characteristics | 0 .../pcm/FriendMap/newAllocation.allocation | 0 .../pcm/FriendMap/newRepository.repository | 0 ...newResourceEnvironment.resourceenvironment | 0 ...onment.resourceenvironment.characteristics | 0 .../pcm/FriendMap/newUsageModel.usagemodel | 0 .../newUsageModel.usagemodel.characteristics | 0 .../pcm/FriendMap/newsystem.system | 0 .../pcm/FriendMap/representations.aird | 0 .../characteristicTypes.characteristics | 0 .../pcm/HealthRecord/newAllocation.allocation | 0 .../pcm/HealthRecord/newRepository.repository | 0 ...newResourceEnvironment.resourceenvironment | 0 .../pcm/HealthRecord/newSystem.system | 0 .../pcm/HealthRecord/newUsageModel.usagemodel | 0 .../newUsageModel.usagemodel.characteristics | 0 .../pcm/HealthRecord/representations.aird | 0 .../CharacteristicTypes.characteristics | 0 .../pcm/Hospital/newAllocation.allocation | 0 .../pcm/Hospital/newRepository.repository | 0 ...newResourceEnvironment.resourceenvironment | 0 ...onment.resourceenvironment.characteristics | 0 .../pcm/Hospital/newSystem.system | 0 .../pcm/Hospital/newUsageModel.usagemodel | 0 .../newUsageModel.usagemodel.characteristics | 0 .../pcm/Hospital/representations.aird | 0 .../CharacteristicTypes.characteristics | 0 .../Characteristics.characteristics | 0 .../pcm/ImageSharing/newAllocation.allocation | 0 .../pcm/ImageSharing/newRepository.repository | 0 ...newResourceEnvironment.resourceenvironment | 0 .../pcm/ImageSharing/newSystem.system | 0 .../pcm/ImageSharing/newUsageModel.usagemodel | 0 .../pcm/InternationalOnlineShop/.project | 0 .../default.allocation | 0 .../default.nodecharacteristics | 0 .../default.repository | 0 .../default.resourceenvironment | 0 .../InternationalOnlineShop/default.system | 0 .../default.usagemodel | 0 .../pcm/InternationalOnlineShop/dic.pddc | 0 .../representations.aird | 0 .../pcm/LoyaltyCard/LoyaltyCard.allocation | 0 .../pcm/LoyaltyCard/LoyaltyCard.datamodel | 0 .../pcm/LoyaltyCard/LoyaltyCard.dfd | 0 .../LoyaltyCard.organizationenvironmentmodel | 0 .../pcm/LoyaltyCard/LoyaltyCard.repository | 0 .../LoyaltyCard.resourceenvironment | 0 .../pcm/LoyaltyCard/LoyaltyCard.system | 0 .../MakeStorePurchaseOnline.bpusagemodel | 0 ...orePurchaseWithLoyaltyProgram.bpusagemodel | 0 ... Advertisements and Discounts.bpusagemodel | 0 .../RegisterLoyaltyCustomer.usagemodel | 0 .../RegisterOnlineCustomer.usagemodel | 0 .../Solve Customer Problem.bpusagemodel | 0 .../pcm/LoyaltyCard/expected_dd.xmi | 0 .../pcm/LoyaltyCard/expected_dfd.xmi | 0 .../CharacteristicTypes.characteristics | 0 .../Characteristics.characteristics | 0 .../pcm/PrivateTaxi/newAllocation.allocation | 0 .../pcm/PrivateTaxi/newRepository.repository | 0 ...newResourceEnvironment.resourceenvironment | 0 .../pcm/PrivateTaxi/newSystem.system | 0 .../pcm/PrivateTaxi/newUsageModel.usagemodel | 0 .../pcm/PrivateTaxi/representations.aird | 0 .../pcm/BranchingOnlineShopResult.java | 4 + .../results/pcm/CoCarResult.java | 2 +- .../results/pcm/CoronaWarnAppResult.java | 3 +- .../pcm/InternationalOnlineShopResult.java | 5 + .../results/pcm/MaaSTicketSystemResult.java | 2 +- .../pcm/NodeCharacteristicsResult.java | 3 - .../results/pcm/TravelPlannerResult.java | 2 +- 118 files changed, 13 insertions(+), 1610 deletions(-) delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/My.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected.xmi delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dd.xmi delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dfd.xmi delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newAssembly.system delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newRepository.repository delete mode 100644 bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newUsageModel.usagemodel rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BankBranches/CharacteristicTypes.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BankBranches/Characteristics.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BankBranches/newAllocation.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BankBranches/newRepository.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BankBranches/newResourceEnvironment.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BankBranches/newSystem.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BankBranches/newUsageModel.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BranchingOnlineShop/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BranchingOnlineShop/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BranchingOnlineShop/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BranchingOnlineShop/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BranchingOnlineShop/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BranchingOnlineShop/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BranchingOnlineShop/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BranchingOnlineShop/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/BranchingOnlineShop/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ContactSMS/CharacteristicTypes.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ContactSMS/newAllocation.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ContactSMS/newRepository.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ContactSMS/newResourceEnvironment.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ContactSMS/newSystem.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ContactSMS/newUsageModel.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ContactSMS/newUsageModel.usagemodel.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ContactSMS/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/DistanceTracker/CharacteristicTypes.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/DistanceTracker/Characteristics.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/DistanceTracker/newAllocation.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/DistanceTracker/newRepository.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/DistanceTracker/newSystem.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/DistanceTracker/newUsageModel.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FlightControl/CharacteristicTypes.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FlightControl/Characteristics.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FlightControl/newAllocation.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FlightControl/newRepository.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FlightControl/newResourceEnvironment.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FlightControl/newSystem.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FlightControl/newUsageModel.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FriendMap/CharacteristicTypes.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FriendMap/newAllocation.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FriendMap/newRepository.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FriendMap/newResourceEnvironment.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FriendMap/newUsageModel.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FriendMap/newUsageModel.usagemodel.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FriendMap/newsystem.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/FriendMap/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/HealthRecord/characteristicTypes.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/HealthRecord/newAllocation.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/HealthRecord/newRepository.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/HealthRecord/newResourceEnvironment.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/HealthRecord/newSystem.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/HealthRecord/newUsageModel.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/HealthRecord/newUsageModel.usagemodel.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/HealthRecord/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/Hospital/CharacteristicTypes.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/Hospital/newAllocation.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/Hospital/newRepository.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/Hospital/newResourceEnvironment.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/Hospital/newSystem.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/Hospital/newUsageModel.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/Hospital/newUsageModel.usagemodel.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/Hospital/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ImageSharing/CharacteristicTypes.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ImageSharing/Characteristics.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ImageSharing/newAllocation.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ImageSharing/newRepository.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ImageSharing/newResourceEnvironment.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ImageSharing/newSystem.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/ImageSharing/newUsageModel.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/InternationalOnlineShop/.project (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/InternationalOnlineShop/default.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/InternationalOnlineShop/default.nodecharacteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/InternationalOnlineShop/default.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/InternationalOnlineShop/default.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/InternationalOnlineShop/default.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/InternationalOnlineShop/default.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/InternationalOnlineShop/dic.pddc (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/InternationalOnlineShop/representations.aird (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/LoyaltyCard.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/LoyaltyCard.datamodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/LoyaltyCard.dfd (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/LoyaltyCard.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/LoyaltyCard.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/expected_dd.xmi (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/LoyaltyCard/expected_dfd.xmi (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/PrivateTaxi/CharacteristicTypes.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/PrivateTaxi/Characteristics.characteristics (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/PrivateTaxi/newAllocation.allocation (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/PrivateTaxi/newRepository.repository (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/PrivateTaxi/newSystem.system (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/PrivateTaxi/newUsageModel.usagemodel (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/pcm/PrivateTaxi/representations.aird (100%) diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/My.characteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/My.characteristics deleted file mode 100644 index aa93664..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/My.characteristics +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected.xmi b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected.xmi deleted file mode 100644 index f9b4add..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected.xmi +++ /dev/null @@ -1,540 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dd.xmi b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dd.xmi deleted file mode 100644 index daa2ec9..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dd.xmi +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dfd.xmi b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dfd.xmi deleted file mode 100644 index 8447dd8..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/expected_dfd.xmi +++ /dev/null @@ -1,642 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newAssembly.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newAssembly.system deleted file mode 100644 index 5a24851..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newAssembly.system +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newRepository.repository deleted file mode 100644 index 7400833..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newRepository.repository +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newUsageModel.usagemodel deleted file mode 100644 index b35936c..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/pcm/TravelPlanner/newUsageModel.usagemodel +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/CharacteristicTypes.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/CharacteristicTypes.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/CharacteristicTypes.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/Characteristics.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/Characteristics.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/Characteristics.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newAllocation.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newAllocation.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newAllocation.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newRepository.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newRepository.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newRepository.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newResourceEnvironment.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newResourceEnvironment.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newResourceEnvironment.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newSystem.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newSystem.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newSystem.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newUsageModel.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BankBranches/newUsageModel.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newUsageModel.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/BranchingOnlineShop/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/CharacteristicTypes.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/CharacteristicTypes.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/CharacteristicTypes.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newAllocation.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newAllocation.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newAllocation.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newRepository.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newRepository.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newRepository.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newSystem.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newSystem.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newSystem.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/newUsageModel.usagemodel.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ContactSMS/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/CharacteristicTypes.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/CharacteristicTypes.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/CharacteristicTypes.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/Characteristics.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/Characteristics.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/Characteristics.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newAllocation.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newAllocation.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newAllocation.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newRepository.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newRepository.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newRepository.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newSystem.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newSystem.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newSystem.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newUsageModel.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/DistanceTracker/newUsageModel.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newUsageModel.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/CharacteristicTypes.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/CharacteristicTypes.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/CharacteristicTypes.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/Characteristics.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/Characteristics.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/Characteristics.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newAllocation.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newAllocation.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newAllocation.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newRepository.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newRepository.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newRepository.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newResourceEnvironment.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newResourceEnvironment.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newResourceEnvironment.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newSystem.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newSystem.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newSystem.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newUsageModel.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FlightControl/newUsageModel.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newUsageModel.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/CharacteristicTypes.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/CharacteristicTypes.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/CharacteristicTypes.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newAllocation.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newAllocation.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newAllocation.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newRepository.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newRepository.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newRepository.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newUsageModel.usagemodel.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newsystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newsystem.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/newsystem.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newsystem.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/FriendMap/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/characteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/characteristicTypes.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/characteristicTypes.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/characteristicTypes.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newAllocation.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newAllocation.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newAllocation.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newRepository.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newRepository.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newRepository.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newResourceEnvironment.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newResourceEnvironment.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newResourceEnvironment.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newSystem.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newSystem.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newSystem.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/newUsageModel.usagemodel.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/HealthRecord/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/CharacteristicTypes.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/CharacteristicTypes.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/CharacteristicTypes.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newAllocation.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newAllocation.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newAllocation.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newRepository.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newRepository.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newRepository.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newSystem.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newSystem.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newSystem.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/newUsageModel.usagemodel.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/Hospital/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/CharacteristicTypes.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/CharacteristicTypes.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/CharacteristicTypes.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/Characteristics.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/Characteristics.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/Characteristics.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newAllocation.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newAllocation.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newAllocation.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newRepository.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newRepository.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newRepository.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newResourceEnvironment.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newResourceEnvironment.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newResourceEnvironment.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newSystem.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newSystem.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newSystem.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newUsageModel.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/ImageSharing/newUsageModel.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newUsageModel.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/InternationalOnlineShop/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.datamodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.datamodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.datamodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.datamodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.dfd b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.dfd similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.dfd rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.dfd diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/LoyaltyCard.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dd.xmi b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dd.xmi similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dd.xmi rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dd.xmi diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dfd.xmi b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dfd.xmi similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/LoyaltyCard/expected_dfd.xmi rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dfd.xmi diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/CharacteristicTypes.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/CharacteristicTypes.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/CharacteristicTypes.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/Characteristics.characteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/Characteristics.characteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/Characteristics.characteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newAllocation.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newAllocation.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newAllocation.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newRepository.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newRepository.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newRepository.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newSystem.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newSystem.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newSystem.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newUsageModel.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/newUsageModel.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newUsageModel.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/pcm/PrivateTaxi/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java index 9d89ea9..9f41ecc 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java @@ -7,6 +7,10 @@ import java.util.List; public class BranchingOnlineShopResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } @Override public String getModelName() { return "BranchingOnlineShop"; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java index 38e888e..ccc6f39 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java @@ -11,7 +11,7 @@ public class CoCarResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { - return "casestudies"; + return "scenarios"; } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java index e26e6c9..835ef2b 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java @@ -11,7 +11,7 @@ public class CoronaWarnAppResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { - return "casestudies"; + return "scenarios"; } @Override @@ -21,7 +21,6 @@ public String getModelName() { @Override public List getDSLConstraints() { - // TODO: This are not even good constraints... List constraints = new ArrayList<>(); constraints.add(new ConstraintDSL() .ofData() diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java index d0d61b4..bdcc0fe 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java @@ -10,6 +10,11 @@ import java.util.UUID; public class InternationalOnlineShopResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } + @Override public String getModelName() { return "InternationalOnlineShop"; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java index 8ce15de..60fc713 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java @@ -12,7 +12,7 @@ public class MaaSTicketSystemResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { - return "casestudies"; + return "scenarios"; } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java index cc93d9b..f24cd24 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java @@ -11,9 +11,6 @@ import java.util.ArrayList; import java.util.List; -/** - * TODO: This test model tests a specific feature not a integration/E2E test - */ public class NodeCharacteristicsResult implements PCMExampleModelResult { @Override public String getModelName() { diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java index 166e437..7fcfee5 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java @@ -14,7 +14,7 @@ public class TravelPlannerResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { - return "casestudies"; + return "scenarios"; } @Override From 2634423361567d995d7f391d7642416823adab76 Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Mon, 7 Apr 2025 16:54:41 +0200 Subject: [PATCH 10/15] refactor(models): move dfd models with real constraint to scenarios --- .../dfd/OnlineShop/default.datadictionary | 0 .../dfd/OnlineShop/default.dataflowdiagram | 0 .../dfd/SimpleOnlineShop/default.datadictionary | 0 .../dfd/SimpleOnlineShop/default.dataflowdiagram | 0 .../examplemodels/results/dfd/OnlineShopResult.java | 5 +++++ .../examplemodels/results/dfd/SimpleOnlineShopResult.java | 5 +++++ 6 files changed, 10 insertions(+) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/dfd/OnlineShop/default.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/dfd/OnlineShop/default.dataflowdiagram (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/dfd/SimpleOnlineShop/default.datadictionary (100%) rename bundles/org.dataflowanalysis.examplemodels/{models => scenarios}/dfd/SimpleOnlineShop/default.dataflowdiagram (100%) diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/default.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/OnlineShop/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/default.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/OnlineShop/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/default.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/OnlineShop/default.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/OnlineShop/default.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/OnlineShop/default.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/default.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/SimpleOnlineShop/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/default.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/SimpleOnlineShop/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/default.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/SimpleOnlineShop/default.dataflowdiagram similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleOnlineShop/default.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/SimpleOnlineShop/default.dataflowdiagram diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java index 1b81ee5..dbdbb8f 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java @@ -9,6 +9,11 @@ import java.util.Map; public class OnlineShopResult implements DFDExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } + @Override public String getModelName() { return "OnlineShop"; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java index 7c86c16..325b4fb 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java @@ -9,6 +9,11 @@ import java.util.Map; public class SimpleOnlineShopResult implements DFDExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } + @Override public String getModelName() { return "SimpleOnlineShop"; From 14bedd6020976d8768bddf93d3492aa2d55edb8d Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Mon, 7 Apr 2025 17:00:39 +0200 Subject: [PATCH 11/15] refactor(results): move results to their respective package (e.g. models or scenarios) --- .../results/dfd/ComplexPseudoCycleResult.java | 31 ------------------ .../results/dfd/DeadOutPinResult.java | 32 ------------------- .../results/dfd/MinimalResult.java | 31 ------------------ .../results/dfd/SimpleLoopResult.java | 32 ------------------- .../results/dfd/UnusedInputResult.java | 32 ------------------- .../results/dfd/WrongFlowNameResult.java | 32 ------------------- .../dfd/{ => models}/BranchingResult.java | 3 +- .../dfd/{ => scenarios}/OnlineShopResult.java | 4 ++- .../SimpleOnlineShopResult.java | 4 ++- .../results/pcm/BankBranchesResult.java | 5 --- .../results/pcm/ContactSMSResult.java | 5 --- .../results/pcm/DistanceTrackerResult.java | 5 --- .../results/pcm/FlightControlResult.java | 5 --- .../results/pcm/FriendMapResult.java | 5 --- .../results/pcm/HealthRecordResult.java | 5 --- .../results/pcm/HospitalResult.java | 5 --- .../results/pcm/ImageSharingResult.java | 5 --- .../results/pcm/LoyaltyCardResult.java | 5 --- .../results/pcm/PrivateTaxiResult.java | 5 --- .../pcm/{ => models}/CompositeResult.java | 4 +-- .../pcm/{ => models}/IgnoredNodesResult.java | 9 ++---- .../MultipleDeploymentsResult.java | 5 +-- .../NodeCharacteristicsResult.java | 5 ++- .../{ => models}/VariableReturnResult.java | 5 +-- .../pcm/scenarios/BankBranchesResult.java | 5 +++ .../BranchingOnlineShopResult.java | 3 +- .../pcm/{ => scenarios}/CoCarResult.java | 6 ++-- .../pcm/scenarios/ContactSMSResult.java | 5 +++ .../{ => scenarios}/CoronaWarnAppResult.java | 5 ++- .../pcm/scenarios/DistanceTrackerResult.java | 5 +++ .../pcm/scenarios/FlightControlResult.java | 5 +++ .../pcm/scenarios/FriendMapResult.java | 5 +++ .../pcm/scenarios/HealthRecordResult.java | 5 +++ .../results/pcm/scenarios/HospitalResult.java | 5 +++ .../pcm/scenarios/ImageSharingResult.java | 5 +++ .../InternationalOnlineShopResult.java | 5 +-- .../pcm/scenarios/LoyaltyCardResult.java | 5 +++ .../MaaSTicketSystemResult.java | 5 ++- .../pcm/scenarios/PrivateTaxiResult.java | 5 +++ .../{ => scenarios}/TravelPlannerResult.java | 5 +-- 40 files changed, 85 insertions(+), 273 deletions(-) delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/{ => models}/BranchingResult.java (86%) rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/{ => scenarios}/OnlineShopResult.java (87%) rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/{ => scenarios}/SimpleOnlineShopResult.java (87%) delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BankBranchesResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ContactSMSResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/DistanceTrackerResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FlightControlResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FriendMapResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HealthRecordResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HospitalResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ImageSharingResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/LoyaltyCardResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PrivateTaxiResult.java rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => models}/CompositeResult.java (90%) rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => models}/IgnoredNodesResult.java (82%) rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => models}/MultipleDeploymentsResult.java (89%) rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => models}/NodeCharacteristicsResult.java (87%) rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => models}/VariableReturnResult.java (90%) create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BankBranchesResult.java rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => scenarios}/BranchingOnlineShopResult.java (87%) rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => scenarios}/CoCarResult.java (77%) create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => scenarios}/CoronaWarnAppResult.java (87%) create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FriendMapResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HealthRecordResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HospitalResult.java create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ImageSharingResult.java rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => scenarios}/InternationalOnlineShopResult.java (88%) create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/LoyaltyCardResult.java rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => scenarios}/MaaSTicketSystemResult.java (89%) create mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/PrivateTaxiResult.java rename bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/{ => scenarios}/TravelPlannerResult.java (93%) diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java deleted file mode 100644 index c62f0d6..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/ComplexPseudoCycleResult.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.dfd; - -import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; -import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.examplemodels.results.ExpectedViolation; - -import java.util.List; - -public class ComplexPseudoCycleResult implements DFDExampleModelResult { - @Override - public String getModelName() { - return "ComplexPseudoCycle"; - } - - @Override - public List getDSLConstraints() { - // TODO: Has no constraints - return List.of(); - } - - @Override - public List getExpectedViolations() { - // TODO: Has no constraints; Therefore no expected violations - return List.of(); - } - - @Override - public String toString() { - return this.getModelName(); - } -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java deleted file mode 100644 index 320afa3..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DeadOutPinResult.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.dfd; - -import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; -import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.examplemodels.results.ExpectedViolation; - -import java.util.List; - -public class DeadOutPinResult implements DFDExampleModelResult { - @Override - public String getModelName() { - return "DeadOutPin"; - } - - @Override - public List getDSLConstraints() { - // TODO: Has no constraints - return List.of(); - } - - @Override - public List getExpectedViolations() { - // TODO: Has no constraints; Therefore no expected violations - return List.of(); - } - - @Override - public String toString() { - return this.getModelName(); - } -} - diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java deleted file mode 100644 index 196eda8..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/MinimalResult.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.dfd; - -import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; -import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.examplemodels.results.ExpectedViolation; - -import java.util.List; - -public class MinimalResult implements DFDExampleModelResult { - @Override - public String getModelName() { - return "Minimal"; - } - - @Override - public List getDSLConstraints() { - // TODO: Has no constraints - return List.of(); - } - - @Override - public List getExpectedViolations() { - // TODO: Has no constraints; Therefore no expected violations - return List.of(); - } - - @Override - public String toString() { - return this.getModelName(); - } -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java deleted file mode 100644 index 26035ce..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleLoopResult.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.dfd; - -import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; -import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.examplemodels.results.ExpectedViolation; - -import java.util.List; - -public class SimpleLoopResult implements DFDExampleModelResult { - @Override - public String getModelName() { - return "SimpleLoop"; - } - - @Override - public List getDSLConstraints() { - // TODO: Has no constraints - return List.of(); - } - - @Override - public List getExpectedViolations() { - // TODO: Has no constraints; Therefore no expected violations - return List.of(); - } - - @Override - public String toString() { - return this.getModelName(); - } -} - diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java deleted file mode 100644 index 407d696..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/UnusedInputResult.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.dfd; - -import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; -import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.examplemodels.results.ExpectedViolation; - -import java.util.List; - -public class UnusedInputResult implements DFDExampleModelResult { - @Override - public String getModelName() { - return "UnusedInput"; - } - - @Override - public List getDSLConstraints() { - // TODO: Has no constraints - return List.of(); - } - - @Override - public List getExpectedViolations() { - // TODO: Has no constraints; Therefore no expected violations - return List.of(); - } - - @Override - public String toString() { - return this.getModelName(); - } -} - diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java deleted file mode 100644 index 1dc081b..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/WrongFlowNameResult.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.dfd; - -import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; -import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.examplemodels.results.ExpectedViolation; - -import java.util.List; - -public class WrongFlowNameResult implements DFDExampleModelResult { - @Override - public String getModelName() { - return "WrongFlowName"; - } - - @Override - public List getDSLConstraints() { - // TODO: Has no constraints - return List.of(); - } - - @Override - public List getExpectedViolations() { - // TODO: Has no constraints; Therefore no expected violations - return List.of(); - } - - @Override - public String toString() { - return this.getModelName(); - } -} - diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/models/BranchingResult.java similarity index 86% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/models/BranchingResult.java index 9ad4bb3..d8e45ef 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/BranchingResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/models/BranchingResult.java @@ -1,8 +1,9 @@ -package org.dataflowanalysis.examplemodels.results.dfd; +package org.dataflowanalysis.examplemodels.results.dfd.models; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult; import java.util.List; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/OnlineShopResult.java similarity index 87% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/OnlineShopResult.java index dbdbb8f..80bd879 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/OnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/OnlineShopResult.java @@ -1,9 +1,11 @@ -package org.dataflowanalysis.examplemodels.results.dfd; +package org.dataflowanalysis.examplemodels.results.dfd.scenarios; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult; +import org.dataflowanalysis.examplemodels.results.dfd.DFDIdentifier; import java.util.List; import java.util.Map; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/SimpleOnlineShopResult.java similarity index 87% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/SimpleOnlineShopResult.java index 325b4fb..0be75f0 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/SimpleOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/SimpleOnlineShopResult.java @@ -1,9 +1,11 @@ -package org.dataflowanalysis.examplemodels.results.dfd; +package org.dataflowanalysis.examplemodels.results.dfd.scenarios; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult; +import org.dataflowanalysis.examplemodels.results.dfd.DFDIdentifier; import java.util.List; import java.util.Map; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BankBranchesResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BankBranchesResult.java deleted file mode 100644 index ca6a8bc..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BankBranchesResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm; - -public class BankBranchesResult { - //TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ContactSMSResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ContactSMSResult.java deleted file mode 100644 index 7ea3403..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ContactSMSResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm; - -public class ContactSMSResult { - //TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/DistanceTrackerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/DistanceTrackerResult.java deleted file mode 100644 index 03541de..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/DistanceTrackerResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm; - -public class DistanceTrackerResult { - //TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FlightControlResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FlightControlResult.java deleted file mode 100644 index 6d5c3c9..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FlightControlResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm; - -public class FlightControlResult { - //TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FriendMapResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FriendMapResult.java deleted file mode 100644 index cbbccff..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/FriendMapResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm; - -public class FriendMapResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HealthRecordResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HealthRecordResult.java deleted file mode 100644 index dedfbf6..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HealthRecordResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm; - -public class HealthRecordResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HospitalResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HospitalResult.java deleted file mode 100644 index 8b25b95..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/HospitalResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm; - -public class HospitalResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ImageSharingResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ImageSharingResult.java deleted file mode 100644 index 4b7213b..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/ImageSharingResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm; - -public class ImageSharingResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/LoyaltyCardResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/LoyaltyCardResult.java deleted file mode 100644 index cd754af..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/LoyaltyCardResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm; - -public class LoyaltyCardResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PrivateTaxiResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PrivateTaxiResult.java deleted file mode 100644 index c48b469..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PrivateTaxiResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm; - -public class PrivateTaxiResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/CompositeResult.java similarity index 90% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/CompositeResult.java index acc8fb7..938832a 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CompositeResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/CompositeResult.java @@ -1,11 +1,11 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.models; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.analysis.pcm.core.seff.SEFFPCMVertex; import org.dataflowanalysis.analysis.pcm.core.user.UserPCMVertex; -import org.dataflowanalysis.analysis.pcm.dsl.PCMVertexType; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/IgnoredNodesResult.java similarity index 82% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/IgnoredNodesResult.java index e0ccf8a..ed4dc11 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/IgnoredNodesResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/IgnoredNodesResult.java @@ -1,19 +1,16 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.models; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.analysis.dsl.selectors.Intersection; -import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; import org.dataflowanalysis.analysis.pcm.dsl.PCMVertexType; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; +import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; import java.util.List; import java.util.Map; -/** - * TODO: This test model tests a specific feature not a integration/E2E test - */ public class IgnoredNodesResult implements PCMExampleModelResult { @Override public String getModelName() { diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/MultipleDeploymentsResult.java similarity index 89% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/MultipleDeploymentsResult.java index a62ee0f..612a93a 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MultipleDeploymentsResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/MultipleDeploymentsResult.java @@ -1,13 +1,14 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.models; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; +import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; import java.util.List; import java.util.Map; -import java.util.UUID; public class MultipleDeploymentsResult implements PCMExampleModelResult { @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/NodeCharacteristicsResult.java similarity index 87% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/NodeCharacteristicsResult.java index f24cd24..4a9bcce 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/NodeCharacteristicsResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/NodeCharacteristicsResult.java @@ -1,12 +1,11 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.models; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.analysis.dsl.selectors.Intersection; -import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; import org.dataflowanalysis.analysis.pcm.core.seff.SEFFPCMVertex; import org.dataflowanalysis.analysis.pcm.core.user.UserPCMVertex; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/VariableReturnResult.java similarity index 90% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/VariableReturnResult.java index ed62f22..33c9660 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/VariableReturnResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/VariableReturnResult.java @@ -1,4 +1,4 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.models; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; @@ -6,10 +6,11 @@ import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; +import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; import java.util.List; import java.util.Map; -import java.util.UUID; public class VariableReturnResult implements PCMExampleModelResult { @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BankBranchesResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BankBranchesResult.java new file mode 100644 index 0000000..54916f8 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BankBranchesResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; + +public class BankBranchesResult { + //TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BranchingOnlineShopResult.java similarity index 87% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BranchingOnlineShopResult.java index 9f41ecc..c43ba50 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/BranchingOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BranchingOnlineShopResult.java @@ -1,8 +1,9 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import java.util.List; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java similarity index 77% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java index ccc6f39..84a2966 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoCarResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java @@ -1,10 +1,8 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; -import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.analysis.dsl.selectors.Intersection; -import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import java.util.List; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java new file mode 100644 index 0000000..6477709 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; + +public class ContactSMSResult { + //TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoronaWarnAppResult.java similarity index 87% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoronaWarnAppResult.java index 835ef2b..29f0692 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/CoronaWarnAppResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoronaWarnAppResult.java @@ -1,10 +1,9 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.analysis.dsl.selectors.Intersection; -import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java new file mode 100644 index 0000000..cba2087 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; + +public class DistanceTrackerResult { + //TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java new file mode 100644 index 0000000..003f2a9 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; + +public class FlightControlResult { + //TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FriendMapResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FriendMapResult.java new file mode 100644 index 0000000..efe37e1 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FriendMapResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; + +public class FriendMapResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HealthRecordResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HealthRecordResult.java new file mode 100644 index 0000000..4fbb09d --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HealthRecordResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; + +public class HealthRecordResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HospitalResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HospitalResult.java new file mode 100644 index 0000000..8a2a574 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HospitalResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; + +public class HospitalResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ImageSharingResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ImageSharingResult.java new file mode 100644 index 0000000..3fad62c --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ImageSharingResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; + +public class ImageSharingResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/InternationalOnlineShopResult.java similarity index 88% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/InternationalOnlineShopResult.java index bdcc0fe..65725a3 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/InternationalOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/InternationalOnlineShopResult.java @@ -1,13 +1,14 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; +import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; import java.util.List; import java.util.Map; -import java.util.UUID; public class InternationalOnlineShopResult implements PCMExampleModelResult { @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/LoyaltyCardResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/LoyaltyCardResult.java new file mode 100644 index 0000000..2ab10e9 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/LoyaltyCardResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; + +public class LoyaltyCardResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java similarity index 89% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java index 60fc713..a44a219 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/MaaSTicketSystemResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java @@ -1,10 +1,9 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; -import org.dataflowanalysis.analysis.dsl.selectors.Intersection; -import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import java.util.ArrayList; import java.util.List; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/PrivateTaxiResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/PrivateTaxiResult.java new file mode 100644 index 0000000..68533d1 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/PrivateTaxiResult.java @@ -0,0 +1,5 @@ +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; + +public class PrivateTaxiResult { + // TODO +} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/TravelPlannerResult.java similarity index 93% rename from bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java rename to bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/TravelPlannerResult.java index 7fcfee5..5fadfe0 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/TravelPlannerResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/TravelPlannerResult.java @@ -1,4 +1,4 @@ -package org.dataflowanalysis.examplemodels.results.pcm; +package org.dataflowanalysis.examplemodels.results.pcm.scenarios; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; @@ -6,10 +6,11 @@ import org.dataflowanalysis.analysis.dsl.variable.ConstraintVariable; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; +import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; import java.util.List; import java.util.Map; -import java.util.UUID; public class TravelPlannerResult implements PCMExampleModelResult { @Override From 33859ea49b7e8e588a5a2cdd2ab65714ad7567c1 Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Wed, 9 Apr 2025 13:56:42 +0200 Subject: [PATCH 12/15] feat(bankbranches): update to nodecharacteristics and data dictionary --- .../META-INF/MANIFEST.MF | 10 +- .../CharacteristicTypes.characteristics | 19 - .../Characteristics.characteristics | 19 - .../pcm/BankBranches/default.allocation | 17 + .../BankBranches/default.nodecharacteristics | 31 + .../scenarios/pcm/BankBranches/default.pddc | 21 + ...pository.repository => default.repository} | 134 +- ...nvironment => default.resourceenvironment} | 0 .../{newSystem.system => default.system} | 34 +- .../pcm/BankBranches/default.usagemodel | 406 ++ .../pcm/BankBranches/newAllocation.allocation | 17 - .../pcm/BankBranches/newUsageModel.usagemodel | 443 -- .../pcm/BankBranches/representations.aird | 5468 +++++++++++++++++ 13 files changed, 5973 insertions(+), 646 deletions(-) delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/CharacteristicTypes.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/Characteristics.characteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.allocation create mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.nodecharacteristics create mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.pddc rename bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/{newRepository.repository => default.repository} (51%) rename bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/{newResourceEnvironment.resourceenvironment => default.resourceenvironment} (100%) rename bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/{newSystem.system => default.system} (72%) create mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newAllocation.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newUsageModel.usagemodel create mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF b/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF index 7540b0e..f007b84 100644 --- a/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF +++ b/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF @@ -7,10 +7,16 @@ Require-Bundle: org.eclipse.core.runtime, com.google.guava, org.dataflowanalysis.analysis, org.dataflowanalysis.analysis.pcm, - org.dataflowanalysis.analysis.dfd + org.dataflowanalysis.analysis.dfd, + org.dataflowanalysis.dfd.dataflowdiagram Automatic-Module-Name: org.dataflowanalysis.examplemodels Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.dataflowanalysis.examplemodels, org.dataflowanalysis.examplemodels.results, - org.dataflowanalysis.examplemodels.results.pcm + org.dataflowanalysis.examplemodels.results.pcm, + org.dataflowanalysis.examplemodels.results.pcm.models, + org.dataflowanalysis.examplemodels.results.pcm.scenarios, + org.dataflowanalysis.examplemodels.results.dfd, + org.dataflowanalysis.examplemodels.results.dfd.models, + org.dataflowanalysis.examplemodels.results.dfd.scenarios diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/CharacteristicTypes.characteristics deleted file mode 100644 index 9d7ac95..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/CharacteristicTypes.characteristics +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/Characteristics.characteristics deleted file mode 100644 index df4b322..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/Characteristics.characteristics +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.allocation new file mode 100644 index 0000000..b377f03 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.allocation @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.nodecharacteristics new file mode 100644 index 0000000..92d2592 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.nodecharacteristics @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.pddc new file mode 100644 index 0000000..bea6ad0 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.pddc @@ -0,0 +1,21 @@ +dictionary id "_Zf2gABPJEfC6H5LfCNvhSA" + +enum Locations { + USA + Asia +} + +enum Roles { + Clerk + Manager +} + +enum Status { + Regular + Celebrity +} + +enumCharacteristicType Location using Locations +enumCharacteristicType Origin using Locations +enumCharacteristicType Role using Roles +enumCharacteristicType Status using Status diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.repository similarity index 51% rename from bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newRepository.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.repository index e270031..db3cc53 100644 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newRepository.repository +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.repository @@ -1,14 +1,14 @@ - + - + - - + + - + @@ -20,25 +20,11 @@ - - - - - - - - - - - - - - @@ -48,13 +34,6 @@ - - - - - - - @@ -64,98 +43,21 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -165,37 +67,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newResourceEnvironment.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.system similarity index 72% rename from bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newSystem.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.system index bd48939..6ca9426 100644 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newSystem.system +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.system @@ -1,50 +1,50 @@ - + - + - + - + - + - + - + - + - - + + - - + + - + - + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.usagemodel new file mode 100644 index 0000000..32e0b33 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.usagemodel @@ -0,0 +1,406 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newAllocation.allocation deleted file mode 100644 index b98497f..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newAllocation.allocation +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newUsageModel.usagemodel deleted file mode 100644 index 5da4038..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/newUsageModel.usagemodel +++ /dev/null @@ -1,443 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/representations.aird new file mode 100644 index 0000000..892c9f2 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/representations.aird @@ -0,0 +1,5468 @@ + + + + default.allocation + default.resourceenvironment + default.system + default.repository + default.nodecharacteristics + default.usagemodel + default.pddc + pathmap://PCM_MODELS/FailureTypes.repository + pathmap://PCM_MODELS/Palladio.resourcetype + pathmap://PCM_MODELS/PrimitiveTypes.repository + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7342f7c8bed3c948a371eed0640d8e3e7fd42183 Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Wed, 9 Apr 2025 16:14:09 +0200 Subject: [PATCH 13/15] feat(bankbranches): add constraint and expected violations --- .../BankBranches/default.nodecharacteristics | 18 +- .../pcm/BankBranches/default.repository | 147 ++++++++++- .../pcm/BankBranches/default.usagemodel | 2 +- .../pcm/BankBranches/representations.aird | 240 +++++++++++++++--- .../results/ExampleModelResult.java | 3 +- .../results/ExpectedCharacteristic.java | 4 + .../results/ExpectedViolation.java | 33 ++- .../results/dfd/DFDExampleModelResult.java | 9 +- .../results/dfd/DFDIdentifier.java | 4 +- .../results/dfd/models/BranchingResult.java | 9 +- .../dfd/scenarios/OnlineShopResult.java | 18 +- .../dfd/scenarios/SimpleOnlineShopResult.java | 15 +- .../results/pcm/PCMExampleModelResult.java | 12 +- .../results/pcm/PCMIdentifier.java | 7 +- .../results/pcm/models/CompositeResult.java | 14 +- .../pcm/models/IgnoredNodesResult.java | 14 +- .../pcm/models/MultipleDeploymentsResult.java | 8 +- .../pcm/models/NodeCharacteristicsResult.java | 14 +- .../pcm/models/VariableReturnResult.java | 14 +- .../pcm/scenarios/BankBranchesResult.java | 80 +++++- .../scenarios/BranchingOnlineShopResult.java | 8 +- .../results/pcm/scenarios/CoCarResult.java | 3 +- .../pcm/scenarios/ContactSMSResult.java | 2 +- .../pcm/scenarios/CoronaWarnAppResult.java | 10 +- .../pcm/scenarios/DistanceTrackerResult.java | 2 +- .../pcm/scenarios/FlightControlResult.java | 2 +- .../InternationalOnlineShopResult.java | 14 +- .../pcm/scenarios/MaaSTicketSystemResult.java | 14 +- .../pcm/scenarios/TravelPlannerResult.java | 23 +- 29 files changed, 569 insertions(+), 174 deletions(-) diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.nodecharacteristics index 92d2592..808d8bd 100644 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.nodecharacteristics +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.nodecharacteristics @@ -5,13 +5,21 @@ + + + + - + + + + + @@ -19,6 +27,10 @@ + + + + @@ -26,6 +38,10 @@ + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.repository index db3cc53..48d0b0f 100644 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.repository +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.repository @@ -1,14 +1,14 @@ - + - + - - + + - + @@ -20,11 +20,25 @@ + + + + + + + + + + + + + + @@ -34,6 +48,13 @@ + + + + + + + @@ -43,16 +64,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -67,16 +154,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.usagemodel index 32e0b33..59c0df9 100644 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.usagemodel +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.usagemodel @@ -208,7 +208,7 @@ - + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/representations.aird index 892c9f2..59c6155 100644 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/representations.aird +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/representations.aird @@ -31,7 +31,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -967,77 +967,85 @@ - - - - - + + + + + + + + + - - + + - + - + - - - - - + + + + + + + + + - - + + - + - + - + - + - + - + - + - + - - + + @@ -1045,14 +1053,14 @@ - + - + - + @@ -1080,6 +1088,9 @@ + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO @@ -1099,30 +1110,49 @@ - + - + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO - + - + + + + + + + + + @@ -4876,6 +4906,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4989,6 +5076,22 @@ + + + + + + + + + + + + + + + + @@ -5050,7 +5153,7 @@ - + @@ -5273,6 +5376,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java index b468ab0..20c4c91 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java @@ -1,11 +1,10 @@ package org.dataflowanalysis.examplemodels.results; +import java.util.List; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.examplemodels.Activator; import org.eclipse.core.runtime.Plugin; -import java.util.List; - public interface ExampleModelResult { default String getModelProjectName() { return "org.dataflowanalysis.examplemodels"; diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedCharacteristic.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedCharacteristic.java index e1b6751..946ddf5 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedCharacteristic.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedCharacteristic.java @@ -2,6 +2,10 @@ public record ExpectedCharacteristic(String characteristicType, String characteristicLiteral) { + public static ExpectedCharacteristic of(String characteristicType, String characteristicLiteral) { + return new ExpectedCharacteristic(characteristicType, characteristicLiteral); + } + @Override public String toString() { return String.format("%s.%s", characteristicType, characteristicLiteral); diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java index aa38c1e..cd8b0f2 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java @@ -1,11 +1,10 @@ package org.dataflowanalysis.examplemodels.results; +import java.util.*; import org.dataflowanalysis.analysis.core.AbstractVertex; import org.dataflowanalysis.analysis.core.CharacteristicValue; import org.dataflowanalysis.analysis.core.DataCharacteristic; -import java.util.*; - public class ExpectedViolation { private final int flowGraphIndex; private final Identifier identifier; @@ -13,7 +12,7 @@ public class ExpectedViolation { private final Map> dataCharacteristics; public ExpectedViolation(int flowGraphIndex, Identifier identifier, List vertexCharacteristics, - Map> dataCharacteristics) { + Map> dataCharacteristics) { this.flowGraphIndex = flowGraphIndex; this.identifier = identifier; this.vertexCharacteristics = vertexCharacteristics; @@ -25,7 +24,9 @@ public boolean references(AbstractVertex element, int flowGraphIndex) { } public List hasNodeCharacteristic(List actualCharacteristics) { - return this.vertexCharacteristics.stream().filter(it -> !this.hasCharacteristicValue(it, actualCharacteristics)).toList(); + return this.vertexCharacteristics.stream() + .filter(it -> !this.hasCharacteristicValue(it, actualCharacteristics)) + .toList(); } public List hasIncorrectNodeCharacteristics(List actualCharacteristics) { @@ -38,7 +39,8 @@ public Map> hasDataCharacteristics(List> missingDataCharacteristics = new HashMap<>(); for (var expectedDataCharacteristic : dataCharacteristics.entrySet()) { Optional actualDataCharacteristic = actualDataCharacteristics.stream() - .filter(it -> it.getVariableName().equals(expectedDataCharacteristic.getKey())) + .filter(it -> it.getVariableName() + .equals(expectedDataCharacteristic.getKey())) .findAny(); if (actualDataCharacteristic.isEmpty()) { missingDataCharacteristics.put(expectedDataCharacteristic.getKey(), expectedDataCharacteristic.getValue()); @@ -47,7 +49,8 @@ public Map> hasDataCharacteristics(List expectedCharacteristics = expectedDataCharacteristic.getValue(); List missingCharacteristics = new ArrayList<>(); for (var expectedCharacteristic : expectedCharacteristics) { - if (!this.hasCharacteristicValue(expectedCharacteristic, actualDataCharacteristic.get().getAllCharacteristics())) { + if (!this.hasCharacteristicValue(expectedCharacteristic, actualDataCharacteristic.get() + .getAllCharacteristics())) { missingCharacteristics.add(expectedCharacteristic); } } @@ -61,8 +64,10 @@ public Map> hasDataCharacteristics(List> hasMissingDataCharacteristics(List actualDataCharacteristics) { Map> missingDataCharacteristics = new HashMap<>(); for (var actualDataCharacteristic : actualDataCharacteristics) { - Optional> expectedCharacteristics = this.dataCharacteristics.entrySet().stream() - .filter(it -> it.getKey().equals(actualDataCharacteristic.getVariableName())) + Optional> expectedCharacteristics = this.dataCharacteristics.entrySet() + .stream() + .filter(it -> it.getKey() + .equals(actualDataCharacteristic.getVariableName())) .map(Map.Entry::getValue) .findAny(); if (expectedCharacteristics.isEmpty()) { @@ -84,14 +89,18 @@ public Map> hasMissingDataCharacteristics(List private boolean hasCharacteristicValue(ExpectedCharacteristic expectedCharacteristic, List actualCharacteristics) { return actualCharacteristics.stream() - .filter(it -> expectedCharacteristic.characteristicType().equals(it.getTypeName())) - .anyMatch(it -> expectedCharacteristic.characteristicLiteral().equals(it.getValueName())); + .filter(it -> expectedCharacteristic.characteristicType() + .equals(it.getTypeName())) + .anyMatch(it -> expectedCharacteristic.characteristicLiteral() + .equals(it.getValueName())); } private boolean hasExpectedCharacteristic(List expectedCharacteristics, CharacteristicValue actualCharacteristic) { return expectedCharacteristics.stream() - .filter(it -> it.characteristicType().equals(actualCharacteristic.getTypeName())) - .anyMatch(it -> it.characteristicLiteral().equals(actualCharacteristic.getValueName())); + .filter(it -> it.characteristicType() + .equals(actualCharacteristic.getTypeName())) + .anyMatch(it -> it.characteristicLiteral() + .equals(actualCharacteristic.getValueName())); } public Identifier getIdentifier() { diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java index f7749b3..191899f 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java @@ -1,15 +1,16 @@ package org.dataflowanalysis.examplemodels.results.dfd; -import org.dataflowanalysis.examplemodels.results.ExampleModelResult; - import java.nio.file.Paths; +import org.dataflowanalysis.examplemodels.results.ExampleModelResult; public interface DFDExampleModelResult extends ExampleModelResult { default String getDataFlowDiagram() { - return Paths.get(this.getBaseFolderName(), "dfd", this.getModelName(), String.format("%s.dataflowdiagram", this.getFileName())).toString(); + return Paths.get(this.getBaseFolderName(), "dfd", this.getModelName(), String.format("%s.dataflowdiagram", this.getFileName())) + .toString(); } default String getDataDictionary() { - return Paths.get(this.getBaseFolderName(), "dfd", this.getModelName(), String.format("%s.datadictionary", this.getFileName())).toString(); + return Paths.get(this.getBaseFolderName(), "dfd", this.getModelName(), String.format("%s.datadictionary", this.getFileName())) + .toString(); } } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDIdentifier.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDIdentifier.java index dc79dc2..0d79bfb 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDIdentifier.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDIdentifier.java @@ -16,7 +16,9 @@ public boolean matches(AbstractVertex vertex) { if (!(vertex instanceof DFDVertex dfdVertex)) { return false; } - return dfdVertex.getReferencedElement().getId().equals(this.id); + return dfdVertex.getReferencedElement() + .getId() + .equals(this.id); } public static DFDIdentifier of(String id) { diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/models/BranchingResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/models/BranchingResult.java index d8e45ef..587cdb0 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/models/BranchingResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/models/BranchingResult.java @@ -1,12 +1,11 @@ package org.dataflowanalysis.examplemodels.results.dfd.models; +import java.util.List; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult; -import java.util.List; - public class BranchingResult implements DFDExampleModelResult { @Override public String getModelName() { @@ -15,11 +14,11 @@ public String getModelName() { @Override public List getDSLConstraints() { - return List.of(new ConstraintDSL() - .ofData() + return List.of(new ConstraintDSL().ofData() .neverFlows() .toVertex() - .with((vertex) -> vertex.getAllVertexCharacteristics().isEmpty()) + .with((vertex) -> vertex.getAllVertexCharacteristics() + .isEmpty()) .create()); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/OnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/OnlineShopResult.java index 80bd879..488d5cf 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/OnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/OnlineShopResult.java @@ -1,5 +1,7 @@ package org.dataflowanalysis.examplemodels.results.dfd.scenarios; +import java.util.List; +import java.util.Map; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; @@ -7,10 +9,7 @@ import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult; import org.dataflowanalysis.examplemodels.results.dfd.DFDIdentifier; -import java.util.List; -import java.util.Map; - -public class OnlineShopResult implements DFDExampleModelResult { +public class OnlineShopResult implements DFDExampleModelResult { @Override public String getBaseFolderName() { return "scenarios"; @@ -23,8 +22,7 @@ public String getModelName() { @Override public List getDSLConstraints() { - return List.of(new ConstraintDSL() - .ofData() + return List.of(new ConstraintDSL().ofData() .withLabel("Sensitivity", "Personal") .neverFlows() .toVertex() @@ -34,11 +32,9 @@ public List getDSLConstraints() { @Override public List getExpectedViolations() { - return List.of(new ExpectedViolation(2, new DFDIdentifier("_U27Lor6CEe6fAKdvyu1GEg"), List.of(new ExpectedCharacteristic("Location", "nonEU")), - Map.of("_zWPQ8L6GEe6fAKdvyu1GEg", List.of( - new ExpectedCharacteristic("Sensitivity", "Personal"), - new ExpectedCharacteristic("Encryption", "Encrypted") - )))); + return List.of(new ExpectedViolation(2, new DFDIdentifier("_U27Lor6CEe6fAKdvyu1GEg"), + List.of(new ExpectedCharacteristic("Location", "nonEU")), Map.of("_zWPQ8L6GEe6fAKdvyu1GEg", + List.of(new ExpectedCharacteristic("Sensitivity", "Personal"), new ExpectedCharacteristic("Encryption", "Encrypted"))))); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/SimpleOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/SimpleOnlineShopResult.java index 0be75f0..774069e 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/SimpleOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/SimpleOnlineShopResult.java @@ -1,5 +1,7 @@ package org.dataflowanalysis.examplemodels.results.dfd.scenarios; +import java.util.List; +import java.util.Map; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; @@ -7,9 +9,6 @@ import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult; import org.dataflowanalysis.examplemodels.results.dfd.DFDIdentifier; -import java.util.List; -import java.util.Map; - public class SimpleOnlineShopResult implements DFDExampleModelResult { @Override public String getBaseFolderName() { @@ -24,8 +23,7 @@ public String getModelName() { @Override public List getDSLConstraints() { - return List.of(new ConstraintDSL() - .ofData() + return List.of(new ConstraintDSL().ofData() .withLabel("Sensitivity", "Personal") .neverFlows() .toVertex() @@ -36,11 +34,8 @@ public List getDSLConstraints() { @Override public List getExpectedViolations() { return List.of(new ExpectedViolation(1, new DFDIdentifier("_U27Lor6CEe6fAKdvyu1GEg"), - List.of(new ExpectedCharacteristic("Location", "nonEU")), - Map.of("_448GwMBCEe62ZOq30ePU7Q", List.of( - new ExpectedCharacteristic("Sensitivity", "Personal"), - new ExpectedCharacteristic("Encryption", "Encrypted") - )))); + List.of(new ExpectedCharacteristic("Location", "nonEU")), Map.of("_448GwMBCEe62ZOq30ePU7Q", + List.of(new ExpectedCharacteristic("Sensitivity", "Personal"), new ExpectedCharacteristic("Encryption", "Encrypted"))))); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMExampleModelResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMExampleModelResult.java index cdf0f32..df287a8 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMExampleModelResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMExampleModelResult.java @@ -1,19 +1,21 @@ package org.dataflowanalysis.examplemodels.results.pcm; -import org.dataflowanalysis.examplemodels.results.ExampleModelResult; - import java.nio.file.Paths; +import org.dataflowanalysis.examplemodels.results.ExampleModelResult; public interface PCMExampleModelResult extends ExampleModelResult { default String getUsageModelPath() { - return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.usagemodel", this.getFileName())).toString(); + return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.usagemodel", this.getFileName())) + .toString(); } default String getAllocationModelPath() { - return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.allocation", this.getFileName())).toString(); + return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.allocation", this.getFileName())) + .toString(); } default String getNodeCharacteristicsModelPath() { - return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.nodecharacteristics", this.getFileName())).toString(); + return Paths.get(this.getBaseFolderName(), "pcm", this.getModelName(), String.format("%s.nodecharacteristics", this.getFileName())) + .toString(); } } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMIdentifier.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMIdentifier.java index 9a103bc..3a918e9 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMIdentifier.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMIdentifier.java @@ -1,12 +1,11 @@ package org.dataflowanalysis.examplemodels.results.pcm; +import java.util.Optional; import org.dataflowanalysis.analysis.core.AbstractVertex; import org.dataflowanalysis.analysis.pcm.core.AbstractPCMVertex; import org.dataflowanalysis.analysis.pcm.core.CallReturnBehavior; import org.dataflowanalysis.examplemodels.results.Identifier; -import java.util.Optional; - public class PCMIdentifier implements Identifier { private final String id; private final Optional calling; @@ -31,7 +30,9 @@ public boolean matches(AbstractVertex vertex) { return false; } } - return pcmVertex.getReferencedElement().getId().equals(this.id); + return pcmVertex.getReferencedElement() + .getId() + .equals(this.id); } public static PCMIdentifier of(String id) { diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/CompositeResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/CompositeResult.java index 938832a..7dfbcee 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/CompositeResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/CompositeResult.java @@ -1,5 +1,7 @@ package org.dataflowanalysis.examplemodels.results.pcm.models; +import java.util.ArrayList; +import java.util.List; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.analysis.pcm.core.seff.SEFFPCMVertex; @@ -7,9 +9,6 @@ import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; -import java.util.ArrayList; -import java.util.List; - public class CompositeResult implements PCMExampleModelResult { @Override public String getModelName() { @@ -19,12 +18,13 @@ public String getModelName() { @Override public List getDSLConstraints() { List constraints = new ArrayList<>(); - constraints.add(new ConstraintDSL() - .ofData() + constraints.add(new ConstraintDSL().ofData() .neverFlows() .toVertex() - .with((vertex) -> vertex instanceof UserPCMVertex && vertex.getAllVertexCharacteristics().size() != 1) - .with((vertex) -> vertex instanceof SEFFPCMVertex && vertex.getAllVertexCharacteristics().size() != 3) + .with((vertex) -> vertex instanceof UserPCMVertex && vertex.getAllVertexCharacteristics() + .size() != 1) + .with((vertex) -> vertex instanceof SEFFPCMVertex && vertex.getAllVertexCharacteristics() + .size() != 3) .create()); return constraints; } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/IgnoredNodesResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/IgnoredNodesResult.java index ed4dc11..bc02c96 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/IgnoredNodesResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/IgnoredNodesResult.java @@ -1,5 +1,7 @@ package org.dataflowanalysis.examplemodels.results.pcm.models; +import java.util.List; +import java.util.Map; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.analysis.pcm.dsl.PCMVertexType; @@ -8,9 +10,6 @@ import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; -import java.util.List; -import java.util.Map; - public class IgnoredNodesResult implements PCMExampleModelResult { @Override public String getModelName() { @@ -19,19 +18,20 @@ public String getModelName() { @Override public List getDSLConstraints() { - return List.of(new ConstraintDSL() - .fromNode() + return List.of(new ConstraintDSL().fromNode() .withType(PCMVertexType.CALLING) .withType(PCMVertexType.USER) .neverFlows() .toVertex() - .with((node) -> !node.getAllDataCharacteristics().isEmpty()) + .with((node) -> !node.getAllDataCharacteristics() + .isEmpty()) .create()); } @Override public List getExpectedViolations() { - return List.of(new ExpectedViolation(0, new PCMIdentifier("_LTpZcKpIEe6ICOKQQaQogw"), List.of(), Map.of("RETURN", List.of(new ExpectedCharacteristic("DataVisibility", "User"))))); + return List.of(new ExpectedViolation(0, new PCMIdentifier("_LTpZcKpIEe6ICOKQQaQogw"), List.of(), + Map.of("RETURN", List.of(new ExpectedCharacteristic("DataVisibility", "User"))))); } @Override diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/MultipleDeploymentsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/MultipleDeploymentsResult.java index 612a93a..5fba884 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/MultipleDeploymentsResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/MultipleDeploymentsResult.java @@ -1,5 +1,7 @@ package org.dataflowanalysis.examplemodels.results.pcm.models; +import java.util.List; +import java.util.Map; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; @@ -7,9 +9,6 @@ import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; -import java.util.List; -import java.util.Map; - public class MultipleDeploymentsResult implements PCMExampleModelResult { @Override public String getModelName() { @@ -18,8 +17,7 @@ public String getModelName() { @Override public List getDSLConstraints() { - return List.of(new ConstraintDSL() - .ofData() + return List.of(new ConstraintDSL().ofData() .withLabel("DataSensitivity", "Personal") .neverFlows() .toVertex() diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/NodeCharacteristicsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/NodeCharacteristicsResult.java index 4a9bcce..7f430fc 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/NodeCharacteristicsResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/NodeCharacteristicsResult.java @@ -1,5 +1,7 @@ package org.dataflowanalysis.examplemodels.results.pcm.models; +import java.util.ArrayList; +import java.util.List; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.analysis.pcm.core.seff.SEFFPCMVertex; @@ -7,9 +9,6 @@ import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; -import java.util.ArrayList; -import java.util.List; - public class NodeCharacteristicsResult implements PCMExampleModelResult { @Override public String getModelName() { @@ -19,12 +18,13 @@ public String getModelName() { @Override public List getDSLConstraints() { List constraints = new ArrayList<>(); - constraints.add(new ConstraintDSL() - .ofData() + constraints.add(new ConstraintDSL().ofData() .neverFlows() .toVertex() - .with((vertex) -> vertex instanceof UserPCMVertex && vertex.getAllVertexCharacteristics().size() != 1) - .with((vertex) -> vertex instanceof SEFFPCMVertex && vertex.getAllVertexCharacteristics().size() != 2) + .with((vertex) -> vertex instanceof UserPCMVertex && vertex.getAllVertexCharacteristics() + .size() != 1) + .with((vertex) -> vertex instanceof SEFFPCMVertex && vertex.getAllVertexCharacteristics() + .size() != 2) .create()); return constraints; } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/VariableReturnResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/VariableReturnResult.java index 33c9660..37669a3 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/VariableReturnResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/VariableReturnResult.java @@ -1,5 +1,7 @@ package org.dataflowanalysis.examplemodels.results.pcm.models; +import java.util.List; +import java.util.Map; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.analysis.dsl.selectors.Intersection; @@ -9,9 +11,6 @@ import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; -import java.util.List; -import java.util.Map; - public class VariableReturnResult implements PCMExampleModelResult { @Override public String getModelName() { @@ -20,8 +19,7 @@ public String getModelName() { @Override public List getDSLConstraints() { - return List.of(new ConstraintDSL() - .ofData() + return List.of(new ConstraintDSL().ofData() .withLabel("AssignedRole", ConstraintVariable.of("grantedRoles")) .neverFlows() .toVertex() @@ -36,9 +34,11 @@ public List getDSLConstraints() { @Override public List getExpectedViolations() { return List.of( - new ExpectedViolation(0, PCMIdentifier.of("_nOhAgILtEe2YyoqaKVkqog", false), List.of(new ExpectedCharacteristic("AssignedRole", "User")), + new ExpectedViolation(0, PCMIdentifier.of("_nOhAgILtEe2YyoqaKVkqog", false), + List.of(new ExpectedCharacteristic("AssignedRole", "User")), Map.of("RETURN", List.of(new ExpectedCharacteristic("AssignedRole", "Admin")))), - new ExpectedViolation(0, PCMIdentifier.of("_9M9DMoLsEe2YyoqaKVkqog", false), List.of(new ExpectedCharacteristic("AssignedRole", "User")), + new ExpectedViolation(0, PCMIdentifier.of("_9M9DMoLsEe2YyoqaKVkqog", false), + List.of(new ExpectedCharacteristic("AssignedRole", "User")), Map.of("data", List.of(new ExpectedCharacteristic("AssignedRole", "Admin"))))); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BankBranchesResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BankBranchesResult.java index 54916f8..5d1f230 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BankBranchesResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BankBranchesResult.java @@ -1,5 +1,81 @@ package org.dataflowanalysis.examplemodels.results.pcm.scenarios; -public class BankBranchesResult { - //TODO +import java.util.List; +import java.util.Map; +import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; +import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; +import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; +import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; + +public class BankBranchesResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } + + @Override + public String getModelName() { + return "BankBranches"; + } + + @Override + public List getDSLConstraints() { + return List.of(new ConstraintDSL().ofData() + .withLabel("Status", "Celebrity") + .neverFlows() + .toVertex() + .withCharacteristic("Role", "Clerk") + .create()); + } + + @Override + public List getExpectedViolations() { + return List.of( + new ExpectedViolation(0, PCMIdentifier.of("_NTFQ0D6xEeuVUal8mM_jUA", false), + List.of(new ExpectedCharacteristic("Location", "USA"), new ExpectedCharacteristic("Role", "Clerk")), + Map.of("RETURN", List.of(new ExpectedCharacteristic("Status", "Celebrity")), "customerName", + List.of(new ExpectedCharacteristic("Status", "Regular"), new ExpectedCharacteristic("Origin", "USA")), "customer", + List.of(new ExpectedCharacteristic("Status", "Regular"), new ExpectedCharacteristic("Origin", "USA")))), + new ExpectedViolation(0, PCMIdentifier.of("_KU1XAD6xEeuVUal8mM_jUA", true), + List.of(new ExpectedCharacteristic("Location", "USA"), new ExpectedCharacteristic("Role", "Clerk")), + Map.of("customerName", List.of(ExpectedCharacteristic.of("Origin", "USA"), ExpectedCharacteristic.of("Status", "Regular")), + "customer", List.of(ExpectedCharacteristic.of("Status", "Celebrity")))), + new ExpectedViolation(0, PCMIdentifier.of("_KU1XAD6xEeuVUal8mM_jUA", false), + List.of(new ExpectedCharacteristic("Location", "USA"), new ExpectedCharacteristic("Role", "Clerk")), + Map.of("RETURN", + List.of(ExpectedCharacteristic.of("Origin", "USA"), ExpectedCharacteristic.of("Status", "Regular"), + ExpectedCharacteristic.of("Status", "Celebrity")), + "customerName", List.of(ExpectedCharacteristic.of("Origin", "USA"), ExpectedCharacteristic.of("Status", "Regular")), + "customer", List.of(ExpectedCharacteristic.of("Status", "Celebrity")))), + new ExpectedViolation(0, PCMIdentifier.of("_3Y4qYj6wEeuVUal8mM_jUA"), + List.of(new ExpectedCharacteristic("Location", "USA"), new ExpectedCharacteristic("Role", "Clerk")), + Map.of("creditLine", + List.of(ExpectedCharacteristic.of("Origin", "USA"), ExpectedCharacteristic.of("Status", "Regular"), + ExpectedCharacteristic.of("Status", "Celebrity")), + "customerName", List.of(ExpectedCharacteristic.of("Origin", "USA"), ExpectedCharacteristic.of("Status", "Regular")), + "customer", List.of(ExpectedCharacteristic.of("Status", "Celebrity")))), + new ExpectedViolation(2, PCMIdentifier.of("_JD3o8D6yEeuVUal8mM_jUA", false), + List.of(new ExpectedCharacteristic("Location", "Asia"), new ExpectedCharacteristic("Role", "Clerk")), + Map.of("RETURN", List.of(new ExpectedCharacteristic("Status", "Celebrity")), "customerName", + List.of(new ExpectedCharacteristic("Status", "Regular"), new ExpectedCharacteristic("Origin", "Asia")), "customer", + List.of(new ExpectedCharacteristic("Status", "Regular"), new ExpectedCharacteristic("Origin", "Asia")))), + new ExpectedViolation(2, PCMIdentifier.of("_LxynwD6yEeuVUal8mM_jUA", true), + List.of(new ExpectedCharacteristic("Location", "Asia"), new ExpectedCharacteristic("Role", "Clerk")), + Map.of("customerName", List.of(ExpectedCharacteristic.of("Origin", "Asia"), ExpectedCharacteristic.of("Status", "Regular")), + "customer", List.of(ExpectedCharacteristic.of("Status", "Celebrity")))), + new ExpectedViolation(2, PCMIdentifier.of("_LxynwD6yEeuVUal8mM_jUA", false), + List.of(new ExpectedCharacteristic("Location", "Asia"), new ExpectedCharacteristic("Role", "Clerk")), + Map.of("RETURN", + List.of(ExpectedCharacteristic.of("Origin", "Asia"), ExpectedCharacteristic.of("Status", "Regular"), + ExpectedCharacteristic.of("Status", "Celebrity")), + "customerName", List.of(ExpectedCharacteristic.of("Origin", "Asia"), ExpectedCharacteristic.of("Status", "Regular")), + "customer", List.of(ExpectedCharacteristic.of("Status", "Celebrity"))))); + } + + @Override + public String toString() { + return this.getModelName(); + } } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BranchingOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BranchingOnlineShopResult.java index c43ba50..2714ebe 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BranchingOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BranchingOnlineShopResult.java @@ -1,25 +1,25 @@ package org.dataflowanalysis.examplemodels.results.pcm.scenarios; +import java.util.List; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; -import java.util.List; - public class BranchingOnlineShopResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { return "scenarios"; } + @Override public String getModelName() { return "BranchingOnlineShop"; } + @Override public List getDSLConstraints() { - return List.of(new ConstraintDSL() - .ofData() + return List.of(new ConstraintDSL().ofData() .withLabel("DataSensitivity", "Personal") .neverFlows() .toVertex() diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java index 84a2966..58e8107 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java @@ -1,11 +1,10 @@ package org.dataflowanalysis.examplemodels.results.pcm.scenarios; +import java.util.List; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; -import java.util.List; - public class CoCarResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java index 6477709..671986c 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java @@ -1,5 +1,5 @@ package org.dataflowanalysis.examplemodels.results.pcm.scenarios; public class ContactSMSResult { - //TODO + // TODO } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoronaWarnAppResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoronaWarnAppResult.java index 29f0692..7a1add4 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoronaWarnAppResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoronaWarnAppResult.java @@ -1,12 +1,12 @@ package org.dataflowanalysis.examplemodels.results.pcm.scenarios; +import java.util.ArrayList; +import java.util.List; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; -import java.util.ArrayList; -import java.util.List; public class CoronaWarnAppResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { @@ -21,14 +21,12 @@ public String getModelName() { @Override public List getDSLConstraints() { List constraints = new ArrayList<>(); - constraints.add(new ConstraintDSL() - .ofData() + constraints.add(new ConstraintDSL().ofData() .neverFlows() .toVertex() .withCharacteristic("Location", "IllegalLocation") .create()); - constraints.add(new ConstraintDSL() - .ofData() + constraints.add(new ConstraintDSL().ofData() .withLabel("Status", "Leaked") .neverFlows() .toVertex() diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java index cba2087..1f65149 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java @@ -1,5 +1,5 @@ package org.dataflowanalysis.examplemodels.results.pcm.scenarios; public class DistanceTrackerResult { - //TODO + // TODO } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java index 003f2a9..464555f 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java @@ -1,5 +1,5 @@ package org.dataflowanalysis.examplemodels.results.pcm.scenarios; public class FlightControlResult { - //TODO + // TODO } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/InternationalOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/InternationalOnlineShopResult.java index 65725a3..fb4d220 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/InternationalOnlineShopResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/InternationalOnlineShopResult.java @@ -1,5 +1,7 @@ package org.dataflowanalysis.examplemodels.results.pcm.scenarios; +import java.util.List; +import java.util.Map; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedCharacteristic; @@ -7,9 +9,6 @@ import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; -import java.util.List; -import java.util.Map; - public class InternationalOnlineShopResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { @@ -23,8 +22,7 @@ public String getModelName() { @Override public List getDSLConstraints() { - return List.of(new ConstraintDSL() - .ofData() + return List.of(new ConstraintDSL().ofData() .withLabel("DataSensitivity", "Personal") .neverFlows() .toVertex() @@ -35,9 +33,11 @@ public List getDSLConstraints() { @Override public List getExpectedViolations() { return List.of( - new ExpectedViolation(0, PCMIdentifier.of("_oGmXgYTjEeywmO_IpTxeAg", true), List.of(new ExpectedCharacteristic("ServerLocation", "nonEU")), + new ExpectedViolation(0, PCMIdentifier.of("_oGmXgYTjEeywmO_IpTxeAg", true), + List.of(new ExpectedCharacteristic("ServerLocation", "nonEU")), Map.of("userData", List.of(new ExpectedCharacteristic("DataSensitivity", "Personal")))), - new ExpectedViolation(0, PCMIdentifier.of("_oGmXgYTjEeywmO_IpTxeAg", false), List.of(new ExpectedCharacteristic("ServerLocation", "nonEU")), + new ExpectedViolation(0, PCMIdentifier.of("_oGmXgYTjEeywmO_IpTxeAg", false), + List.of(new ExpectedCharacteristic("ServerLocation", "nonEU")), Map.of("userData", List.of(new ExpectedCharacteristic("DataSensitivity", "Personal"))))); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java index a44a219..0f93397 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java @@ -1,13 +1,12 @@ package org.dataflowanalysis.examplemodels.results.pcm.scenarios; +import java.util.ArrayList; +import java.util.List; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; -import java.util.ArrayList; -import java.util.List; - public class MaaSTicketSystemResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { @@ -27,21 +26,18 @@ public String getFileName() { @Override public List getDSLConstraints() { List constraints = new ArrayList<>(); - constraints.add(new ConstraintDSL() - .fromNode() + constraints.add(new ConstraintDSL().fromNode() .neverFlows() .toVertex() .withCharacteristic("Role", "MaliciousActor") .create()); - constraints.add(new ConstraintDSL() - .ofData() + constraints.add(new ConstraintDSL().ofData() .withLabel("DataType", "LoginData") .neverFlows() .toVertex() .withCharacteristic("Role", "Customer") .create()); - constraints.add(new ConstraintDSL() - .ofData() + constraints.add(new ConstraintDSL().ofData() .withLabel("Origin", "Leaked") .neverFlows() .toVertex() diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/TravelPlannerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/TravelPlannerResult.java index 5fadfe0..f0caec1 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/TravelPlannerResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/TravelPlannerResult.java @@ -1,5 +1,7 @@ package org.dataflowanalysis.examplemodels.results.pcm.scenarios; +import java.util.List; +import java.util.Map; import org.dataflowanalysis.analysis.dsl.AnalysisConstraint; import org.dataflowanalysis.analysis.dsl.constraint.ConstraintDSL; import org.dataflowanalysis.analysis.dsl.selectors.Intersection; @@ -9,9 +11,6 @@ import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; -import java.util.List; -import java.util.Map; - public class TravelPlannerResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { @@ -30,8 +29,7 @@ public String getFileName() { @Override public List getDSLConstraints() { - return List.of(new ConstraintDSL() - .ofData() + return List.of(new ConstraintDSL().ofData() .withLabel("GrantedRoles", ConstraintVariable.of("grantedRoles")) .neverFlows() .toVertex() @@ -45,16 +43,17 @@ public List getDSLConstraints() { @Override public List getExpectedViolations() { - return List.of( - new ExpectedViolation(0, PCMIdentifier.of("_vorK8fVeEeuMKba1Qn68bg", true), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), - Map.of("flight", - List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline")), - "ccd", List.of(new ExpectedCharacteristic("GrantedRoles", "User")))), - new ExpectedViolation(0, PCMIdentifier.of("_7HCu4PViEeuMKba1Qn68bg", false), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), + return List.of(new ExpectedViolation(0, PCMIdentifier.of("_vorK8fVeEeuMKba1Qn68bg", true), + List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), + Map.of("flight", List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline")), + "ccd", List.of(new ExpectedCharacteristic("GrantedRoles", "User")))), + new ExpectedViolation(0, PCMIdentifier.of("_7HCu4PViEeuMKba1Qn68bg", false), + List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), Map.of("flight", List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline")), "ccd", List.of(new ExpectedCharacteristic("GrantedRoles", "User")))), - new ExpectedViolation(0, PCMIdentifier.of("_vorK8vVeEeuMKba1Qn68bg", false), List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), + new ExpectedViolation(0, PCMIdentifier.of("_vorK8vVeEeuMKba1Qn68bg", false), + List.of(new ExpectedCharacteristic("AssignedRoles", "Airline")), Map.of("flight", List.of(new ExpectedCharacteristic("GrantedRoles", "User"), new ExpectedCharacteristic("GrantedRoles", "Airline")), "ccd", List.of(new ExpectedCharacteristic("GrantedRoles", "User")), "RETURN", From e77627767de02abc2f7fa05a63d9f8c83a866344 Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Mon, 28 Apr 2025 15:35:16 +0200 Subject: [PATCH 14/15] feat(scenarios): remove scenarios without updated characteristic files --- .../CharacteristicTypes.characteristics | 9 - .../pcm/ContactSMS/newAllocation.allocation | 17 - .../pcm/ContactSMS/newRepository.repository | 147 - ...newResourceEnvironment.resourceenvironment | 24 - ...onment.resourceenvironment.characteristics | 11 - .../scenarios/pcm/ContactSMS/newSystem.system | 32 - .../pcm/ContactSMS/newUsageModel.usagemodel | 90 - .../newUsageModel.usagemodel.characteristics | 7 - .../pcm/ContactSMS/representations.aird | 3311 --- .../CharacteristicTypes.characteristics | 10 - .../Characteristics.characteristics | 15 - .../DistanceTracker/newAllocation.allocation | 17 - .../DistanceTracker/newRepository.repository | 243 - ...newResourceEnvironment.resourceenvironment | 24 - .../pcm/DistanceTracker/newSystem.system | 32 - .../DistanceTracker/newUsageModel.usagemodel | 74 - .../CharacteristicTypes.characteristics | 10 - .../Characteristics.characteristics | 15 - .../FlightControl/newAllocation.allocation | 21 - .../FlightControl/newRepository.repository | 304 - ...newResourceEnvironment.resourceenvironment | 29 - .../pcm/FlightControl/newSystem.system | 65 - .../FlightControl/newUsageModel.usagemodel | 142 - .../CharacteristicTypes.characteristics | 12 - .../pcm/FriendMap/newAllocation.allocation | 25 - .../pcm/FriendMap/newRepository.repository | 258 - ...newResourceEnvironment.resourceenvironment | 34 - ...onment.resourceenvironment.characteristics | 19 - .../pcm/FriendMap/newUsageModel.usagemodel | 88 - .../newUsageModel.usagemodel.characteristics | 7 - .../scenarios/pcm/FriendMap/newsystem.system | 42 - .../pcm/FriendMap/representations.aird | 4318 ---- .../characteristicTypes.characteristics | 10 - .../pcm/HealthRecord/newAllocation.allocation | 25 - .../pcm/HealthRecord/newRepository.repository | 359 - ...newResourceEnvironment.resourceenvironment | 4 - .../pcm/HealthRecord/newSystem.system | 51 - .../pcm/HealthRecord/newUsageModel.usagemodel | 267 - .../newUsageModel.usagemodel.characteristics | 18 - .../pcm/HealthRecord/representations.aird | 7380 ------- .../CharacteristicTypes.characteristics | 12 - .../pcm/Hospital/newAllocation.allocation | 17 - .../pcm/Hospital/newRepository.repository | 262 - ...newResourceEnvironment.resourceenvironment | 13 - ...onment.resourceenvironment.characteristics | 7 - .../scenarios/pcm/Hospital/newSystem.system | 34 - .../pcm/Hospital/newUsageModel.usagemodel | 177 - .../newUsageModel.usagemodel.characteristics | 15 - .../pcm/Hospital/representations.aird | 4484 ---- .../CharacteristicTypes.characteristics | 11 - .../Characteristics.characteristics | 24 - .../pcm/ImageSharing/newAllocation.allocation | 9 - .../pcm/ImageSharing/newRepository.repository | 21 - ...newResourceEnvironment.resourceenvironment | 4 - .../pcm/ImageSharing/newSystem.system | 22 - .../pcm/ImageSharing/newUsageModel.usagemodel | 87 - .../pcm/LoyaltyCard/LoyaltyCard.allocation | 29 - .../pcm/LoyaltyCard/LoyaltyCard.datamodel | 39 - .../scenarios/pcm/LoyaltyCard/LoyaltyCard.dfd | 1034 - .../LoyaltyCard.organizationenvironmentmodel | 7 - .../pcm/LoyaltyCard/LoyaltyCard.repository | 614 - .../LoyaltyCard.resourceenvironment | 14 - .../pcm/LoyaltyCard/LoyaltyCard.system | 55 - .../MakeStorePurchaseOnline.bpusagemodel | 19 - ...orePurchaseWithLoyaltyProgram.bpusagemodel | 19 - ... Advertisements and Discounts.bpusagemodel | 48 - .../RegisterLoyaltyCustomer.usagemodel | 24 - .../RegisterOnlineCustomer.usagemodel | 24 - .../Solve Customer Problem.bpusagemodel | 17 - .../scenarios/pcm/LoyaltyCard/expected_dd.xmi | 51 - .../pcm/LoyaltyCard/expected_dfd.xmi | 1422 -- .../CharacteristicTypes.characteristics | 24 - .../Characteristics.characteristics | 19 - .../pcm/PrivateTaxi/newAllocation.allocation | 21 - .../pcm/PrivateTaxi/newRepository.repository | 949 - ...newResourceEnvironment.resourceenvironment | 13 - .../pcm/PrivateTaxi/newSystem.system | 114 - .../pcm/PrivateTaxi/newUsageModel.usagemodel | 207 - .../pcm/PrivateTaxi/representations.aird | 17237 ---------------- .../results/pcm/scenarios/CoCarResult.java | 5 +- .../pcm/scenarios/ContactSMSResult.java | 5 - .../pcm/scenarios/DistanceTrackerResult.java | 5 - .../pcm/scenarios/FlightControlResult.java | 5 - .../pcm/scenarios/FriendMapResult.java | 5 - .../pcm/scenarios/HealthRecordResult.java | 5 - .../results/pcm/scenarios/HospitalResult.java | 5 - .../pcm/scenarios/ImageSharingResult.java | 5 - .../pcm/scenarios/LoyaltyCardResult.java | 5 - .../pcm/scenarios/MaaSTicketSystemResult.java | 1 - .../pcm/scenarios/PrivateTaxiResult.java | 5 - 90 files changed, 3 insertions(+), 44813 deletions(-) delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/CharacteristicTypes.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newAllocation.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newRepository.repository delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newSystem.system delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/representations.aird delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/CharacteristicTypes.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/Characteristics.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newAllocation.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newRepository.repository delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newSystem.system delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newUsageModel.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/CharacteristicTypes.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/Characteristics.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newAllocation.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newRepository.repository delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newResourceEnvironment.resourceenvironment delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newSystem.system delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newUsageModel.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/CharacteristicTypes.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newAllocation.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newRepository.repository delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newsystem.system delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/representations.aird delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/characteristicTypes.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newAllocation.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newRepository.repository delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newResourceEnvironment.resourceenvironment delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newSystem.system delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/representations.aird delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/CharacteristicTypes.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newAllocation.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newRepository.repository delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newSystem.system delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/representations.aird delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/CharacteristicTypes.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/Characteristics.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newAllocation.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newRepository.repository delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newResourceEnvironment.resourceenvironment delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newSystem.system delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newUsageModel.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.datamodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.dfd delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.repository delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.system delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dd.xmi delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dfd.xmi delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/CharacteristicTypes.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/Characteristics.characteristics delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newAllocation.allocation delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newRepository.repository delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newSystem.system delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newUsageModel.usagemodel delete mode 100644 bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/representations.aird delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FriendMapResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HealthRecordResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HospitalResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ImageSharingResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/LoyaltyCardResult.java delete mode 100644 bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/PrivateTaxiResult.java diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/CharacteristicTypes.characteristics deleted file mode 100644 index 0249d98..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/CharacteristicTypes.characteristics +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newAllocation.allocation deleted file mode 100644 index 5b0bdb9..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newAllocation.allocation +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newRepository.repository deleted file mode 100644 index 0e99a97..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newRepository.repository +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment deleted file mode 100644 index b39e2ce..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics deleted file mode 100644 index 8c93fc5..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newResourceEnvironment.resourceenvironment.characteristics +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newSystem.system deleted file mode 100644 index c62ab3c..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newSystem.system +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel deleted file mode 100644 index efb5220..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel.characteristics deleted file mode 100644 index 0baa64c..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/newUsageModel.usagemodel.characteristics +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/representations.aird deleted file mode 100644 index e3106f8..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ContactSMS/representations.aird +++ /dev/null @@ -1,3311 +0,0 @@ - - - - CharacteristicTypes.characteristics - newRepository.repository - pathmap://PCM_MODELS/Palladio.resourcetype - pathmap://PCM_MODELS/PrimitiveTypes.repository - pathmap://PCM_MODELS/FailureTypes.repository - newSystem.system - newResourceEnvironment.resourceenvironment - newAllocation.allocation - newUsageModel.usagemodel - newUsageModel.usagemodel.characteristics - newResourceEnvironment.resourceenvironment.characteristics - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/CharacteristicTypes.characteristics deleted file mode 100644 index dd727af..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/CharacteristicTypes.characteristics +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/Characteristics.characteristics deleted file mode 100644 index 348dda3..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/Characteristics.characteristics +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newAllocation.allocation deleted file mode 100644 index 536a63f..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newAllocation.allocation +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newRepository.repository deleted file mode 100644 index c2e79a6..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newRepository.repository +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment deleted file mode 100644 index 788aaaf..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newResourceEnvironment.resourceenvironment +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newSystem.system deleted file mode 100644 index 4fab0a2..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newSystem.system +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newUsageModel.usagemodel deleted file mode 100644 index e9e437b..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/DistanceTracker/newUsageModel.usagemodel +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/CharacteristicTypes.characteristics deleted file mode 100644 index 8044e5a..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/CharacteristicTypes.characteristics +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/Characteristics.characteristics deleted file mode 100644 index 6aebf87..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/Characteristics.characteristics +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newAllocation.allocation deleted file mode 100644 index c35a0d4..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newAllocation.allocation +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newRepository.repository deleted file mode 100644 index 31c5aa4..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newRepository.repository +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newResourceEnvironment.resourceenvironment deleted file mode 100644 index 4836a98..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newResourceEnvironment.resourceenvironment +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newSystem.system deleted file mode 100644 index e98b4bd..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newSystem.system +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newUsageModel.usagemodel deleted file mode 100644 index b4647b9..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FlightControl/newUsageModel.usagemodel +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/CharacteristicTypes.characteristics deleted file mode 100644 index 384f928..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/CharacteristicTypes.characteristics +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newAllocation.allocation deleted file mode 100644 index 86c8eda..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newAllocation.allocation +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newRepository.repository deleted file mode 100644 index f2721aa..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newRepository.repository +++ /dev/null @@ -1,258 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment deleted file mode 100644 index d894e7c..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics deleted file mode 100644 index 3e90e7f..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newResourceEnvironment.resourceenvironment.characteristics +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel deleted file mode 100644 index 359d6c2..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel.characteristics deleted file mode 100644 index f1f3ba6..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newUsageModel.usagemodel.characteristics +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newsystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newsystem.system deleted file mode 100644 index d56c5d5..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/newsystem.system +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/representations.aird deleted file mode 100644 index 002bbc0..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/FriendMap/representations.aird +++ /dev/null @@ -1,4318 +0,0 @@ - - - - newRepository.repository - pathmap://PCM_MODELS/Palladio.resourcetype - pathmap://PCM_MODELS/PrimitiveTypes.repository - pathmap://PCM_MODELS/FailureTypes.repository - CharacteristicTypes.characteristics - newsystem.system - newResourceEnvironment.resourceenvironment - newAllocation.allocation - newResourceEnvironment.resourceenvironment.characteristics - newUsageModel.usagemodel - newUsageModel.usagemodel.characteristics - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/characteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/characteristicTypes.characteristics deleted file mode 100644 index 173eae0..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/characteristicTypes.characteristics +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newAllocation.allocation deleted file mode 100644 index 8e11669..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newAllocation.allocation +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newRepository.repository deleted file mode 100644 index 5ea7f2a..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newRepository.repository +++ /dev/null @@ -1,359 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newResourceEnvironment.resourceenvironment deleted file mode 100644 index 4c03288..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newResourceEnvironment.resourceenvironment +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newSystem.system deleted file mode 100644 index f566385..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newSystem.system +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel deleted file mode 100644 index fe14c94..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel.characteristics deleted file mode 100644 index 39dc7e8..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/newUsageModel.usagemodel.characteristics +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/representations.aird deleted file mode 100644 index 75e1dc8..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/HealthRecord/representations.aird +++ /dev/null @@ -1,7380 +0,0 @@ - - - - newRepository.repository - pathmap://PCM_MODELS/Palladio.resourcetype - pathmap://PCM_MODELS/PrimitiveTypes.repository - pathmap://PCM_MODELS/FailureTypes.repository - characteristicTypes.characteristics - newSystem.system - newResourceEnvironment.resourceenvironment - newAllocation.allocation - newUsageModel.usagemodel - newUsageModel.usagemodel.characteristics - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/CharacteristicTypes.characteristics deleted file mode 100644 index f2af039..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/CharacteristicTypes.characteristics +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newAllocation.allocation deleted file mode 100644 index 0c20780..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newAllocation.allocation +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newRepository.repository deleted file mode 100644 index 64498b5..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newRepository.repository +++ /dev/null @@ -1,262 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment deleted file mode 100644 index cff7cab..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics deleted file mode 100644 index 88b2483..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newResourceEnvironment.resourceenvironment.characteristics +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newSystem.system deleted file mode 100644 index bcf9197..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newSystem.system +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel deleted file mode 100644 index 80468fc..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel.characteristics deleted file mode 100644 index f695476..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/newUsageModel.usagemodel.characteristics +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/representations.aird deleted file mode 100644 index f98b4ad..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/Hospital/representations.aird +++ /dev/null @@ -1,4484 +0,0 @@ - - - - newRepository.repository - pathmap://PCM_MODELS/Palladio.resourcetype - pathmap://PCM_MODELS/PrimitiveTypes.repository - pathmap://PCM_MODELS/FailureTypes.repository - CharacteristicTypes.characteristics - newSystem.system - newResourceEnvironment.resourceenvironment - newResourceEnvironment.resourceenvironment.characteristics - newAllocation.allocation - newUsageModel.usagemodel - newUsageModel.usagemodel.characteristics - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/CharacteristicTypes.characteristics deleted file mode 100644 index cc2197d..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/CharacteristicTypes.characteristics +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/Characteristics.characteristics deleted file mode 100644 index d7ba719..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/Characteristics.characteristics +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newAllocation.allocation deleted file mode 100644 index 73859bd..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newAllocation.allocation +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newRepository.repository deleted file mode 100644 index d113fd7..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newRepository.repository +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newResourceEnvironment.resourceenvironment deleted file mode 100644 index 54c2663..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newResourceEnvironment.resourceenvironment +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newSystem.system deleted file mode 100644 index 069903b..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newSystem.system +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newUsageModel.usagemodel deleted file mode 100644 index d83314a..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/ImageSharing/newUsageModel.usagemodel +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.allocation deleted file mode 100644 index 9e355f8..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.allocation +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.datamodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.datamodel deleted file mode 100644 index 1094555..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.datamodel +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.dfd b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.dfd deleted file mode 100644 index 125e980..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.dfd +++ /dev/null @@ -1,1034 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel deleted file mode 100644 index 9f0ad0a..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.organizationenvironmentmodel +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.repository deleted file mode 100644 index 910ad95..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.repository +++ /dev/null @@ -1,614 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment deleted file mode 100644 index eb52aba..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.resourceenvironment +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.system deleted file mode 100644 index aff1f3e..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/LoyaltyCard.system +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel deleted file mode 100644 index 763164e..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseOnline.bpusagemodel +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel deleted file mode 100644 index 0705068..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/MakeStorePurchaseWithLoyaltyProgram.bpusagemodel +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel deleted file mode 100644 index bb6ab5b..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Prepare Advertisements and Discounts.bpusagemodel +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel deleted file mode 100644 index 3cd1d9a..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterLoyaltyCustomer.usagemodel +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel deleted file mode 100644 index c16a5b9..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/RegisterOnlineCustomer.usagemodel +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel deleted file mode 100644 index 29242a0..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/Solve Customer Problem.bpusagemodel +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dd.xmi b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dd.xmi deleted file mode 100644 index c7e92a6..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dd.xmi +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dfd.xmi b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dfd.xmi deleted file mode 100644 index 25a95a1..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/LoyaltyCard/expected_dfd.xmi +++ /dev/null @@ -1,1422 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/CharacteristicTypes.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/CharacteristicTypes.characteristics deleted file mode 100644 index 585b0dd..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/CharacteristicTypes.characteristics +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/Characteristics.characteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/Characteristics.characteristics deleted file mode 100644 index f91edee..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/Characteristics.characteristics +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newAllocation.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newAllocation.allocation deleted file mode 100644 index e63d050..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newAllocation.allocation +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newRepository.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newRepository.repository deleted file mode 100644 index d1b3fb4..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newRepository.repository +++ /dev/null @@ -1,949 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment deleted file mode 100644 index 9e3e54d..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newResourceEnvironment.resourceenvironment +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newSystem.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newSystem.system deleted file mode 100644 index b860372..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newSystem.system +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newUsageModel.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newUsageModel.usagemodel deleted file mode 100644 index 6689327..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/newUsageModel.usagemodel +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/representations.aird deleted file mode 100644 index 5eb8ceb..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/PrivateTaxi/representations.aird +++ /dev/null @@ -1,17237 +0,0 @@ - - - - CharacteristicTypes.characteristics - Characteristics.characteristics - newAllocation.allocation - newResourceEnvironment.resourceenvironment - newSystem.system - newRepository.repository - platform:/plugin/org.palladiosimulator.dataflow.confidentiality.pcm.model.profile/profile.emfprofile_diagram - newUsageModel.usagemodel - pathmap://PCM_MODELS/FailureTypes.repository - pathmap://PCM_MODELS/Palladio.resourcetype - pathmap://PCM_MODELS/PrimitiveTypes.repository - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java index 58e8107..eece885 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java @@ -5,6 +5,9 @@ import org.dataflowanalysis.examplemodels.results.ExpectedViolation; import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; +/** + * FIXME: The CoCar Scenario does not have any constraint and therefore does not have expected violations + */ public class CoCarResult implements PCMExampleModelResult { @Override public String getBaseFolderName() { @@ -23,13 +26,11 @@ public String getFileName() { @Override public List getDSLConstraints() { - // TODO: Does not exist return List.of(); } @Override public List getExpectedViolations() { - // TODO: Enter actual expected violations (should this be per constraint?) return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java deleted file mode 100644 index 671986c..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ContactSMSResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm.scenarios; - -public class ContactSMSResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java deleted file mode 100644 index 1f65149..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/DistanceTrackerResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm.scenarios; - -public class DistanceTrackerResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java deleted file mode 100644 index 464555f..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FlightControlResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm.scenarios; - -public class FlightControlResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FriendMapResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FriendMapResult.java deleted file mode 100644 index efe37e1..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/FriendMapResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm.scenarios; - -public class FriendMapResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HealthRecordResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HealthRecordResult.java deleted file mode 100644 index 4fbb09d..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HealthRecordResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm.scenarios; - -public class HealthRecordResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HospitalResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HospitalResult.java deleted file mode 100644 index 8a2a574..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/HospitalResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm.scenarios; - -public class HospitalResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ImageSharingResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ImageSharingResult.java deleted file mode 100644 index 3fad62c..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/ImageSharingResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm.scenarios; - -public class ImageSharingResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/LoyaltyCardResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/LoyaltyCardResult.java deleted file mode 100644 index 2ab10e9..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/LoyaltyCardResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm.scenarios; - -public class LoyaltyCardResult { - // TODO -} diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java index 0f93397..7d48d58 100644 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java @@ -47,7 +47,6 @@ public List getDSLConstraints() { @Override public List getExpectedViolations() { - // TODO: Enter violations return List.of(); } diff --git a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/PrivateTaxiResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/PrivateTaxiResult.java deleted file mode 100644 index 68533d1..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/PrivateTaxiResult.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.dataflowanalysis.examplemodels.results.pcm.scenarios; - -public class PrivateTaxiResult { - // TODO -} From e41769b66b73395295c8da89978a0fc2a03f7cba Mon Sep 17 00:00:00 2001 From: Felix Schwickerath Date: Mon, 28 Apr 2025 16:17:11 +0200 Subject: [PATCH 15/15] ci(targetplatform): add analysis to targetplatform --- ....examplemodels.targetplatform.targetplatform.target | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/releng/org.dataflowanalysis.examplemodels.targetplatform/org.dataflowanalysis.examplemodels.targetplatform.targetplatform.target b/releng/org.dataflowanalysis.examplemodels.targetplatform/org.dataflowanalysis.examplemodels.targetplatform.targetplatform.target index 1f833f6..604c1c9 100644 --- a/releng/org.dataflowanalysis.examplemodels.targetplatform/org.dataflowanalysis.examplemodels.targetplatform.targetplatform.target +++ b/releng/org.dataflowanalysis.examplemodels.targetplatform/org.dataflowanalysis.examplemodels.targetplatform.targetplatform.target @@ -51,8 +51,14 @@ - - + + + + + + + +