Seq num added to the title of the PlaybookProcess.

CardiffUniCOMSC · Aug 21, 2024 · 6142030 · 6142030
1 parent 2498c86
commit 6142030
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 19 deletions.
diff --git a/.project b/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>SecMoF</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/FRIPP/FRIPP.design/description/FRIPP.odesign b/FRIPP/FRIPP.design/description/FRIPP.odesign
@@ -185,39 +185,39 @@
             </borderedNodeMappings>
             <subContainerMappings name="ProcessHierarchy_PD" preconditionExpression="aql: self->notEmpty()=true and self.oclIsKindOf(PROVE::Process)" deletionDescription="//@ownedViewpoints[name='FRIPPviewpoint']/@ownedRepresentations[name='FRIPP%20Representation']/@defaultLayer/@toolSections.0/@ownedTools[name='DeleteActivity']" labelDirectEdit="//@ownedViewpoints[name='FRIPPviewpoint']/@ownedRepresentations[name='FRIPP%20Representation']/@defaultLayer/@toolSections.0/@ownedTools[name='ChangeName']" semanticCandidatesExpression="aql: self.process" doubleClickDescription="//@ownedViewpoints[name='FRIPPviewpoint']/@ownedRepresentations[name='FRIPP%20Representation']/@defaultLayer/@toolSections.0/@ownedTools[name='dblclkActivityProcess']" domainClass="PROVE::Process" reusedBorderedNodeMappings="//@ownedViewpoints[name='FRIPPviewpoint']/@ownedRepresentations[name='FRIPP%20Representation']/@defaultLayer/@containerMappings[name='ProcessTopHierarchy_PD']/@subContainerMappings[name='ProcessContainer_PD']/@borderedNodeMappings[name='ArtifactDestinationPort'] //@ownedViewpoints[name='FRIPPviewpoint']/@ownedRepresentations[name='FRIPP%20Representation']/@defaultLayer/@containerMappings[name='ProcessTopHierarchy_PD']/@subContainerMappings[name='ProcessContainer_PD']/@borderedNodeMappings[name='ArtifactSourcePort']" dropDescriptions="//@ownedViewpoints[name='FRIPPviewpoint']/@ownedRepresentations[name='FRIPP%20Representation']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectFlowDestination'] //@ownedViewpoints[name='FRIPPviewpoint']/@ownedRepresentations[name='FRIPP%20Representation']/@defaultLayer/@toolSections.0/@ownedTools[name='ReconnectFlowSource'] //@ownedViewpoints[name='FRIPPviewpoint']/@ownedRepresentations[name='FRIPP%20Representation']/@defaultLayer/@toolSections.0/@ownedTools[name='MoveActivity']">
               <conditionnalStyles predicateExpression="aql: self.actionType == FRIPP::ACTION_TYPE_ENUM::MANUAL">
-                <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="12" labelExpression="aql: self.name + '[' + self.resourceUsed->filter(FRIPP::Actuator).name->sep('+') + '] '" tooltipExpression="aql: 'Start: ' + self.startDate + '\n' + 'End: ' + self.endDate + '\n' + 'Resources: ' + self.resourceUsed.name->sep(' + ')">
+                <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="12" labelExpression="aql: self.seqNum + ':' + self.name + '[' + self.resourceUsed->filter(FRIPP::Actuator).name->sep('+') + '] '" tooltipExpression="aql: 'Start: ' + self.startDate + '\n' + 'End: ' + self.endDate + '\n' + 'Resources: ' + self.resourceUsed.name->sep(' + ')">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                   <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                   <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
                   <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
                 </style>
               </conditionnalStyles>
               <conditionnalStyles predicateExpression="aql: self.actionType == FRIPP::ACTION_TYPE_ENUM::AUTOMATIC">
