mpsbasics: enhanced the pdfexport (#81)

tutorial-safety: updated the examples
mbeddr · Feb 28, 2024 · c8611b1 · c8611b1
1 parent 54a5bcf
commit c8611b1
Show file tree

Hide file tree

Showing 21 changed files with 1,657 additions and 353 deletions.
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
@@ -3168,8 +3168,8 @@
       <node concept="3clFbS" id="BKGoaZN_d3" role="2VODD2">
         <node concept="3clFbF" id="1Nl9e7EggVY" role="3cqZAp">
           <node concept="2YIFZM" id="1Nl9e7EghkC" role="3clFbG">
-            <ref role="37wK5l" node="1Nl9e7Eg0nv" />
-            <ref role="1Pybhc" node="1Nl9e7EfLVY" />
+            <ref role="37wK5l" node="1Nl9e7Eg0nv" resolve="execute" />
+            <ref role="1Pybhc" node="1Nl9e7EfLVY" resolve="FASTENNewRootNodeUtils" />
             <node concept="2OqwBi" id="1Nl9e7EghRN" role="37wK5m">
               <node concept="2WthIp" id="1Nl9e7EghCx" role="2Oq$k0" />
               <node concept="1DTwFV" id="1Nl9e7Egice" role="2OqNvi">
@@ -3928,7 +3928,7 @@
         <node concept="3clFbF" id="1Nl9e7Eg0Ca" role="3cqZAp">
           <node concept="37vLTI" id="1Nl9e7Eg0Cb" role="3clFbG">
             <node concept="1rXfSq" id="1Nl9e7Egc1R" role="37vLTx">
-              <ref role="37wK5l" node="1Nl9e7EfNwo" resolve="determinePackage" />
+              <ref role="37wK5l" node="1Nl9e7EfNwo" resolve="getVirtualPackage" />
               <node concept="37vLTw" id="1Nl9e7EgcTE" role="37wK5m">
                 <ref role="3cqZAo" node="1Nl9e7Egchb" resolve="treeNode" />
               </node>

diff --git a/...m.mbeddr.formal.safety.gsn.importer/models/com.mbeddr.formal.safety.gsn.importer.util.mps b/...m.mbeddr.formal.safety.gsn.importer/models/com.mbeddr.formal.safety.gsn.importer.util.mps
@@ -1247,7 +1247,7 @@
                         <node concept="1rXfSq" id="7NA168qhyNT" role="33vP2m">
                           <ref role="37wK5l" node="7NA168pX2k3" resolve="importXml" />
                           <node concept="37vLTw" id="23H9md0voAM" role="37wK5m">
-                            <ref role="3cqZAo" node="23H9md0voAH" resolve="readFileToString" />
+                            <ref role="3cqZAo" node="23H9md0voAH" resolve="contentAsString" />
                           </node>
                         </node>
                       </node>
@@ -1949,7 +1949,7 @@
                         </node>
                         <node concept="2OqwBi" id="7NA168q4U8C" role="3uHU7w">
                           <node concept="37vLTw" id="7NA168q4UGn" role="2Oq$k0">
-                            <ref role="3cqZAo" node="7NA168q4UGi" resolve="elementsByTagName" />
+                            <ref role="3cqZAo" node="7NA168q4UGi" resolve="attributeNodes" />
                           </node>
                           <node concept="liA8E" id="7NA168q4YRy" role="2OqNvi">
                             <ref role="37wK5l" to="lhjl:~NodeList.getLength()" resolve="getLength" />

diff --git a/...dr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.behavior.mps b/...dr.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.behavior.mps
@@ -329,7 +329,7 @@
                 </node>
                 <node concept="TSZUe" id="3TNxfDZ6dNN" role="2OqNvi">
                   <node concept="37vLTw" id="3TNxfDZ6e7r" role="25WWJ7">
-                    <ref role="3cqZAo" node="3TNxfDZ62_3" resolve="ancestor" />
+                    <ref role="3cqZAo" node="3TNxfDZ62_3" resolve="crtGoalStructure" />
                   </node>
                 </node>
               </node>
@@ -338,7 +338,7 @@
               <node concept="BsUDl" id="3TNxfDZ6puG" role="3clFbG">
                 <ref role="37wK5l" node="3TNxfDZ5$jM" resolve="collectLeg" />
                 <node concept="37vLTw" id="3TNxfDZ6pxw" role="37wK5m">
-                  <ref role="3cqZAo" node="3TNxfDZ62_3" resolve="ancestor" />
+                  <ref role="3cqZAo" node="3TNxfDZ62_3" resolve="crtGoalStructure" />
                 </node>
                 <node concept="37vLTw" id="3TNxfDZ6pCf" role="37wK5m">
                   <ref role="3cqZAo" node="3TNxfDZ5$Eg" resolve="goalStructures" />
@@ -349,7 +349,7 @@
           <node concept="2OqwBi" id="3TNxfDZ5I5I" role="2GsD0m">
             <node concept="2OqwBi" id="3TNxfDZ5DqO" role="2Oq$k0">
               <node concept="37vLTw" id="3TNxfDZ5D9M" role="2Oq$k0">
-                <ref role="3cqZAo" node="3TNxfDZ5CRy" resolve="gs" />
+                <ref role="3cqZAo" node="3TNxfDZ5CRy" resolve="seed" />
               </node>
               <node concept="2Rf3mk" id="3TNxfDZ5Ed3" role="2OqNvi">
                 <node concept="1xMEDy" id="3TNxfDZ5Ed5" role="1xVPHs">

diff --git a/...r.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.structure.mps b/...r.formal.safety.gsn.pdfexport/models/com.mbeddr.formal.safety.gsn.pdfexport.structure.mps
@@ -40,7 +40,7 @@
     <property role="EcuMT" value="4500086664082091755" />
     <property role="TrG5h" value="ArgumentLeg" />
     <property role="34LRSv" value="argument leg" />
-    <ref role="1TJDcQ" to="tpck:gw2VY9q" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
     <node concept="1TJgyj" id="3TNxfDZ5wws" role="1TKVEi">
       <property role="IQ2ns" value="4500086664082098204" />
       <property role="20kJfa" value="goalStructure" />

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
@@ -1974,6 +1974,25 @@
             <ref role="3bR37D" to="al5i:Vtr7jyAKU4" resolve="com.mbeddr.mpsutil.filepicker" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2ZPTSaoSrhl" role="3bR37C">
+          <node concept="1BurEX" id="2ZPTSaoSrhm" role="1SiIV1">
+            <node concept="398BVA" id="2ZPTSaoSrh8" role="1BurEY">
+              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
+              <node concept="2Ry0Ak" id="2ZPTSaoSrh9" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="2ZPTSaoSrha" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mpsbasics.pdfbox" />
+                  <node concept="2Ry0Ak" id="2ZPTSaoSrhb" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="2ZPTSaoSrhc" role="2Ry0An">
+                      <property role="2Ry0Am" value="graphics2d-3.0.1.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="2u7UHDC1TKp" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2048,6 +2067,16 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2ZPTSaoSrhy" role="3bR37C">
+          <node concept="3bR9La" id="2ZPTSaoSrhz" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2ZPTSaoSrh$" role="3bR37C">
+          <node concept="3bR9La" id="2ZPTSaoSrh_" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="2MrvZqtGQDM" role="3989C9">

diff --git a/...yesian_network.sandbox/models/com.fasten.safety.bayesian_network.sandbox._010_sandbox.mps b/...yesian_network.sandbox/models/com.fasten.safety.bayesian_network.sandbox._010_sandbox.mps
@@ -305,23 +305,23 @@
       </node>
     </node>
     <node concept="W0abB" id="3sgpJkbnoft" role="W0VcW">
-      <ref role="W0abx" node="3sgpJkb5jxJ" />
-      <ref role="W0abz" node="3sgpJkb5jy7" />
+      <ref role="W0abx" node="3sgpJkb5jxJ" resolve="A" />
+      <ref role="W0abz" node="3sgpJkb5jy7" resolve="D" />
     </node>
     <node concept="W0abB" id="3sgpJkbnofD" role="W0VcW">
-      <ref role="W0abx" node="3sgpJkb5jxP" />
-      <ref role="W0abz" node="3sgpJkb5jy7" />
+      <ref role="W0abx" node="3sgpJkb5jxP" resolve="B" />
+      <ref role="W0abz" node="3sgpJkb5jy7" resolve="D" />
     </node>
     <node concept="W0ak8" id="3sgpJkbnyoa" role="W0VcW">
       <property role="TrG5h" value="E" />
     </node>
     <node concept="W0abB" id="3sgpJkbnyoP" role="W0VcW">
-      <ref role="W0abx" node="3sgpJkb5jxJ" />
-      <ref role="W0abz" node="3sgpJkbnyoa" />
+      <ref role="W0abx" node="3sgpJkb5jxJ" resolve="A" />
+      <ref role="W0abz" node="3sgpJkbnyoa" resolve="E" />
     </node>
     <node concept="W0abB" id="3sgpJkbnyp4" role="W0VcW">
-      <ref role="W0abx" node="3sgpJkb5jxX" />
-      <ref role="W0abz" node="3sgpJkbnyoa" />
+      <ref role="W0abx" node="3sgpJkb5jxX" resolve="C" />
+      <ref role="W0abz" node="3sgpJkbnyoa" resolve="E" />
     </node>
   </node>
 </model>

diff --git a/...safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/...safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
@@ -2016,7 +2016,7 @@
         </node>
         <node concept="1SiIV0" id="2u7UHDC1VSB" role="3bR37C">
           <node concept="3bR9La" id="2u7UHDC1VSC" role="1SiIV1">
-            <ref role="3bR37D" node="2u7UHDC1TKp" />
+            <ref role="3bR37D" node="2u7UHDC1TKp" resolve="com.mpsbasics.pdfexporter" />
           </node>
         </node>
         <node concept="1SiIV0" id="2u7UHDCnTe3" role="3bR37C">
@@ -2039,6 +2039,25 @@
             <ref role="3bR37D" to="al5i:Vtr7jyAKU4" resolve="com.mbeddr.mpsutil.filepicker" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2ZPTSaoSrPW" role="3bR37C">
+          <node concept="1BurEX" id="2ZPTSaoSrPX" role="1SiIV1">
+            <node concept="398BVA" id="2ZPTSaoSrPJ" role="1BurEY">
+              <ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
+              <node concept="2Ry0Ak" id="2ZPTSaoSrPK" role="iGT6I">
+                <property role="2Ry0Am" value="solutions" />
+                <node concept="2Ry0Ak" id="2ZPTSaoSrPL" role="2Ry0An">
+                  <property role="2Ry0Am" value="com.mpsbasics.pdfbox" />
+                  <node concept="2Ry0Ak" id="2ZPTSaoSrPM" role="2Ry0An">
+                    <property role="2Ry0Am" value="lib" />
+                    <node concept="2Ry0Ak" id="2ZPTSaoSrPN" role="2Ry0An">
+                      <property role="2Ry0Am" value="graphics2d-3.0.1.jar" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtD" id="2u7UHDC1TKp" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -2113,6 +2132,16 @@
             <ref role="3bR37D" node="2u7UHDCnRuK" resolve="com.mpsbasics.editor.utils" />
           </node>
         </node>
+        <node concept="1SiIV0" id="2ZPTSaoSrQ9" role="3bR37C">
+          <node concept="3bR9La" id="2ZPTSaoSrQa" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1H905DlDUSw" resolve="MPS.OpenAPI" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="2ZPTSaoSrQb" role="3bR37C">
+          <node concept="3bR9La" id="2ZPTSaoSrQc" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:3MI1gu0QouH" resolve="jetbrains.mps.editor.runtime" />
+          </node>
+        </node>
       </node>
     </node>
     <node concept="2G$12M" id="2MrvZqtDw3j" role="3989C9">
@@ -14620,7 +14649,7 @@
                 </node>
               </node>
               <node concept="1zDrgl" id="42jqVeFkUvE" role="39821P">
-                <ref role="1zDrgn" node="42jqVeFkUtq" resolve="FASTEN 2023.1" />
+                <ref role="1zDrgn" node="42jqVeFkUtq" resolve="FASTEN 2023.2" />
               </node>
             </node>
           </node>

diff --git a/...l.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._010_simple_examples.mps b/...l.safety.gsn.sandbox/models/com.mbeddr.formal.safety.gsn.sandbox._010_simple_examples.mps
@@ -2977,6 +2977,13 @@
       <ref role="TVjpn" node="3GRi4m$r5TO" resolve="_010_simple_pattern_baselang" />
     </node>
     <node concept="TVfY7" id="24pF5$oXQit" role="TVegP" />
+    <node concept="TVjW0" id="3GMd7ba95hG" role="TVegP">
+      <ref role="TVjpn" node="1qrXfdH0LFq" resolve="_100_away_goal_010_definition" />
+    </node>
+    <node concept="TVjW0" id="3GMd7ba95hN" role="TVegP">
+      <ref role="TVjpn" node="1qrXfdGXjNu" resolve="_100_away_goal_020_reference" />
+    </node>
+    <node concept="TVfY7" id="3GMd7ba95iq" role="TVegP" />
     <node concept="TVjW0" id="24pF5$oXQi_" role="TVegP">
       <ref role="TVjpn" node="7lPNUDMt_br" resolve="_120_all_entities" />
     </node>

diff --git a/...m.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/temp/pdf_export.pdf b/...m.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.gsn.sandbox/temp/pdf_export.pdf
diff --git a/...ests/test.mbeddr.formal.gsn/models/[email protected] b/...ests/test.mbeddr.formal.gsn/models/[email protected]
@@ -1170,7 +1170,7 @@
             <node concept="3vwNmj" id="7NA168q0xOQ" role="3cqZAp">
               <node concept="2OqwBi" id="7NA168q0xOR" role="3vwVQn">
                 <node concept="37vLTw" id="7NA168q0xOS" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7NA168q0xOI" resolve="gseb" />
+                  <ref role="3cqZAo" node="7NA168q0xOI" resolve="g01" />
                 </node>
                 <node concept="1mIQ4w" id="7NA168q0xOT" role="2OqNvi">
                   <node concept="chp4Y" id="7NA168q0xOU" role="cj9EA">
@@ -1185,7 +1185,7 @@
               </node>
               <node concept="2OqwBi" id="7NA168q0xOX" role="3tpDZA">
                 <node concept="37vLTw" id="7NA168q0xOY" role="2Oq$k0">
-                  <ref role="3cqZAo" node="7NA168q0xOI" resolve="gseb" />
+                  <ref role="3cqZAo" node="7NA168q0xOI" resolve="g01" />
                 </node>
                 <node concept="3TrcHB" id="7NA168q0xOZ" role="2OqNvi">
                   <ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
@@ -1199,7 +1199,7 @@
               <node concept="2OqwBi" id="7NA168q0xP2" role="3tpDZA">
                 <node concept="2OqwBi" id="7NA168q0xP3" role="2Oq$k0">
                   <node concept="37vLTw" id="7NA168q0xP4" role="2Oq$k0">
-                    <ref role="3cqZAo" node="7NA168q0xOI" resolve="gseb" />
+                    <ref role="3cqZAo" node="7NA168q0xOI" resolve="g01" />
                   </node>
                   <node concept="3TrEf2" id="7NA168q0xP5" role="2OqNvi">
                     <ref role="3Tt5mk" to="py52:3GRi4m$qYoV" resolve="text" />

diff --git a/...languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl b/...languages/com.mpsbasics/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl
@@ -20,6 +20,8 @@
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)</dependency>
+    <dependency reexport="false">34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)</dependency>
+    <dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
@@ -70,6 +72,7 @@
     <module reference="6b84fb9e-5f09-4a61-bf31-3bfdc54820e3(com.mpsbasics.editor.utils)" version="0" />
     <module reference="bc7d0863-298c-41cf-984f-a0421e757da5(com.mpsbasics.pdfbox)" version="0" />
     <module reference="ece26728-2885-4b26-9f61-67d2821fc361(com.mpsbasics.pdfexporter)" version="0" />
+    <module reference="34e84b8f-afa8-4364-abcd-a279fddddbe7(jetbrains.mps.editor.runtime)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />