fasten.rcp: improved creation of new Models and the creation of new R…

…oot Nodes
mbeddr · Dec 30, 2023 · b592101 · b592101
1 parent ca83bef
commit b592101
Show file tree

Hide file tree

Showing 11 changed files with 2,315 additions and 140 deletions.
diff --git a/code/languages/com.mbeddr.formal.nusmv/devkits/fasten.nusmv/fasten.nusmv.devkit b/code/languages/com.mbeddr.formal.nusmv/devkits/fasten.nusmv/fasten.nusmv.devkit
@@ -16,5 +16,7 @@
   <exported-language name="85d37fe5-2c7e-4ea1-ae78-08007614c543(com.mbeddr.formal.nusmv.importer)" />
   <exported-language name="d3a0fd26-445a-466c-900e-10444ddfed52(com.mbeddr.mpsutil.filepicker)" />
   <exported-language name="58bd9c99-ba42-4205-b3c9-ce445fd870e6(com.mbeddr.formal.nusmv.cbd)" />
+  <exported-language name="3b22dedc-d6cf-4626-9445-6e9909b3e04a(com.fasten.base.arch.msc)" />
+  <exported-language name="81f6a079-965e-4523-87c3-8e6194f66585(com.fasten.base.msc)" />
 </dev-kit>
 
diff --git a/...solutions/com.mbeddr.formal.base.pluginSolution/com.mbeddr.formal.base.pluginSolution.msd b/...solutions/com.mbeddr.formal.base.pluginSolution/com.mbeddr.formal.base.pluginSolution.msd
@@ -23,6 +23,7 @@
     <dependency reexport="false">6ed54515-acc8-4d1e-a16c-9fd6cfe951ea(MPS.Core)</dependency>
     <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
     <dependency reexport="false">83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)</dependency>
+    <dependency reexport="false">d7931714-a11c-4108-aa0e-246d86070dad(com.mbeddr.mpsutil.smodule.runtime)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:58e731a3-6aaa-444a-bf40-801b91c15878:com.mbeddr.mpsutil.lang.plugin.extensions" version="0" />
@@ -31,6 +32,7 @@
     <language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
+    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
     <language slang="l:63650c59-16c8-498a-99c8-005c7ee9515d:jetbrains.mps.lang.access" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
@@ -51,6 +53,7 @@
     <module reference="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61(MPS.Platform)" version="0" />
     <module reference="83ed2dfe-f724-46cc-852a-dce086daee3f(com.mbeddr.formal.base)" version="0" />
     <module reference="945808cb-09a0-4d70-9f2a-186b7f5c6219(com.mbeddr.formal.base.pluginSolution)" version="0" />
+    <module reference="d7931714-a11c-4108-aa0e-246d86070dad(com.mbeddr.mpsutil.smodule.runtime)" version="0" />
     <module reference="fdaaf35f-8ee3-4c37-b09d-9efaeaaa7a41(jetbrains.mps.core.tool.environment)" version="0" />
     <module reference="5b1f863d-65a0-41a6-a801-33896be24202(jetbrains.mps.ide.editor)" version="0" />
     <module reference="8d29d73f-ed99-4652-ae0a-083cdfe53c34(jetbrains.mps.ide.platform)" version="0" />

diff --git a/...com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/models/plugin.mps b/...com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.base.pluginSolution/models/plugin.mps
diff --git a/...al.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps b/...al.nusmv/solutions/com.mbeddr.formal.nusmv.build/models/com.mbeddr.formal.nusmv.build.mps
@@ -9,7 +9,7 @@
   <imports>
     <import index="ffeo" ref="r:874d959d-e3b4-4d04-b931-ca849af130dd(jetbrains.mps.ide.build)" />
     <import index="al5i" ref="r:742f344d-4dc4-4862-992c-4bc94b094870(com.mbeddr.mpsutil.dev.build)" />
-    <import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.itemis.mps.extensions.build)" implicit="true" />
+    <import index="90a9" ref="r:fb24ac52-5985-4947-bba9-25be6fd32c1a(de.itemis.mps.extensions.build)" />
   </imports>
   <registry>
     <language id="798100da-4f0a-421a-b991-71f8c50ce5d2" name="jetbrains.mps.build">
@@ -444,6 +444,33 @@
       <property role="1wOHq$" value="true" />
       <property role="3Ej$Sc" value="true" />
     </node>
