Skip to content

Commit 304e66c

Browse files
EntenwilliEntenwilli
authored
Merge pull request #22 from DataFlowAnalysis/remove_indirections2.0
Remove still existing reference to indirections
2 parents e3a398a + 48b3ce9 commit 304e66c

10 files changed

Lines changed: 6 additions & 62 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class DDDslFormatter extends CharacterizedDataDictionaryFormatter {
2929
dd.characteristicTypes.forEach[format]
3030
dd.characteristics.forEach[format]
3131
dd.reusableBehaviours.forEach[format]
32-
dd.dataChannelBehaviour.forEach[format]
3332
}
3433

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Bundle-ClassPath: .
88
Bundle-Activator: org.dataflowanalysis.pcm.extension.dictionary.characterized.DataDictionaryCharacterized.presentation.DataDictionaryCharacterizedEditorPlugin$Implementation
99
Bundle-Vendor: %providerName
1010
Bundle-Localization: plugin
11-
Bundle-RequiredExecutionEnvironment: JavaSE-17
11+
Bundle-RequiredExecutionEnvironment: J2SE-1.5
1212
Export-Package: org.dataflowanalysis.pcm.extension.dictionary.characterized.DataDictionaryCharacterized.expressions.presentation,
1313
org.dataflowanalysis.pcm.extension.dictionary.characterized.DataDictionaryCharacterized.presentation
1414
Require-Bundle: org.eclipse.core.runtime,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Export-Package: org.dataflowanalysis.pcm.extension.dictionary.DataDictionary,
1313
org.dataflowanalysis.pcm.extension.dictionary.DataDictionary.util
1414
Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport,
1515
org.eclipse.emf.cdo;visibility:=reexport,
16+
org.eclipse.ocl.pivot;visibility:=reexport,
1617
org.eclipse.core.runtime,
1718
de.uka.ipd.sdq.identifier;visibility:=reexport
1819
Bundle-ActivationPolicy: lazy

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Require-Bundle: org.eclipse.core.runtime,
3030
de.uka.ipd.sdq.units.edit;visibility:=reexport,
3131
tools.mdsd.library.emfeditutils
3232
Bundle-ActivationPolicy: lazy
33-
Bundle-RequiredExecutionEnvironment: JavaSE-17
33+
Bundle-RequiredExecutionEnvironment: J2SE-1.5
3434
Export-Package: org.dataflowanalysis.pcm.extension.model.confidentiality.behaviour.provider,
3535
org.dataflowanalysis.pcm.extension.model.confidentiality.characteristics.provider,
3636
org.dataflowanalysis.pcm.extension.model.confidentiality.dictionary.provider,

‎bundles/org.dataflowanalysis.pcm.extension.model.edit/src/org/dataflowanalysis/pcm/extension/model/confidentiality/behaviour/provider/DataChannelBehaviourItemProvider.java‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.core.runtime,
2424
de.uka.ipd.sdq.units.edit;visibility:=reexport,
2525
org.apache.commons.io;bundle-version="2.6.0"
2626
Bundle-ActivationPolicy: lazy
27-
Bundle-RequiredExecutionEnvironment: JavaSE-17
27+
Bundle-RequiredExecutionEnvironment: J2SE-1.5
2828
Export-Package: org.dataflowanalysis.pcm.extension.model.confidentiality.behaviour.presentation,
2929
org.dataflowanalysis.pcm.extension.model.confidentiality.characteristics.presentation,
3030
org.dataflowanalysis.pcm.extension.model.confidentiality.dictionary.presentation,

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,24 +92,7 @@
9292
<details key="settingDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG"/>
9393
<details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG"/>
9494
</eAnnotations>
95-
<eClassifiers xsi:type="ecore:EClass" name="DataChannelBehaviour" eSuperTypes="../../org.palladiosimulator.pcm/model/pcm.ecore#//core/entity/Entity">
96-
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
97-
<details key="constraints" value="variableUsagesReferToValidSourceRoleParameter variableReferencesReferToValidSinkRoleParameter reusedBehavioursOnlyBindValidVariables"/>
98-
</eAnnotations>
99-
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/LPG">
100-
<details key="variableUsagesReferToValidSourceRoleParameter" value="self.variableUsages->forAll(usage |&#xA;&#x9;self.dataSources->collect(&#xA;&#x9;&#x9;role | role.entityName.concat('.').concat(role.dataInterface.dataSignature.parameter.parameterName)&#x9;&#x9;&#xA;&#x9;)->includes(usage.namedReference__VariableUsage.referenceName)&#xA;)"/>
101-
<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;)"/>
102-
<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)"/>
103-
</eAnnotations>
104-
<eStructuralFeatures xsi:type="ecore:EReference" name="variableUsages" upperBound="-1"
105-
eType="ecore:EClass ../../org.palladiosimulator.pcm/model/pcm.ecore#//parameter/VariableUsage"
106-
containment="true"/>
107-
<eStructuralFeatures xsi:type="ecore:EReference" name="reusedBehaviours" upperBound="-1"
108-
eType="#//behaviour/BehaviourReuse" containment="true"/>
109-
</eClassifiers>
11095
<eClassifiers xsi:type="ecore:EClass" name="Behaviours" eSuperTypes="../../de.uka.ipd.sdq.identifier/model/identifier.ecore#//Identifier">
111-
<eStructuralFeatures xsi:type="ecore:EReference" name="dataChannelBehaviour"
112-
upperBound="-1" eType="#//behaviour/DataChannelBehaviour" containment="true"/>
11396
<eStructuralFeatures xsi:type="ecore:EReference" name="reusableBehaviours" upperBound="-1"
11497
eType="#//behaviour/ReusableBehaviour" containment="true"/>
11598
</eClassifiers>

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,7 @@
6464
</nestedGenPackages>
6565
<nestedGenPackages prefix="Behaviour" basePackage="org.dataflowanalysis.pcm.extension.model.confidentiality"
6666
disposableProviderFactory="true" ecorePackage="dataFlowConfidentiality.ecore#//behaviour">
67-
<genClasses ecoreClass="dataFlowConfidentiality.ecore#//behaviour/DataChannelBehaviour">
68-
<genFeatures property="Readonly" notify="false" createChild="false" propertySortChoices="true"
69-
ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/DataChannelBehaviour/dataSources"/>
70-
<genFeatures property="Readonly" notify="false" createChild="false" propertySortChoices="true"
71-
ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/DataChannelBehaviour/dataSinks"/>
72-
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/DataChannelBehaviour/variableUsages"/>
73-
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/DataChannelBehaviour/reusedBehaviours"/>
74-
</genClasses>
7567
<genClasses ecoreClass="dataFlowConfidentiality.ecore#//behaviour/Behaviours">
76-
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/Behaviours/dataChannelBehaviour"/>
7768
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference dataFlowConfidentiality.ecore#//behaviour/Behaviours/reusableBehaviours"/>
7869
</genClasses>
7970
<genClasses ecoreClass="dataFlowConfidentiality.ecore#//behaviour/ReusableBehaviour">

‎bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics.edit/icons/full/ctool16/CreateAssignments_assignee_ResourceAssignee.gif‎

223 Bytes
Loading

‎bundles/org.dataflowanalysis.pcm.extension.nodecharacteristics.edit/plugin.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,5 @@ _UI_Unknown_feature = Unspecified
3030

3131
_UI_UsageAssignee_type = Usage Assignee
3232
_UI_UsageAssignee_usagescenario_feature = Usagescenario
33+
_UI_ResourceAssignee_type = Resource Assignee
34+
_UI_ResourceAssignee_resourcecontainer_feature = Resourcecontainer

0 commit comments

Comments
 (0)