Skip to content

Commit

Permalink
#164 Adapt to capella 7
Browse files Browse the repository at this point in the history
regen using egf.1.6.4

Change-Id: Idebd773fd653b00a3c9f7450d9e5c79d0216e889
Signed-off-by: Erwann Traisnel <erwann.traisnel@obeo.fr>
  • Loading branch information
etraisnel2 authored and pdulth committed Jan 4, 2024
1 parent fb2d36c commit c4de106
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 152 deletions.
Expand Up @@ -35,7 +35,7 @@
<methods xmi:id="_Zzcx0AQJEeyLMfB-ji7ZWg" name="setCapellaContext" patternFilePath="templates/pattern._xs0b8ADuEeyfsaGVmvqWSQ/method._Zzcx0AQJEeyLMfB-ji7ZWg.pt"/>
<methods xmi:id="_AftkQAQrEeyLMfB-ji7ZWg" name="createPNG" patternFilePath="templates/pattern._xs0b8ADuEeyfsaGVmvqWSQ/method._AftkQAQrEeyLMfB-ji7ZWg.pt"/>
<methods xmi:id="_J9t-cATpEey237wyeDoSOQ" name="fileNameService" patternFilePath="templates/pattern._xs0b8ADuEeyfsaGVmvqWSQ/method._J9t-cATpEey237wyeDoSOQ.pt"/>
<parameters xmi:id="_iu-lYAPoEeyLMfB-ji7ZWg" name="parameter" type="http://www.polarsys.org/capella/core/core/6.0.0#//CapellaElement"/>
<parameters xmi:id="_iu-lYAPoEeyLMfB-ji7ZWg" name="parameter" type="http://www.polarsys.org/capella/core/core/7.0.0#//CapellaElement"/>
<orchestration xmi:type="pattern:MethodCall" xmi:id="_CyzBMAQrEeyLMfB-ji7ZWg"
called="#_AftkQAQrEeyLMfB-ji7ZWg"/>
<orchestration xmi:type="pattern:SuperCall" xmi:id="_DhQpsAQrEeyLMfB-ji7ZWg"/>
Expand Down
Expand Up @@ -15,7 +15,6 @@ Import-Package: org.polarsys.capella.cybersecurity.model,
org.polarsys.capella.core.data.la,
org.polarsys.capella.core.data.pa,
org.polarsys.capella.core.data.epbs,
org.polarsys.capella.core.data.requirement,
org.polarsys.capella.core.data.capellacommon,
org.polarsys.capella.core.data.information,
org.polarsys.capella.core.data.cs,
Expand Down
Expand Up @@ -9,7 +9,7 @@
codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" featureDelegation="Dynamic"
complianceLevel="8.0" copyrightFields="false" editPluginID="org.polarsys.capella.cybersecurity.model.edit"
editorPluginID="org.polarsys.capella.cybersecurity.model.editor" optimizedHasChildren="true"
runtimeVersion="2.12" language="" usedGenPackages="platform:/plugin/org.polarsys.kitalpha.emde.model.cdo/model/eMDE.genmodel#//emde platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//capellacore platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//oa platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//ctx platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//la platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//pa platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//epbs platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//requirement platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//capellacommon platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//information platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//cs platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//fa platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//interaction platform:/plugin/org.polarsys.capella.common.data.core.gen.cdo/model/ModellingCore.genmodel#//modellingcore platform:/plugin/org.polarsys.capella.common.data.activity.gen.cdo/model/Activity.genmodel#//activity platform:/plugin/org.polarsys.capella.common.data.behavior.gen.cdo/model/Behavior.genmodel#//behavior"
runtimeVersion="2.12" language="" usedGenPackages="platform:/plugin/org.polarsys.kitalpha.emde.model.cdo/model/eMDE.genmodel#//emde platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//capellacore platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//oa platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//ctx platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//la platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//pa platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//epbs platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//capellacommon platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//information platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//cs platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//fa platform:/plugin/org.polarsys.capella.core.data.gen.cdo/model/CapellaModeller.genmodel#//interaction platform:/plugin/org.polarsys.capella.common.data.core.gen.cdo/model/ModellingCore.genmodel#//modellingcore platform:/plugin/org.polarsys.capella.common.data.activity.gen.cdo/model/Activity.genmodel#//activity platform:/plugin/org.polarsys.capella.common.data.behavior.gen.cdo/model/Behavior.genmodel#//behavior"
importOrganizing="true">
<foreignModel>Cybersecurity.ecore</foreignModel>
<modelPluginVariables>org.polarsys.capella.core.data.helpers</modelPluginVariables>
Expand All @@ -18,7 +18,6 @@
<editPluginVariables>org.polarsys.capella.core.menu.dynamic</editPluginVariables>
<editPluginVariables>org.polarsys.capella.core.ui.properties</editPluginVariables>
<editPluginVariables>org.polarsys.capella.core.data.sharedmodel.properties</editPluginVariables>
<editPluginVariables>org.polarsys.capella.core.data.requirement.properties</editPluginVariables>
<editPluginVariables>org.polarsys.capella.core.data.common.properties</editPluginVariables>
<editPluginVariables>org.polarsys.capella.core.data.core.properties</editPluginVariables>
<editPluginVariables>org.polarsys.capella.core.data.cs.properties</editPluginVariables>
Expand Down
Expand Up @@ -26,7 +26,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.polarsys.capella.core.menu.dynamic;visibility:=reexport,
org.polarsys.capella.core.ui.properties;visibility:=reexport,
org.polarsys.capella.core.data.sharedmodel.properties;visibility:=reexport,
org.polarsys.capella.core.data.requirement.properties;visibility:=reexport,
org.polarsys.capella.core.data.common.properties;visibility:=reexport,
org.polarsys.capella.core.data.core.properties;visibility:=reexport,
org.polarsys.capella.core.data.cs.properties;visibility:=reexport,
Expand Down
Expand Up @@ -8,7 +8,7 @@
nonNLSMarkers="true" codeFormatting="true" importerID="org.eclipse.emf.importer.ecore"
complianceLevel="8.0" copyrightFields="false" editPluginID="org.polarsys.capella.cybersecurity.model.edit"
editorPluginID="org.polarsys.capella.cybersecurity.model.editor" optimizedHasChildren="true"
runtimeVersion="2.12" language="" usedGenPackages="platform:/plugin/org.polarsys.kitalpha.emde.model/model/eMDE.genmodel#//emde platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//capellacore platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//oa platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//ctx platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//la platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//pa platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//epbs platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//requirement platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//capellacommon platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//information platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//cs platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//fa platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//interaction platform:/plugin/org.polarsys.capella.common.data.core.gen/model/ModellingCore.genmodel#//modellingcore platform:/plugin/org.polarsys.capella.common.data.activity.gen/model/Activity.genmodel#//activity platform:/plugin/org.polarsys.capella.common.data.behavior.gen/model/Behavior.genmodel#//behavior"
runtimeVersion="2.12" language="" usedGenPackages="platform:/plugin/org.polarsys.kitalpha.emde.model/model/eMDE.genmodel#//emde platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//capellacore platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//oa platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//ctx platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//la platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//pa platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//epbs platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//capellacommon platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//information platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//cs platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//fa platform:/plugin/org.polarsys.capella.core.data.gen/model/CapellaModeller.genmodel#//interaction platform:/plugin/org.polarsys.capella.common.data.core.gen/model/ModellingCore.genmodel#//modellingcore platform:/plugin/org.polarsys.capella.common.data.activity.gen/model/Activity.genmodel#//activity platform:/plugin/org.polarsys.capella.common.data.behavior.gen/model/Behavior.genmodel#//behavior"
importOrganizing="true">
<foreignModel>Cybersecurity.ecore</foreignModel>
<genPackages prefix="Cybersecurity" basePackage="org.polarsys.capella" resource="XMI"
Expand Down
Expand Up @@ -250,15 +250,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int CYBERSECURITY_PKG__FEATURES = CapellacorePackage.NAMED_ELEMENT__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int CYBERSECURITY_PKG__APPLIED_REQUIREMENTS = CapellacorePackage.NAMED_ELEMENT__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Owned Threats</b></em>' containment reference list.
* <!-- begin-user-doc --> <!--
Expand Down Expand Up @@ -481,15 +472,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int THREAT__FEATURES = InteractionPackage.ABSTRACT_CAPABILITY__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int THREAT__APPLIED_REQUIREMENTS = InteractionPackage.ABSTRACT_CAPABILITY__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Owned Traces</b></em>' containment reference list.
* <!-- begin-user-doc --> <!--
Expand All @@ -508,15 +490,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int THREAT__CONTAINED_GENERIC_TRACES = InteractionPackage.ABSTRACT_CAPABILITY__CONTAINED_GENERIC_TRACES;