+    <node concept="m$_wf" id="7he_lUumEw2" role="3989C9">
+      <property role="m$_wk" value="com.mpsbasics" />
+      <node concept="3_J27D" id="7he_lUumEw4" role="m$_yQ">
+        <node concept="3Mxwew" id="7he_lUumFzi" role="3MwsjC">
+          <property role="3MwjfP" value="com.mpsbasics" />
+        </node>
+      </node>
+      <node concept="3_J27D" id="7he_lUumEw6" role="m_cZH">
+        <node concept="3Mxwew" id="7he_lUumFzk" role="3MwsjC">
+          <property role="3MwjfP" value="com.mpsbasics" />
+        </node>
+      </node>
+      <node concept="3_J27D" id="7he_lUumEw8" role="m$_w8">
+        <node concept="3Mxwey" id="7he_lUumFFG" role="3MwsjC">
+          <ref role="3Mxwex" node="4aeOpjlAy7f" resolve="version" />
+        </node>
+      </node>
+      <node concept="m$f5U" id="7he_lUumFO4" role="m$_yh">
+        <ref role="m$f5T" node="6hyv0iVPlEb" resolve="com.mpsbasics" />
+      </node>
+      <node concept="m$_yC" id="7yAshxDrNUC" role="m$_yJ">
+        <ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
+      </node>
+      <node concept="m$_yC" id="7yAshxDrNok" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:4p3FRivDLPy" resolve="org.apache.commons" />
+      </node>
+    </node>
     <node concept="m$_wf" id="42jqVeFkUv3" role="3989C9">
       <property role="m$_wk" value="com.mbeddr.formal.nusmv" />
       <node concept="3_J27D" id="42jqVeFkUv4" role="m$_yQ">
@@ -471,8 +498,11 @@
       <node concept="m$f5U" id="3ALtb$iq$YM" role="m$_yh">
         <ref role="m$f5T" node="6hyv0iVPlEb" resolve="com.mpsbasics" />
       </node>
-      <node concept="m$_yC" id="42jqVeFkUv9" role="m$_yJ">
-        <ref role="m$_y1" to="ffeo:4k71ibbKLe8" resolve="jetbrains.mps.core" />
+      <node concept="m$_yC" id="6HG3hcznq$3" role="m$_yJ">
+        <ref role="m$_y1" to="al5i:6rBfBe1WhKl" resolve="com.mbeddr.mpsutil.interpreter" />
+      </node>
+      <node concept="m$_yC" id="26E6nZcCEtv" role="m$_yJ">
+        <ref role="m$_y1" to="90a9:3$A0JaN5ezp" resolve="MPS.ThirdParty" />
       </node>
       <node concept="m$_yC" id="4aeOpjl$egK" role="m$_yJ">
         <ref role="m$_y1" to="90a9:29so9Vb$6Tj" resolve="de.slisson.mps.tables" />
@@ -495,8 +525,11 @@
       <node concept="m$_yC" id="6HG3hcznqwv" role="m$_yJ">
         <ref role="m$_y1" to="ffeo:RJsmGEieyQ" resolve="jetbrains.mps.vcs" />
       </node>
-      <node concept="m$_yC" id="6HG3hcznq$3" role="m$_yJ">
-        <ref role="m$_y1" to="al5i:6rBfBe1WhKl" resolve="com.mbeddr.mpsutil.interpreter" />
+      <node concept="m$_yC" id="26E6nZcE6W2" role="m$_yJ">
+        <ref role="m$_y1" node="7he_lUumEw2" resolve="com.mpsbasics" />
+      </node>
+      <node concept="m$_yC" id="26E6nZcE8uD" role="m$_yJ">
+        <ref role="m$_y1" to="al5i:$bJ0jguQdg" resolve="com.mbeddr.platform" />
       </node>
       <node concept="3_J27D" id="42jqVeFkUva" role="m_cZH">
         <node concept="3Mxwew" id="42jqVeFkUvb" role="3MwsjC">
@@ -570,6 +603,12 @@
         <node concept="3LEDTy" id="5yQpAUIgPII" role="3LEDUa">
           <ref role="3LEDTV" node="6adXBxxUu$i" resolve="com.mbeddr.formal.nusmv.importer" />
         </node>
+        <node concept="3LEDTy" id="26E6nZcCC7m" role="3LEDUa">
+          <ref role="3LEDTV" node="2Btqz_w6o5R" resolve="com.fasten.base.arch.msc" />
+        </node>
+        <node concept="3LEDTy" id="26E6nZcCC7n" role="3LEDUa">
+          <ref role="3LEDTV" node="2Btqz_w6mDq" resolve="com.fasten.base.msc" />
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="4hZQPnIogqu" role="3989C9">

diff --git a/.../com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/models/plugin.mps b/.../com.mbeddr.formal.nusmv/solutions/com.mbeddr.formal.rcp.pluginSolution/models/plugin.mps
@@ -30,9 +30,6 @@
       </concept>
       <concept id="1203087890642" name="jetbrains.mps.lang.plugin.structure.ActionGroupDeclaration" flags="ng" index="tC5Ba">
         <property id="1204991940915" name="caption" index="2f7twF" />
