Skip to content

Commit 983531a

Browse files
EntenwilliNicolas-Boltz
Entenwilli
authored and
Nicolas-Boltz
committed
Fix indirection removal from metamodels
1 parent c2054b7 commit 983531a

9 files changed

Lines changed: 12 additions & 40 deletions

File tree

‎bundles/org.dataflowanalysis.pcm.extension.dddsl/src/org/dataflowanalysis/pcm/extension/dddsl/DDDsl.xtext‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,16 @@ PCMDataDictionary returns pddc::PCMDataDictionary:
2121
characteristicTypes+=CharacteristicType |
2222
characteristics+=PCMCharacteristic |
2323
reusableBehaviours+=ReusableBehaviour
24-
// add DataChannelBehaviours
2524
)*;
2625

2726
@Override
2827
CharacteristicType returns ddc::CharacteristicType:
29-
EnumCharacteristicType // add DataTypeCharacteristicType
28+
EnumCharacteristicType
3029
;
3130

3231

3332
PCMCharacteristic returns pchar::Characteristic:
34-
PCMEnumCharacteristic // add DataTypeCharacteristic
33+
PCMEnumCharacteristic
3534
;
3635

3736
PCMEnumCharacteristic returns pchar::EnumCharacteristic:
@@ -72,7 +71,7 @@ ConfidentialityVariableCharacterisation:
7271
;
7372

7473
VariableCharacterizationLhs returns pex::VariableCharacterizationLhs:
75-
LhsEnumCharacteristicReference // add LhsDataTypeCharacteristicReference
74+
LhsEnumCharacteristicReference
7675
;
7776

7877
LhsEnumCharacteristicReference returns pex::LhsEnumCharacteristicReference:

‎bundles/org.dataflowanalysis.pcm.extension.dddsl/src/org/dataflowanalysis/pcm/extension/dddsl/formatting2/DDDslFormatter.xtend‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class DDDslFormatter extends CharacterizedDataDictionaryFormatter {
2828
dd.characteristicEnumerations.forEach[format]
2929
dd.characteristicTypes.forEach[format]
3030
dd.characteristics.forEach[format]
31-
dd.reusableBehaviours.forEach[format]
32-
dd.dataChannelBehaviour.forEach[format]
31+
// dd.reusableBehaviours.forEach[format]
32+
// dd.dataChannelBehaviour.forEach[format]
3333
}
3434