-                <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="12" labelExpression="aql: self.name + '[' + self.resourceUsed->filter(FRIPP::Actuator).name->sep('+') + '] '" tooltipExpression="aql: 'Start: ' + self.startDate + '\n' + 'End: ' + self.endDate + '\n' + 'Resources: ' + self.resourceUsed.name->sep(' + ')">
+                <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="12" labelExpression="aql: self.seqNum + ':'  self.name + '[' + self.resourceUsed->filter(FRIPP::Actuator).name->sep('+') + '] '" tooltipExpression="aql: 'Start: ' + self.startDate + '\n' + 'End: ' + self.endDate + '\n' + 'Resources: ' + self.resourceUsed.name->sep(' + ')">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                   <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                   <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
                   <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
                 </style>
               </conditionnalStyles>
               <conditionnalStyles predicateExpression="aql: self.actionType == FRIPP::ACTION_TYPE_ENUM::DUAL">
-                <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="12" labelExpression="aql: self.name + '[' + self.resourceUsed->filter(FRIPP::Actuator).name->sep('+') + '] '" tooltipExpression="aql: 'Start: ' + self.startDate + '\n' + 'End: ' + self.endDate + '\n' + 'Resources: ' + self.resourceUsed.name->sep(' + ')">
+                <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="12" labelExpression="aql: self.seqNum + ':' self.name + '[' + self.resourceUsed->filter(FRIPP::Actuator).name->sep('+') + '] '" tooltipExpression="aql: 'Start: ' + self.startDate + '\n' + 'End: ' + self.endDate + '\n' + 'Resources: ' + self.resourceUsed.name->sep(' + ')">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                   <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                   <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_yellow']"/>
                   <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_blue']"/>
                 </style>
               </conditionnalStyles>
               <conditionnalStyles predicateExpression="aql: self.actionType == FRIPP::ACTION_TYPE_ENUM::UNKNOWN">
-                <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="12" labelExpression="aql: self.name + '[' + self.resourceUsed->filter(FRIPP::Actuator).name->sep('+') + '] '" tooltipExpression="aql: 'Start: ' + self.startDate + '\n' + 'End: ' + self.endDate + '\n' + 'Resources: ' + self.resourceUsed.name->sep(' + ')">
+                <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="12" labelExpression="aql: self.seqNum + ':' self.name + '[' + self.resourceUsed->filter(FRIPP::Actuator).name->sep('+') + '] '" tooltipExpression="aql: 'Start: ' + self.startDate + '\n' + 'End: ' + self.endDate + '\n' + 'Resources: ' + self.resourceUsed.name->sep(' + ')">
                   <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                   <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
                   <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
                   <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
                 </style>
               </conditionnalStyles>
             </subContainerMappings>
-            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="12" showIcon="false" labelExpression="aql: self.name + '[' + self.resourceUsed->filter(FRIPP::Actuator).name->sep('+') + '] '" tooltipExpression="aql: 'Start: ' + self.startDate + '\n' + 'End: ' + self.endDate + '\n' + 'Resources: ' + self.resourceUsed.name->sep(' + ')">
+            <style xsi:type="style:WorkspaceImageDescription" borderSizeComputationExpression="2" labelSize="12" showIcon="false" labelExpression="aql: self.seqNum + ':' + self.name + '[' + self.resourceUsed->filter(FRIPP::Actuator).name->sep('+') + '] '" tooltipExpression="aql: 'Start: ' + self.startDate + '\n' + 'End: ' + self.endDate + '\n' + 'Resources: ' + self.resourceUsed.name->sep(' + ')">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             </style>

diff --git a/FRIPP/dsm.FRIPP/model/FRIPP.aird b/FRIPP/dsm.FRIPP/model/FRIPP.aird
@@ -9,11 +9,11 @@
     <semanticResources>platform:/resource/dsm.PROVE/model/PROVE.genmodel</semanticResources>
     <ownedViews xmi:type="viewpoint:DView" uid="_F_8LQIgEEeya855ptB8FAw">
       <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_GBXuoIgEEeya855ptB8FAw" name="FRIPP" repPath="#_GBK6UIgEEeya855ptB8FAw" changeId="1721830172350">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_GBXuoIgEEeya855ptB8FAw" name="FRIPP" repPath="#_GBK6UIgEEeya855ptB8FAw" changeId="1724234915501">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="FRIPP.ecore#/"/>
       </ownedRepresentationDescriptors>