-        <property id="1205160812895" name="mnemonic" index="2pbE17" />
-        <property id="1217005992861" name="isInvisibleWhenDisabled" index="1rdrE6" />
-        <property id="1213283637680" name="isPopup" index="1XlLyE" />
         <child id="1204991552650" name="modifier" index="2f5YQi" />
         <child id="1207145245948" name="contents" index="ftER_" />
       </concept>
@@ -59,25 +56,13 @@
         <reference id="1107535924139" name="classifier" index="3uigEE" />
       </concept>
     </language>
-    <language id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi">
-      <concept id="361130699826193249" name="jetbrains.mps.lang.modelapi.structure.ModulePointer" flags="ng" index="1dCxOk">
-        <property id="1863527487546097500" name="moduleId" index="1XweGW" />
-        <property id="1863527487545993577" name="moduleName" index="1XxBO9" />
-      </concept>
-    </language>
-    <language id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel">
-      <concept id="1678062499342629858" name="jetbrains.mps.lang.smodel.structure.ModuleRefExpression" flags="ng" index="37shsh">
-        <child id="1678062499342629861" name="moduleId" index="37shsm" />
-      </concept>
-    </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="1237721394592" name="jetbrains.mps.baseLanguage.collections.structure.AbstractContainerCreator" flags="nn" index="HWqM0">
-        <child id="1237721435808" name="initValue" index="HW$Y0" />
         <child id="1237721435807" name="elementType" index="HW$YZ" />
       </concept>
       <concept id="1227008614712" name="jetbrains.mps.baseLanguage.collections.structure.LinkedListCreator" flags="nn" index="2Jqq0_" />
@@ -88,48 +73,27 @@
     <property role="TrG5h" value="FASTENSMVActionsGroup" />
     <property role="2f7twF" value="New" />
     <node concept="ftmFs" id="5uW1px6ni3n" role="ftER_">
-      <node concept="tC5Ba" id="3ALtb$iqtxU" role="ftvYc">
-        <property role="TrG5h" value="SMV" />
-        <property role="1XlLyE" value="true" />
-        <property role="2f7twF" value="Formal Specification Models" />
-        <property role="1rdrE6" value="true" />
-        <property role="2pbE17" value="S" />
-        <node concept="ftmFs" id="3ALtb$iqtyN" role="ftER_">
-          <node concept="tCFHf" id="5tRIc6mlLia" role="ftvYc">
-            <ref role="tCJdB" to="8js5:5tRIc6mkOfA" resolve="FASTENNewModel" />
-            <node concept="Xl_RD" id="3ALtb$ipKz5" role="2J__8u">
-              <property role="Xl_RC" value="SMV Specs" />
-            </node>
-            <node concept="2ShNRf" id="3ALtb$ipKzy" role="2J__8u">
-              <node concept="2Jqq0_" id="3ALtb$ipMgm" role="2ShVmc">
-                <node concept="3uibUv" id="3ALtb$ipMmU" role="HW$YZ">
-                  <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
-                </node>
-                <node concept="37shsh" id="3ALtb$ipMyl" role="HW$Y0">
-                  <node concept="1dCxOk" id="3ALtb$ipMyF" role="37shsm">
-                    <property role="1XweGW" value="edb51d2d-64eb-404a-818e-c1cabf1d58d5" />
-                    <property role="1XxBO9" value="fasten.nusmv" />
-                  </node>
-                </node>
-                <node concept="37shsh" id="3ALtb$iIBQZ" role="HW$Y0">
-                  <node concept="1dCxOk" id="3ALtb$iIBRs" role="37shsm">
-                    <property role="1XweGW" value="15b78606-0574-4c04-a9f2-d43bce9698b3" />
-                    <property role="1XxBO9" value="fasten.nuxmv" />
-                  </node>
-                </node>
-              </node>
+      <node concept="tCFHf" id="26E6nZcCvUB" role="ftvYc">
+        <ref role="tCJdB" to="8js5:5tRIc6mkOfA" resolve="FASTENNewModel" />
+        <node concept="Xl_RD" id="26E6nZcCvUC" role="2J__8u">
+          <property role="Xl_RC" value="New FASTEN Model" />
+        </node>
+        <node concept="2ShNRf" id="26E6nZcCvUD" role="2J__8u">
+          <node concept="2Jqq0_" id="26E6nZcCvUE" role="2ShVmc">
+            <node concept="3uibUv" id="26E6nZcCvUF" role="HW$YZ">
+              <ref role="3uigEE" to="lui2:~SModuleReference" resolve="SModuleReference" />
             </node>
           </node>
         </node>
       </node>
     </node>
     <node concept="tT9cl" id="7Wl2irMPeJi" role="2f5YQi">