3535
def dispatch void format(EnumCharacteristic characteristic, extension IFormattableDocument document) {

‎bundles/org.dataflowanalysis.pcm.extension.dictionary.characterized/model/DataDictionaryCharacterized.ecore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG"/>
77
<details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG"/>
88
</eAnnotations>
9-
<eClassifiers xsi:type="ecore:EClass" name="Entity" abstract="true" eSuperTypes="platform:/plugin/de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
9+
<eClassifiers xsi:type="ecore:EClass" name="Entity" abstract="true" eSuperTypes="../../de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
1010
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
1111
</eClassifiers>
1212
<eClassifiers xsi:type="ecore:EClass" name="DataDictionaryCharacterized" eSuperTypes="../../org.dataflowanalysis.pcm.extension.dictionary/model/DataDictionary.ecore#//DataDictionary">
@@ -48,7 +48,7 @@
4848
</eAnnotations>
4949
</eStructuralFeatures>
5050
</eClassifiers>
51-
<eClassifiers xsi:type="ecore:EClass" name="Assignment" eSuperTypes="platform:/plugin/de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
51+
<eClassifiers xsi:type="ecore:EClass" name="Assignment" eSuperTypes="../../de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
5252
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
5353
<details key="constraints" value="leftHandSideRefersOutputPin characteristicWildcardHasToBeOnLhsAndRhs literalWildcardHasToBeOnLhsAndRhs"/>
5454
</eAnnotations>
@@ -82,7 +82,7 @@
8282
<details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG"/>
8383
<details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG"/>
8484
</eAnnotations>
85-
<eClassifiers xsi:type="ecore:EClass" name="Term" abstract="true" eSuperTypes="platform:/plugin/de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
85+
<eClassifiers xsi:type="ecore:EClass" name="Term" abstract="true" eSuperTypes="../../de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
8686
<eClassifiers xsi:type="ecore:EClass" name="Constant" abstract="true" eSuperTypes="#//expressions/Term"/>
8787
<eClassifiers xsi:type="ecore:EClass" name="True" eSuperTypes="#//expressions/Constant"/>
8888
<eClassifiers xsi:type="ecore:EClass" name="False" eSuperTypes="#//expressions/Constant"/>

‎bundles/org.dataflowanalysis.pcm.extension.dictionary/model/DataDictionary.ecore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
66
<details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
77
</eAnnotations>
8-
<eClassifiers xsi:type="ecore:EClass" name="DataDictionary" eSuperTypes="platform:/plugin/de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
8+
<eClassifiers xsi:type="ecore:EClass" name="DataDictionary" eSuperTypes="../../de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
99
<eStructuralFeatures xsi:type="ecore:EReference" name="entries" upperBound="-1"
1010
eType="#//DataType" containment="true"/>
1111
</eClassifiers>
@@ -23,11 +23,11 @@
2323
upperBound="-1" eType="#//Entry" containment="true"/>
2424
</eClassifiers>
2525
<eClassifiers xsi:type="ecore:EClass" name="PrimitiveDataType" eSuperTypes="#//DataType"/>
26-
<eClassifiers xsi:type="ecore:EClass" name="Entry" eSuperTypes="platform:/plugin/de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
26+
<eClassifiers xsi:type="ecore:EClass" name="Entry" eSuperTypes="../../de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
2727
<eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//DataType"/>
2828
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
2929
</eClassifiers>
30-
<eClassifiers xsi:type="ecore:EClass" name="DataType" abstract="true" eSuperTypes="platform:/plugin/de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
30+
<eClassifiers xsi:type="ecore:EClass" name="DataType" abstract="true" eSuperTypes="../../de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
3131
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
3232
</eClassifiers>
3333
</ecore:EPackage>

‎bundles/org.dataflowanalysis.pcm.extension.model.edit/META-INF/MANIFEST.MF‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Require-Bundle: org.eclipse.core.runtime,
2020
org.dataflowanalysis.pcm.extension.dictionary.characterized.edit;visibility:=reexport,
2121
de.uka.ipd.sdq.identifier;visibility:=reexport,
2222
de.uka.ipd.sdq.identifier.edit;visibility:=reexport,
23-
org.palladiosimulator.indirections;visibility:=reexport,
2423
org.palladiosimulator.pcm;visibility:=reexport,
2524
org.palladiosimulator.pcm.edit;visibility:=reexport,
2625
de.uka.ipd.sdq.probfunction;visibility:=reexport,
@@ -29,7 +28,6 @@ Require-Bundle: org.eclipse.core.runtime,
2928
de.uka.ipd.sdq.stoex.edit;visibility:=reexport,
3029
de.uka.ipd.sdq.units;visibility:=reexport,
3130
de.uka.ipd.sdq.units.edit;visibility:=reexport,
32-
org.palladiosimulator.indirections.edit;bundle-version="1.0.0";visibility:=reexport,
3331
tools.mdsd.library.emfeditutils;bundle-version="0.1.0"
3432
Bundle-ActivationPolicy: lazy
3533
Bundle-RequiredExecutionEnvironment: JavaSE-17

‎bundles/org.dataflowanalysis.pcm.extension.model.editor/META-INF/MANIFEST.MF‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.core.runtime,
1818
org.dataflowanalysis.pcm.extension.dictionary.edit;visibility:=reexport,
1919
org.dataflowanalysis.pcm.extension.dictionary.characterized.edit;visibility:=reexport,
2020
de.uka.ipd.sdq.identifier.edit;visibility:=reexport,
21-
org.palladiosimulator.indirections.edit;visibility:=reexport,
2221
org.palladiosimulator.pcm.edit;visibility:=reexport,
2322
de.uka.ipd.sdq.probfunction.edit;visibility:=reexport,
2423
de.uka.ipd.sdq.stoex.edit;visibility:=reexport,

‎bundles/org.dataflowanalysis.pcm.extension.model/model/dataFlowConfidentiality.ecore‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -101,20 +101,6 @@
101101
<details key="variableReferencesReferToValidSinkRoleParameter" value="self.variableUsages.variableCharacterisation_VariableUsage->selectByKind(confidentiality::ConfidentialityVariableCharacterisation)->forAll(characterisation |&#xA;&#x9;characterisation.rhs.oclAsType(ecore::EObject)->closure(eContents()->selectByKind(ecore::EObject))->selectByKind(stoex::VariableReference)->forAll(reference |&#xA;&#x9;&#x9;self.dataSinks->collect(&#xA;&#x9;&#x9;&#x9;role | role.entityName.concat('.').concat(role.dataInterface.dataSignature.parameter.parameterName)&#xA;&#x9;&#x9;)->includes(reference.referenceName)&#xA;&#x9;)&#xA;)"/>
102102
<details key="reusedBehavioursOnlyBindValidVariables" value="let validSourceNames : Set(String) = self.dataSources->collect(&#xA;&#x9;role | role.entityName.concat('.').concat(role.dataInterface.dataSignature.parameter.parameterName)&#xA;)->asSet() in&#xA;&#xA; let validSinkNames : Set(String) = self.dataSinks->collect(&#xA; role | role.entityName.concat('.').concat(role.dataInterface.dataSignature.parameter.parameterName)&#xA; )->asSet() in&#xA;&#xA; let validReferenceNames : Set(String) = validSourceNames->union(validSinkNames) in&#xA;&#xA; let usedReferenceNames : Set(String) = self.reusedBehaviours->collect(variableBindings)->flatten()->collect(boundValue.referenceName)->asSet() in&#xA;&#xA; validReferenceNames->includesAll(usedReferenceNames)"/>
103103
</eAnnotations>
104-
<eStructuralFeatures xsi:type="ecore:EReference" name="dataSources" upperBound="-1"
105-
eType="ecore:EClass ../../org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataSourceRole"
106-
changeable="false" volatile="true" transient="true" derived="true">
107-
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG">
108-
<details key="derivation" value="self.dataChannel.dataSourceRoles"/>
109-
</eAnnotations>
110-
</eStructuralFeatures>
111-
<eStructuralFeatures xsi:type="ecore:EReference" name="dataSinks" upperBound="-1"
112-
eType="ecore:EClass ../../org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataSinkRole"
113-
changeable="false" volatile="true" transient="true" derived="true">
114-
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG">
115-
<details key="derivation" value="self.dataChannel.dataSinkRoles"/>
116-
</eAnnotations>
117-
</eStructuralFeatures>
118104
<eStructuralFeatures xsi:type="ecore:EReference" name="variableUsages" upperBound="-1"
119105
eType="ecore:EClass ../../org.palladiosimulator.pcm/model/pcm.ecore#//parameter/VariableUsage"
120106
containment="true"/>

‎bundles/org.dataflowanalysis.pcm.extension.model/model/dataFlowConfidentiality.genmodel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
reflectiveDelegation="true" importerID="org.eclipse.emf.importer.cdo" featureDelegation="Reflective"
1010
complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="org.eclipse.emf.cdo.edit.CDOItemProviderAdapter"
1111
editPluginID="org.dataflowanalysis.pcm.extension.model.edit" editorPluginID="org.dataflowanalysis.pcm.extension.model.editor"
12-
usedGenPackages="../../org.dataflowanalysis.pcm.extension.dictionary/model/DataDictionary.genmodel#//DataDictionary ../../org.dataflowanalysis.pcm.extension.dictionary.characterized/model/DataDictionaryCharacterized.genmodel#//DataDictionaryCharacterized ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../de.uka.ipd.sdq.identifier/model/identifier.genmodel#//identifier ../../org.palladiosimulator.indirections/model/indirections.genmodel#//indirections ../../org.palladiosimulator.pcm/model/pcm.genmodel#//pcm ../../de.uka.ipd.sdq.probfunction/model/ProbabilityFunction.genmodel#//probfunction ../../de.uka.ipd.sdq.stoex/model/stoex.genmodel#//stoex ../../de.uka.ipd.sdq.units/model/Units.genmodel#//units"
12+
usedGenPackages="../../org.dataflowanalysis.pcm.extension.dictionary/model/DataDictionary.genmodel#//DataDictionary ../../org.dataflowanalysis.pcm.extension.dictionary.characterized/model/DataDictionaryCharacterized.genmodel#//DataDictionaryCharacterized ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../de.uka.ipd.sdq.identifier/model/identifier.genmodel#//identifier ../../org.palladiosimulator.pcm/model/pcm.genmodel#//pcm ../../de.uka.ipd.sdq.probfunction/model/ProbabilityFunction.genmodel#//probfunction ../../de.uka.ipd.sdq.stoex/model/stoex.genmodel#//stoex ../../de.uka.ipd.sdq.units/model/Units.genmodel#//units"
1313
importOrganizing="true">
1414
<foreignModel>dataFlowConfidentiality.ecore</foreignModel>
1515
<modelPluginVariables>CDO=org.eclipse.emf.cdo</modelPluginVariables>

‎bundles/org.dataflowanalysis.pcm.extension.model/representations.aird‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,11 @@
1010
<semanticResources>platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore</semanticResources>
1111
<semanticResources>platform:/resource/org.palladiosimulator.dataflow.dictionary.characterized/model/DataDictionaryCharacterized.ecore</semanticResources>
1212
<semanticResources>platform:/resource/org.palladiosimulator.dataflow.dictionary/model/DataDictionary.ecore</semanticResources>
13-
<semanticResources>platform:/resource/org.palladiosimulator.indirections/model/indirections.ecore</semanticResources>
1413
<semanticResources>model/dataFlowConfidentiality.genmodel</semanticResources>
1514
<semanticResources>platform:/resource/org.palladiosimulator.dataflow.dictionary/model/DataDictionary.genmodel</semanticResources>
1615
<semanticResources>platform:/resource/de.uka.ipd.sdq.identifier/model/identifier.genmodel</semanticResources>
1716
<semanticResources>platform:/resource/org.palladiosimulator.dataflow.dictionary.characterized/model/DataDictionaryCharacterized.genmodel</semanticResources>
1817
<semanticResources>platform:/resource/org.eclipse.emf.ecore/model/Ecore.genmodel</semanticResources>
19-
<semanticResources>platform:/resource/org.palladiosimulator.indirections/model/indirections.genmodel</semanticResources>
2018
<semanticResources>platform:/resource/org.palladiosimulator.pcm/model/pcm.genmodel</semanticResources>
2119
<semanticResources>platform:/resource/de.uka.ipd.sdq.probfunction/model/ProbabilityFunction.genmodel</semanticResources>
2220
<semanticResources>platform:/resource/de.uka.ipd.sdq.units/model/Units.genmodel</semanticResources>
@@ -1102,8 +1100,6 @@
11021100
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>
11031101
</ownedDiagramElements>
11041102
<ownedDiagramElements xmi:type="diagram:DNodeList" uid="_N05p8EIeEeuffZtvOppQjQ" name="DataChannel" tooltipText="" outgoingEdges="_55QwBkIfEeuffZtvOppQjQ" incomingEdges="_N1KvsEIeEeuffZtvOppQjQ" width="12" height="10">
1105-
<target xmi:type="ecore:EClass" href="platform:/resource/org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataChannel"/>
1106-
<semanticElements xmi:type="ecore:EClass" href="platform:/resource/org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataChannel"/>
11071103
<decorations xmi:type="viewpoint:Decoration" uid="_N06RAUIeEeuffZtvOppQjQ">
11081104
<description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
11091105
</decorations>
@@ -1145,14 +1141,10 @@
11451141
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
11461142
</ownedElements>
11471143
<ownedElements xmi:type="diagram:DNodeListElement" uid="_N1Da8kIeEeuffZtvOppQjQ" name=" /dataSinkRoles : DataSinkRole" tooltipText="">
1148-
<target xmi:type="ecore:EReference" href="platform:/resource/org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataChannel/dataSinkRoles"/>
1149-
<semanticElements xmi:type="ecore:EReference" href="platform:/resource/org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataChannel/dataSinkRoles"/>
11501144
<ownedStyle xmi:type="diagram:BundledImage" uid="_N1Da80IeEeuffZtvOppQjQ" labelColor="39,76,114" labelAlignment="LEFT" description="_KlQeIUIeEeuffZtvOppQjQ" color="114,159,207"/>
11511145
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
11521146
</ownedElements>
11531147
<ownedElements xmi:type="diagram:DNodeListElement" uid="_N1Da9EIeEeuffZtvOppQjQ" name=" /dataSourceRoles : DataSourceRole" tooltipText="">
1154-
<target xmi:type="ecore:EReference" href="platform:/resource/org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataChannel/dataSourceRoles"/>
1155-
<semanticElements xmi:type="ecore:EReference" href="platform:/resource/org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataChannel/dataSourceRoles"/>
11561148
<ownedStyle xmi:type="diagram:BundledImage" uid="_N1ECAEIeEeuffZtvOppQjQ" labelColor="39,76,114" labelAlignment="LEFT" description="_KlQeIUIeEeuffZtvOppQjQ" color="114,159,207"/>
11571149
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EReferenceNode']"/>
11581150
</ownedElements>
@@ -1521,8 +1513,6 @@
15211513
</ownedElements>
15221514
</ownedDiagramElements>
15231515
<ownedDiagramElements xmi:type="diagram:DEdge" uid="_55QwBkIfEeuffZtvOppQjQ" sourceNode="_N05p8EIeEeuffZtvOppQjQ" targetNode="_548m8EIfEeuffZtvOppQjQ">
1524-
<target xmi:type="ecore:EClass" href="platform:/resource/org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataChannel"/>
1525-
<semanticElements xmi:type="ecore:EClass" href="platform:/resource/org.palladiosimulator.indirections/model/indirections.ecore#//repository/DataChannel"/>
15261516
<decorations xmi:type="viewpoint:Decoration" uid="_55QwDUIfEeuffZtvOppQjQ">
15271517
<description xmi:type="description:SemanticBasedDecoration" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@decorationDescriptionsSet/@decorationDescriptions[name='External']"/>
15281518
</decorations>

0 commit comments

Comments
 (0)