diff --git a/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF b/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF index a9dee4a..f007b84 100644 --- a/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF +++ b/bundles/org.dataflowanalysis.examplemodels/META-INF/MANIFEST.MF @@ -4,8 +4,19 @@ 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, + org.dataflowanalysis.dfd.dataflowdiagram 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, + 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/casestudies/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs b/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/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/CoCarNextGen_Base/AudiA6C8_base.allocation b/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.allocation deleted file mode 100644 index a996d2c..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.allocation +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics deleted file mode 100644 index bfc679e..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.nodecharacteristics +++ /dev/null @@ -1,220 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/project.txt b/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/project.txt deleted file mode 100644 index a624e94..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/project.txt +++ /dev/null @@ -1,12 +0,0 @@ - - - DFDTestModels - - - - - - - org.eclipse.sirius.nature.modelingproject - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/representations.aird deleted file mode 100644 index 8b43a36..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/representations.aird +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/.project b/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/.project deleted file mode 100644 index 16cb9f7..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/.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/OnlineShopDFDsimple/.project b/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/.project deleted file mode 100644 index 655ed7e..0000000 --- a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/.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/DFDTestModels/BranchingTest.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/BranchingTest.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/BranchingTest.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/default.dataflowdiagram similarity index 53% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/BranchingTest.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/default.dataflowdiagram index 5944167..9947e1f 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/BranchingTest.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Branching/default.dataflowdiagram @@ -1,47 +1,47 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/complexPseudoCycle.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/complexPseudoCycle.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/complexPseudoCycle.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/default.dataflowdiagram similarity index 51% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/complexPseudoCycle.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/default.dataflowdiagram index c3b326a..a54abbd 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/complexPseudoCycle.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/ComplexPseudoCycle/default.dataflowdiagram @@ -1,42 +1,42 @@ - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/DeadOutPin.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/DeadOutPin.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/DeadOutPin.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/default.dataflowdiagram similarity index 67% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/DeadOutPin.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/default.dataflowdiagram index f0b7058..2e6c5fc 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/DeadOutPin.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/DeadOutPin/default.dataflowdiagram @@ -1,13 +1,13 @@ - - + + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/minimal.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/minimal.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/minimal.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/default.dataflowdiagram similarity index 56% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/minimal.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/default.dataflowdiagram index 8c23282..55b983b 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/DFDTestModels/minimal.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/Minimal/default.dataflowdiagram @@ -1,39 +1,39 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/simpleLoopDFD/loopDFD.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/simpleLoopDFD/loopDFD.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/simpleLoopDFD/loopDFD.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/default.dataflowdiagram similarity index 51% rename from bundles/org.dataflowanalysis.examplemodels/models/simpleLoopDFD/loopDFD.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/default.dataflowdiagram index c9e8a6f..d1cf8bc 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/simpleLoopDFD/loopDFD.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/SimpleLoop/default.dataflowdiagram @@ -1,35 +1,35 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/UnusedInput.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/UnusedInput.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/UnusedInput.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/default.dataflowdiagram similarity index 59% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/UnusedInput.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/default.dataflowdiagram index fa2c476..e547efe 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/UnusedInput.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/UnusedInput/default.dataflowdiagram @@ -1,27 +1,27 @@ - - + + - - + + - - + + - + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/WrongFlowName.datadictionary b/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/WrongFlowName.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/WrongFlowName.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/default.dataflowdiagram similarity index 64% rename from bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/WrongFlowName.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/default.dataflowdiagram index b269f1c..26f0a3b 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/DFDSimpleModels/WrongFlowName.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/models/dfd/WrongFlowName/default.dataflowdiagram @@ -1,20 +1,20 @@ - - + + - - + + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/composite.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/composite.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/composite.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/composite.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/CompositeCharacteristicsTest/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/CompositeCharacteristics/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/.project b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.allocation similarity index 90% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.allocation index 18ec7e9..a393b21 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/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/BranchingOnlineShop/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/IgnoredNodes/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/NodeCharacteristics/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/.project rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.allocation b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.repository b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.repository rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.system b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.system rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/representations.aird b/bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/NodeCharacteristicsTest/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/models/pcm/NodeCharacteristics/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/models/OnlineShopDFD/onlineshop.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/OnlineShop/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/onlineshop.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/OnlineShop/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/onlineshop.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/OnlineShop/default.dataflowdiagram similarity index 54% rename from bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/onlineshop.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/OnlineShop/default.dataflowdiagram index efa483a..d90a2d8 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFD/onlineshop.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/OnlineShop/default.dataflowdiagram @@ -1,58 +1,58 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/onlineshop.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/SimpleOnlineShop/default.datadictionary similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/onlineshop.datadictionary rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/SimpleOnlineShop/default.datadictionary diff --git a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/onlineshop.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/SimpleOnlineShop/default.dataflowdiagram similarity index 52% rename from bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/onlineshop.dataflowdiagram rename to bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/SimpleOnlineShop/default.dataflowdiagram index d25520a..005cd4b 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/OnlineShopDFDsimple/onlineshop.dataflowdiagram +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/dfd/SimpleOnlineShop/default.dataflowdiagram @@ -1,70 +1,70 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + - - + + - + - + - + - - + + - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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..808d8bd --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.nodecharacteristics @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/default.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.repository new file mode 100644 index 0000000..48d0b0f --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.repository @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.resourceenvironment new file mode 100644 index 0000000..9cc6f0f --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.resourceenvironment @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.system new file mode 100644 index 0000000..6ca9426 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/default.system @@ -0,0 +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..59c0df9 --- /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/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/representations.aird new file mode 100644 index 0000000..59c6155 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BankBranches/representations.aird @@ -0,0 +1,5636 @@ + + + + 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.allocation similarity index 72% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.allocation index 989b284..9ee920e 100644 --- a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.allocation +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.allocation @@ -1,16 +1,16 @@ - + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/IgnoredNodeTest/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/BranchingOnlineShop/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/BranchingOnlineShop/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.allocation new file mode 100644 index 0000000..e36ba11 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.allocation @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics new file mode 100644 index 0000000..2d4c2c9 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.nodecharacteristics @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.repository similarity index 95% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.repository index 82b94dd..17cca29 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.repository +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/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/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.resourceenvironment similarity index 99% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.resourceenvironment index fcb53a1..9a761bc 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.resourceenvironment +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.resourceenvironment @@ -1,5 +1,5 @@ - + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.system similarity index 67% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.system index 228e61d..d98d500 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.system +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.system @@ -1,353 +1,353 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.usagemodel similarity index 85% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/AudiA6C8.usagemodel index fe865b4..62342ed 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/AudiA6C8_base.usagemodel +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/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/CoCarNextGen_Base/CoCarNextGen_base.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/CoCarNextGen.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/CoCarNextGen_base.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/CoCarNextGen.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/CoCarNextGen_base.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/CoCarNextGen.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/CoCarNextGen_base.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/CoCarNextGen.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/representations.aird similarity index 93% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoCarNextGen/representations.aird index be1ff37..7efb72a 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoCarNextGen_Base/representations.aird +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/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/CoronaWarnApp/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.datadictionary b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.datadictionary new file mode 100644 index 0000000..2be56bd --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.datadictionary @@ -0,0 +1,8811 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.dataflowdiagram b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.dataflowdiagram new file mode 100644 index 0000000..30c7abb --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.dataflowdiagram @@ -0,0 +1,7922 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.nodecharacteristics similarity index 65% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.nodecharacteristics index e00b1dd..534588c 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.nodecharacteristics +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.nodecharacteristics @@ -2,121 +2,121 @@ - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/cwa.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/cwa.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.repository similarity index 96% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.repository index d2cc19c..671cedc 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.repository +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/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/CoronaWarnApp/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.usagemodel similarity index 92% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/default.usagemodel index 6cef172..abc9d51 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/default.usagemodel +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/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/casestudies/CoronaWarnApp/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/representations.aird similarity index 99% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/CoronaWarnApp/representations.aird index 480355d..aef27f7 100644 --- a/bundles/org.dataflowanalysis.examplemodels/casestudies/CoronaWarnApp/representations.aird +++ b/bundles/org.dataflowanalysis.examplemodels/scenarios/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/models/InternationalOnlineShop/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.system diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/default.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/default.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/dic.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/dic.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/dic.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/dic.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/models/InternationalOnlineShop/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/InternationalOnlineShop/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/MaaS.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/MaaS.usagemodel diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/MaaS_Ticket_System_base/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/MaaSTicketSystem/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/.project b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/.project similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/.project rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/.project diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/representations.aird b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/representations.aird similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/representations.aird rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/representations.aird diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.allocation b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.allocation similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.allocation rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.allocation diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.nodecharacteristics b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.nodecharacteristics similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.nodecharacteristics rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.nodecharacteristics diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.pddc b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.pddc similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.pddc rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.pddc diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.repository b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.repository similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.repository rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.repository diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.resourceenvironment b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.resourceenvironment similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.resourceenvironment rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.resourceenvironment diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.system b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.system similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.system rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.system diff --git a/bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.usagemodel b/bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.usagemodel similarity index 100% rename from bundles/org.dataflowanalysis.examplemodels/casestudies/TravelPlanner/travelPlanner.usagemodel rename to bundles/org.dataflowanalysis.examplemodels/scenarios/pcm/TravelPlanner/travelPlanner.usagemodel 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..20c4c91 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExampleModelResult.java @@ -0,0 +1,30 @@ +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; + +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(); + + List getDSLConstraints(); + + 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..946ddf5 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedCharacteristic.java @@ -0,0 +1,13 @@ +package org.dataflowanalysis.examplemodels.results; + +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 new file mode 100644 index 0000000..cd8b0f2 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/ExpectedViolation.java @@ -0,0 +1,109 @@ +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; + +public class ExpectedViolation { + private final int flowGraphIndex; + private final Identifier identifier; + private final List vertexCharacteristics; + private final Map> dataCharacteristics; + + public ExpectedViolation(int flowGraphIndex, Identifier identifier, List vertexCharacteristics, + Map> dataCharacteristics) { + this.flowGraphIndex = flowGraphIndex; + this.identifier = identifier; + this.vertexCharacteristics = vertexCharacteristics; + this.dataCharacteristics = dataCharacteristics; + } + + public boolean references(AbstractVertex element, int flowGraphIndex) { + return this.identifier.matches(element) && this.flowGraphIndex == 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) { + 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; + } + + public Map> 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/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/DFDExampleModelResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java new file mode 100644 index 0000000..191899f --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDExampleModelResult.java @@ -0,0 +1,16 @@ +package org.dataflowanalysis.examplemodels.results.dfd; + +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(); + } + + default String getDataDictionary() { + 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 new file mode 100644 index 0000000..0d79bfb --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/DFDIdentifier.java @@ -0,0 +1,32 @@ +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/dfd/models/BranchingResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/models/BranchingResult.java new file mode 100644 index 0000000..587cdb0 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/models/BranchingResult.java @@ -0,0 +1,34 @@ +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; + +public class BranchingResult implements DFDExampleModelResult { + @Override + public String getModelName() { + return "Branching"; + } + + @Override + public List getDSLConstraints() { + return List.of(new ConstraintDSL().ofData() + .neverFlows() + .toVertex() + .with((vertex) -> vertex.getAllVertexCharacteristics() + .isEmpty()) + .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/dfd/scenarios/OnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/OnlineShopResult.java new file mode 100644 index 0000000..488d5cf --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/OnlineShopResult.java @@ -0,0 +1,44 @@ +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; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult; +import org.dataflowanalysis.examplemodels.results.dfd.DFDIdentifier; + +public class OnlineShopResult implements DFDExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } + + @Override + public String getModelName() { + return "OnlineShop"; + } + + @Override + public List getDSLConstraints() { + return List.of(new ConstraintDSL().ofData() + .withLabel("Sensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("Location", "nonEU") + .create()); + } + + @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"))))); + } + + @Override + public String toString() { + return this.getModelName(); + } +} 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 new file mode 100644 index 0000000..774069e --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/dfd/scenarios/SimpleOnlineShopResult.java @@ -0,0 +1,45 @@ +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; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.dfd.DFDExampleModelResult; +import org.dataflowanalysis.examplemodels.results.dfd.DFDIdentifier; + +public class SimpleOnlineShopResult implements DFDExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } + + @Override + public String getModelName() { + return "SimpleOnlineShop"; + } + + @Override + public List getDSLConstraints() { + + return List.of(new ConstraintDSL().ofData() + .withLabel("Sensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("Location", "nonEU") + .create()); + } + + @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"))))); + } + + @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..df287a8 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMExampleModelResult.java @@ -0,0 +1,21 @@ +package org.dataflowanalysis.examplemodels.results.pcm; + +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(); + } + + 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/PCMIdentifier.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMIdentifier.java new file mode 100644 index 0000000..3a918e9 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/PCMIdentifier.java @@ -0,0 +1,55 @@ +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; + +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/models/CompositeResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/CompositeResult.java new file mode 100644 index 0000000..7dfbcee --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/CompositeResult.java @@ -0,0 +1,41 @@ +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; +import org.dataflowanalysis.analysis.pcm.core.user.UserPCMVertex; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; + +public class CompositeResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "CompositeCharacteristics"; + } + + @Override + public List getDSLConstraints() { + List constraints = new ArrayList<>(); + 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) + .create()); + return constraints; + } + + @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/models/IgnoredNodesResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/IgnoredNodesResult.java new file mode 100644 index 0000000..bc02c96 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/IgnoredNodesResult.java @@ -0,0 +1,41 @@ +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; +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 IgnoredNodesResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "IgnoredNodes"; + } + + @Override + public List getDSLConstraints() { + return List.of(new ConstraintDSL().fromNode() + .withType(PCMVertexType.CALLING) + .withType(PCMVertexType.USER) + .neverFlows() + .toVertex() + .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"))))); + } + + @Override + public String toString() { + return this.getModelName(); + } +} 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 new file mode 100644 index 0000000..5fba884 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/MultipleDeploymentsResult.java @@ -0,0 +1,43 @@ +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; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; +import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; + +public class MultipleDeploymentsResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "MultipleDeployments"; + } + + @Override + public List getDSLConstraints() { + return List.of(new ConstraintDSL().ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create()); + } + + @Override + public List getExpectedViolations() { + return List.of( + 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(0, PCMIdentifier.of("_dQ568XQSEe2fd909RlIZZw", false), + 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/models/NodeCharacteristicsResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/NodeCharacteristicsResult.java new file mode 100644 index 0000000..7f430fc --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/NodeCharacteristicsResult.java @@ -0,0 +1,41 @@ +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; +import org.dataflowanalysis.analysis.pcm.core.user.UserPCMVertex; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; + +public class NodeCharacteristicsResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "NodeCharacteristics"; + } + + @Override + public List getDSLConstraints() { + List constraints = new ArrayList<>(); + 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) + .create()); + return constraints; + } + + @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/models/VariableReturnResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/VariableReturnResult.java new file mode 100644 index 0000000..37669a3 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/models/VariableReturnResult.java @@ -0,0 +1,49 @@ +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; +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; + +public class VariableReturnResult implements PCMExampleModelResult { + @Override + public String getModelName() { + return "VariableReturn"; + } + + @Override + public List getDSLConstraints() { + return List.of(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(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")), + Map.of("data", List.of(new ExpectedCharacteristic("AssignedRole", "Admin"))))); + } + + @Override + public String toString() { + return this.getModelName(); + } +} 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..613cce2 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BankBranchesResult.java @@ -0,0 +1,93 @@ +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; +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; + +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(), + new ConstraintDSL().ofData() + .withLabel("Origin", ConstraintVariable.of("OriginLocation")) + .fromNode() + .neverFlows() + .toVertex() + .withCharacteristic("Role", "Clerk") + .withCharacteristic("Location", ConstraintVariable.of("DestinationLocation")) + .where() + .isEmpty(Intersection.of(ConstraintVariable.of("OriginLocation"), ConstraintVariable.of("DestinationLocation"))) + .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 new file mode 100644 index 0000000..2714ebe --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/BranchingOnlineShopResult.java @@ -0,0 +1,39 @@ +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; + +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() + .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/scenarios/CoCarResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java new file mode 100644 index 0000000..eece885 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoCarResult.java @@ -0,0 +1,41 @@ +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; + +/** + * 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() { + return "scenarios"; + } + + @Override + public String getModelName() { + return "CoCarNextGen"; + } + + @Override + public String getFileName() { + return "AudiA6C8"; + } + + @Override + public List getDSLConstraints() { + return List.of(); + } + + @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/scenarios/CoronaWarnAppResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoronaWarnAppResult.java new file mode 100644 index 0000000..7a1add4 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/CoronaWarnAppResult.java @@ -0,0 +1,46 @@ +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; + +public class CoronaWarnAppResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } + + @Override + public String getModelName() { + return "CoronaWarnApp"; + } + + @Override + public List getDSLConstraints() { + List constraints = new ArrayList<>(); + constraints.add(new ConstraintDSL().ofData() + .neverFlows() + .toVertex() + .withCharacteristic("Location", "IllegalLocation") + .create()); + constraints.add(new ConstraintDSL().ofData() + .withLabel("Status", "Leaked") + .neverFlows() + .toVertex() + .create()); + return constraints; + } + + @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/scenarios/InternationalOnlineShopResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/InternationalOnlineShopResult.java new file mode 100644 index 0000000..fb4d220 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/InternationalOnlineShopResult.java @@ -0,0 +1,48 @@ +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; +import org.dataflowanalysis.examplemodels.results.ExpectedViolation; +import org.dataflowanalysis.examplemodels.results.pcm.PCMExampleModelResult; +import org.dataflowanalysis.examplemodels.results.pcm.PCMIdentifier; + +public class InternationalOnlineShopResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } + + @Override + public String getModelName() { + return "InternationalOnlineShop"; + } + + @Override + public List getDSLConstraints() { + return List.of(new ConstraintDSL().ofData() + .withLabel("DataSensitivity", "Personal") + .neverFlows() + .toVertex() + .withCharacteristic("ServerLocation", "nonEU") + .create()); + } + + @Override + public List getExpectedViolations() { + return List.of( + 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")), + 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/scenarios/MaaSTicketSystemResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java new file mode 100644 index 0000000..7d48d58 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/MaaSTicketSystemResult.java @@ -0,0 +1,57 @@ +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; + +public class MaaSTicketSystemResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } + + @Override + public String getModelName() { + return "MaaSTicketSystem"; + } + + @Override + public String getFileName() { + return "MaaS"; + } + + @Override + 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("Origin", "Leaked") + .neverFlows() + .toVertex() + .create()); + return constraints; + } + + @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/scenarios/TravelPlannerResult.java b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/TravelPlannerResult.java new file mode 100644 index 0000000..f0caec1 --- /dev/null +++ b/bundles/org.dataflowanalysis.examplemodels/src/org/dataflowanalysis/examplemodels/results/pcm/scenarios/TravelPlannerResult.java @@ -0,0 +1,67 @@ +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; +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; + +public class TravelPlannerResult implements PCMExampleModelResult { + @Override + public String getBaseFolderName() { + return "scenarios"; + } + + @Override + public String getModelName() { + return "TravelPlanner"; + } + + @Override + public String getFileName() { + return "travelPlanner"; + } + + @Override + public List getDSLConstraints() { + return List.of(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(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")), + 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/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 @@ - - + + + + + + + +