-      <ref role="tU$_T" to="tprs:hyf4Jpv" resolve="SolutionNewActions" />
-      <ref role="2f8Tey" to="tprs:1bRM4HyGTmR" resolve="newModel" />
+      <ref role="tU$_T" to="tprs:hyf4Jd1" resolve="SolutionActions" />
+      <ref role="2f8Tey" to="tprs:hyalGNA" resolve="solutionNew" />
     </node>
     <node concept="tT9cl" id="6s_wYCETe6U" role="2f5YQi">
       <ref role="tU$_T" to="tprs:hQh2F9P" resolve="NamespaceActions" />
-      <ref role="2f8Tey" to="tprs:V2X$nu7ww3" resolve="check" />
+      <ref role="2f8Tey" to="tprs:hQhenBr" resolve="namespaceInternal" />
     </node>
   </node>
 </model>

diff --git a/code/languages/com.mbeddr.formal.req/devkits/fasten.requirements/fasten.requirements.devkit b/code/languages/com.mbeddr.formal.req/devkits/fasten.requirements/fasten.requirements.devkit
@@ -4,5 +4,6 @@
   <exported-language name="5ff577d1-1817-495b-9d6c-ff7b52c68609(com.mbeddr.formal.req.tl_patterns)" />
   <exported-language name="92d2ea16-5a42-4fdf-a676-c7604efe3504(de.slisson.mps.richtext)" />
   <exported-language name="65ed2ac6-4499-4751-951e-3819684a4b8d(com.fasten.req.ontology)" />
+  <exported-language name="3460ac43-6f59-4f61-b134-9fa2f799c2d3(com.mbeddr.formal.req.scenarios)" />
 </dev-kit>
 
diff --git a/...uages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.doc/fasten.safety.gsn.doc.devkit b/...uages/com.mbeddr.formal.safety/devkits/fasten.safety.gsn.doc/fasten.safety.gsn.doc.devkit
@@ -3,6 +3,7 @@
   <exported-language name="42606624-2faa-4717-ba66-77021cc11b53(com.mbeddr.formal.safety.gsn.doc)" />
   <extendedDevKits>
     <extendedDevKit>b64463ba-ae31-4cf7-be7b-afc13cab4daa(fasten.safety.gsn)</extendedDevKit>
+    <extendedDevKit>54c79f9f-f3ba-4167-91f1-eb4e98a9c47c(com.mbeddr.documentation)</extendedDevKit>
   </extendedDevKits>
   <exported-solutions>
     <exported-solution>e1b41d7d-269e-4a91-a7d8-91bd657028d7(com.fasten.safety.doc2word)</exported-solution>

diff --git a/....formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps b/....formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
@@ -547,6 +547,9 @@
       <node concept="m$_yC" id="6hyv0iVPlES" role="m$_yJ">
         <ref role="m$_y1" to="al5i:7yAshxDtbd3" resolve="com.mbeddr.mpsutil.genreview" />
       </node>
+      <node concept="m$_yC" id="26E6nZcGYVG" role="m$_yJ">
+        <ref role="m$_y1" to="al5i:5fGcQI8WTaQ" resolve="com.mbeddr.mpsutil.smodule" />
+      </node>
       <node concept="m$_yC" id="3DZJpXNnD_Z" role="m$_yJ">
         <ref role="m$_y1" to="ffeo:RJsmGEieyQ" resolve="jetbrains.mps.vcs" />
       </node>
@@ -2761,6 +2764,11 @@
             <ref role="3bR37D" to="ffeo:1TaHNgiIbJt" resolve="jetbrains.mps.ide.platform" />
           </node>
         </node>
+        <node concept="1SiIV0" id="26E6nZcGZi$" role="3bR37C">
+          <node concept="3bR9La" id="26E6nZcGZi_" role="1SiIV1">
+            <ref role="3bR37D" to="al5i:lse_ua97Px" resolve="com.mbeddr.mpsutil.smodule.runtime" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="6hyv0iVPlGc" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -6014,6 +6022,9 @@
         <node concept="3LEDTy" id="8xY_IhvzQ6" role="3LEDUa">
           <ref role="3LEDTV" to="90a9:1sO539bGQvB" resolve="de.slisson.mps.richtext" />
         </node>
+        <node concept="3LEDTy" id="26E6nZcCDAM" role="3LEDUa">
+          <ref role="3LEDTV" node="6hyv0iVPlFT" resolve="com.mbeddr.formal.req.scenarios" />
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="3rkUgzov67U" role="3989C9">
@@ -6279,6 +6290,9 @@
         <node concept="3LEDTM" id="55RZzcIFqXH" role="3LEDUa">
           <ref role="3LEDTN" node="4ziKDEngAys" resolve="com.fasten.safety.doc2word" />
         </node>
+        <node concept="3LEz8M" id="26E6nZcCDAN" role="3LEz9a">
+          <ref role="3LEz8N" to="al5i:7tNo_gxoK9_" resolve="com.mbeddr.documentation" />
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="y1G8y6eV83" role="3989C9">