-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_zIl-cI_dEey8CqdTwnbmuw" name="FRIPP metamodel" repPath="#_zIJ5kI_dEey8CqdTwnbmuw" changeId="1721830172350">
+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_zIl-cI_dEey8CqdTwnbmuw" name="FRIPP metamodel" repPath="#_zIJ5kI_dEey8CqdTwnbmuw" changeId="1724234910374">
         <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>
         <target xmi:type="ecore:EPackage" href="FRIPP.ecore#/"/>
       </ownedRepresentationDescriptors>
@@ -308,6 +308,10 @@
               <styles xmi:type="notation:FontStyle" xmi:id="__dzjYRbvEe2kFb441PQ9cQ" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="__dzjYhbvEe2kFb441PQ9cQ"/>
             </children>
+            <children xmi:type="notation:Node" xmi:id="_8jb2wF-cEe-Rv8bnL6LUww" type="3010" element="_8jWXNV-cEe-Rv8bnL6LUww">
+              <styles xmi:type="notation:FontStyle" xmi:id="_8jb2wV-cEe-Rv8bnL6LUww" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_8jb2wl-cEe-Rv8bnL6LUww"/>
+            </children>
             <styles xmi:type="notation:SortingStyle" xmi:id="_jrxUMIjDEeya855ptB8FAw"/>
             <styles xmi:type="notation:FilteringStyle" xmi:id="_jrxUMYjDEeya855ptB8FAw"/>
           </children>
@@ -1045,6 +1049,14 @@
         <ownedStyle xmi:type="diagram:BundledImage" uid="__dmIARbvEe2kFb441PQ9cQ" labelColor="39,76,114" labelAlignment="LEFT" description="__dmIABbvEe2kFb441PQ9cQ"/>
         <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%20EAttribute']"/>
       </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_8jWXNV-cEe-Rv8bnL6LUww" name="seqNum : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="platform:/resource/dsm.PROVE/model/PROVE.ecore#//Process/seqNum"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/dsm.PROVE/model/PROVE.ecore#//Process/seqNum"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_8jWXNl-cEe-Rv8bnL6LUww" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" 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%20EAttribute']/@style"/>
+        </ownedStyle>
+        <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%20EAttribute']"/>
+      </ownedElements>
     </ownedDiagramElements>
     <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_jl9nIIjDEeya855ptB8FAw" name="Resource" tooltipText="" outgoingEdges="_joMb0YjDEeya855ptB8FAw" incomingEdges="_joMbw4jDEeya855ptB8FAw _joMbyojDEeya855ptB8FAw _joMb0YjDEeya855ptB8FAw _jqI8gIjDEeya855ptB8FAw">
       <target xmi:type="ecore:EClass" href="platform:/resource/dsm.PROVE/model/PROVE.ecore#//Resource"/>
@@ -1591,6 +1603,10 @@
               <styles xmi:type="notation:FontStyle" xmi:id="_JwmrcQ2FEe2sz5QnjkIjMw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="_Jwmrcg2FEe2sz5QnjkIjMw"/>
             </children>
+            <children xmi:type="notation:Node" xmi:id="_7yfiAF-cEe-Rv8bnL6LUww" type="3010" element="_7yTUwV-cEe-Rv8bnL6LUww">
+              <styles xmi:type="notation:FontStyle" xmi:id="_7yfiAV-cEe-Rv8bnL6LUww" fontName="Segoe UI" fontHeight="8"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_7yfiAl-cEe-Rv8bnL6LUww"/>
+            </children>
             <children xmi:type="notation:Node" xmi:id="__4weQI_dEey8CqdTwnbmuw" type="3010" element="__37-4I_dEey8CqdTwnbmuw">
               <styles xmi:type="notation:FontStyle" xmi:id="__4weQY_dEey8CqdTwnbmuw" fontName="Segoe UI" fontHeight="8"/>
               <layoutConstraint xmi:type="notation:Location" xmi:id="__4weQo_dEey8CqdTwnbmuw"/>