/**
* The feature id for the '<em><b>Contained Requirements Traces</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int THREAT__CONTAINED_REQUIREMENTS_TRACES = InteractionPackage.ABSTRACT_CAPABILITY__CONTAINED_REQUIREMENTS_TRACES;

/**
* The feature id for the '<em><b>Naming Rules</b></em>' containment reference list.
* <!-- begin-user-doc --> <!--
Expand Down Expand Up @@ -1024,15 +997,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int THREAT_INVOLVEMENT__FEATURES = CapellacorePackage.RELATIONSHIP__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int THREAT_INVOLVEMENT__APPLIED_REQUIREMENTS = CapellacorePackage.RELATIONSHIP__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Threat Obj</b></em>' reference.
* <!-- begin-user-doc -->
Expand Down Expand Up @@ -1246,15 +1210,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int FUNCTION_STORAGE__FEATURES = CapellacorePackage.NAMED_ELEMENT__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int FUNCTION_STORAGE__APPLIED_REQUIREMENTS = CapellacorePackage.NAMED_ELEMENT__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Exchanged Items</b></em>' reference list. <!-- begin-user-doc --> <!-- end-user-doc
* -->
Expand Down Expand Up @@ -1476,15 +1431,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int THREAT_APPLICATION__FEATURES = CapellacorePackage.RELATIONSHIP__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int THREAT_APPLICATION__APPLIED_REQUIREMENTS = CapellacorePackage.RELATIONSHIP__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Asset</b></em>' reference.
* <!-- begin-user-doc --> <!-- end-user-doc -->
Expand Down Expand Up @@ -1698,15 +1644,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int PRIMARY_ASSET_STORAGE__FEATURES = CapellacorePackage.NAMED_ELEMENT__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int PRIMARY_ASSET_STORAGE__APPLIED_REQUIREMENTS = CapellacorePackage.NAMED_ELEMENT__APPLIED_REQUIREMENTS;

/**
* The number of structural features of the '<em>Primary Asset Storage</em>' class.
* <!-- begin-user-doc --> <!--
Expand Down Expand Up @@ -1903,15 +1840,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int SECURITY_NEEDS__FEATURES = CapellacorePackage.NAMED_ELEMENT__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int SECURITY_NEEDS__APPLIED_REQUIREMENTS = CapellacorePackage.NAMED_ELEMENT__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Confidentiality Value</b></em>' reference. <!-- begin-user-doc --> <!-- end-user-doc
* -->
Expand Down Expand Up @@ -2143,15 +2071,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int TRUST_BOUNDARY_STORAGE__FEATURES = CapellacorePackage.NAMED_ELEMENT__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int TRUST_BOUNDARY_STORAGE__APPLIED_REQUIREMENTS = CapellacorePackage.NAMED_ELEMENT__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Threat Source</b></em>' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
Expand Down Expand Up @@ -2381,15 +2300,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int PRIMARY_ASSET__FEATURES = CapellacorePackage.NAMED_ELEMENT__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int PRIMARY_ASSET__APPLIED_REQUIREMENTS = CapellacorePackage.NAMED_ELEMENT__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Owned Members</b></em>' containment reference list.
* <!-- begin-user-doc --> <!--
Expand Down Expand Up @@ -2613,15 +2523,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int FUNCTIONAL_PRIMARY_ASSET__FEATURES = PRIMARY_ASSET__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int FUNCTIONAL_PRIMARY_ASSET__APPLIED_REQUIREMENTS = PRIMARY_ASSET__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Owned Members</b></em>' containment reference list.
* <!-- begin-user-doc --> <!--
Expand Down Expand Up @@ -2862,15 +2763,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int INFORMATION_PRIMARY_ASSET__FEATURES = PRIMARY_ASSET__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int INFORMATION_PRIMARY_ASSET__APPLIED_REQUIREMENTS = PRIMARY_ASSET__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Owned Members</b></em>' containment reference list.
* <!-- begin-user-doc --> <!--
Expand Down Expand Up @@ -3103,15 +2995,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int PRIMARY_ASSET_MEMBER__FEATURES = CapellacorePackage.RELATIONSHIP__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int PRIMARY_ASSET_MEMBER__APPLIED_REQUIREMENTS = CapellacorePackage.RELATIONSHIP__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Asset</b></em>' reference.
* <!-- begin-user-doc --> <!-- end-user-doc -->
Expand Down Expand Up @@ -3324,15 +3207,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int CYBERSECURITY_CONFIGURATION__FEATURES = CapellacorePackage.NAMED_ELEMENT__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int CYBERSECURITY_CONFIGURATION__APPLIED_REQUIREMENTS = CapellacorePackage.NAMED_ELEMENT__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Confidentiality</b></em>' reference.
* <!-- begin-user-doc --> <!-- end-user-doc -->
Expand Down Expand Up @@ -3580,15 +3454,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int ENTERPRISE_PRIMARY_ASSET__FEATURES = PRIMARY_ASSET__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int ENTERPRISE_PRIMARY_ASSET__APPLIED_REQUIREMENTS = PRIMARY_ASSET__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Owned Members</b></em>' containment reference list.
* <!-- begin-user-doc -->
Expand Down Expand Up @@ -3833,15 +3698,6 @@ public interface CybersecurityPackage extends EPackage {
*/
int THREAT_SOURCE_USE__FEATURES = CapellacorePackage.RELATIONSHIP__FEATURES;

/**
* The feature id for the '<em><b>Applied Requirements</b></em>' reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int THREAT_SOURCE_USE__APPLIED_REQUIREMENTS = CapellacorePackage.RELATIONSHIP__APPLIED_REQUIREMENTS;

/**
* The feature id for the '<em><b>Threat Source</b></em>' reference.
* <!-- begin-user-doc -->
Expand Down
Expand Up @@ -32,7 +32,6 @@
import org.polarsys.capella.core.data.la.LaPackage;
import org.polarsys.capella.core.data.oa.OaPackage;
import org.polarsys.capella.core.data.pa.PaPackage;
import org.polarsys.capella.core.data.requirement.RequirementPackage;
import org.polarsys.capella.cybersecurity.model.CybersecurityConfiguration;
import org.polarsys.capella.cybersecurity.model.CybersecurityFactory;
import org.polarsys.capella.cybersecurity.model.CybersecurityPackage;
Expand Down Expand Up @@ -204,7 +203,6 @@ public static CybersecurityPackage init() {
LaPackage.eINSTANCE.eClass();
PaPackage.eINSTANCE.eClass();
EpbsPackage.eINSTANCE.eClass();
RequirementPackage.eINSTANCE.eClass();
CapellacommonPackage.eINSTANCE.eClass();
InformationPackage.eINSTANCE.eClass();
CsPackage.eINSTANCE.eClass();
Expand Down

0 comments on commit c4de106

Please sign in to comment.