@@ -2251,6 +2267,14 @@
         <ownedStyle xmi:type="diagram:BundledImage" uid="_sgptiQ2GEe2sz5QnjkIjMw" labelColor="39,76,114" labelAlignment="LEFT" description="_sgpthw2GEe2sz5QnjkIjMw"/>
         <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%20EAttribute']"/>
       </ownedElements>
+      <ownedElements xmi:type="diagram:DNodeListElement" uid="_7yTUwV-cEe-Rv8bnL6LUww" name="seqNum : EString" tooltipText="">
+        <target xmi:type="ecore:EAttribute" href="platform:/resource/dsm.PROVE/model/PROVE.ecore#//Process/seqNum"/>
+        <semanticElements xmi:type="ecore:EAttribute" href="platform:/resource/dsm.PROVE/model/PROVE.ecore#//Process/seqNum"/>
+        <ownedStyle xmi:type="diagram:BundledImage" uid="_7yT70F-cEe-Rv8bnL6LUww" labelAlignment="LEFT">
+          <description xmi:type="style:BundledImageDescription" 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%20EAttribute']/@style"/>
+        </ownedStyle>
+        <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%20EAttribute']"/>
+      </ownedElements>
       <ownedElements xmi:type="diagram:DNodeListElement" uid="__37-4I_dEey8CqdTwnbmuw" name=" artifactInStateUsed : ArtifactStateInstance" tooltipText="">
         <target xmi:type="ecore:EReference" href="platform:/resource/dsm.PROVE/model/PROVE.ecore#//Process/artifactInStateUsed"/>
         <semanticElements xmi:type="ecore:EReference" href="platform:/resource/dsm.PROVE/model/PROVE.ecore#//Process/artifactInStateUsed"/>

diff --git a/FRIPP/dsm.FRIPP/src-gen/dsm/FRIPP/ACTION_TYPE_ENUM.java b/FRIPP/dsm.FRIPP/src-gen/dsm/FRIPP/ACTION_TYPE_ENUM.java
@@ -38,22 +38,22 @@ public enum ACTION_TYPE_ENUM implements Enumerator {
 	 */
 	AUTOMATIC(1, "AUTOMATIC", "AUTOMATIC"),
 	/**
-	* The '<em><b>DUAL</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>DUAL</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #DUAL_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #DUAL_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	DUAL(2, "DUAL", "DUAL"),
 	/**
-	* The '<em><b>UNKNOWN</b></em>' literal object.
-	* <!-- begin-user-doc -->
+	 * The '<em><b>UNKNOWN</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	* <!-- end-user-doc -->
-	* @see #UNKNOWN_VALUE
-	* @generated
-	* @ordered
-	*/
+	 * @see #UNKNOWN_VALUE
+	 * @generated
+	 * @ordered
+	 */
 	UNKNOWN(3, "UNKNOWN", "UNKNOWN");
 
 	/**

diff --git a/FRIPP/dsm.FRIPP/src-gen/dsm/FRIPP/FRIPPPackage.java b/FRIPP/dsm.FRIPP/src-gen/dsm/FRIPP/FRIPPPackage.java
@@ -185,6 +185,15 @@ public interface FRIPPPackage extends EPackage {
 	 */
 	int PLAYBOOK_PROCESS__STATUS = PROVEPackage.PROCESS__STATUS;
 
+	/**
+	 * The feature id for the '<em><b>Seq Num</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PLAYBOOK_PROCESS__SEQ_NUM = PROVEPackage.PROCESS__SEQ_NUM;
+
 	/**
 	 * The feature id for the '<em><b>Objectives</b></em>' attribute list.
 	 * <!-- begin-user-doc -->

diff --git a/SYMBIOSIS/SymbiosisDM/bin/.gitignore b/SYMBIOSIS/SymbiosisDM/bin/.gitignore
@@ -0,0 +1 @@
+/src/