From 057487b00b5375367760f12748c84d379f938b9f Mon Sep 17 00:00:00 2001
From: danielratiu <ratiud@googlemail.com>
Date: Sun, 11 Aug 2024 12:55:11 +0200
Subject: [PATCH] overall: ran gradlew migrate remigrate

---
 .../com.mbeddr.formal.base/models/typesystem.mps |  8 ++++----
 .../com.fasten.meta.linters.msd                  |  2 +-
 .../com.fasten.meta.linters.filesystem_level.mps |  2 +-
 ...eta.linters.landev_aspects.behavior_level.mps |  2 +-
 ...a.linters.landev_aspects.expression_level.mps |  2 +-
 ...ta.linters.landev_aspects.generator_level.mps |  2 +-
 .../com.fasten.meta.linters.model_level.mps      |  2 +-
 .../com.fasten.meta.linters.module_level.mps     |  2 +-
 .../com.fasten.meta.linters.nodes_level.mps      |  2 +-
 .../tmp/.gitkeep                                 |  0
 .../com.mbeddr.formal.safety.gsn.editor.mps      |  4 ++--
 .../models/com.mbeddr.formal.safety.build.mps    | 16 ++++++++++++++++
 ...r.formal.gsn._000_gsn_generic_tests@tests.mps | 10 +++++-----
 13 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/tmp/.gitkeep

diff --git a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
index b4b4e5065..7364c0445 100644
--- a/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
+++ b/code/languages/com.mbeddr.formal.nusmv/languages/com.mbeddr.formal.base/models/typesystem.mps
@@ -598,7 +598,7 @@
                     <ref role="3cqZAo" node="84ljAGCXdv" resolve="nodeUsingPrefix" />
                   </node>
                   <node concept="3Cnw8n" id="3f8ZVRYf_jS" role="1urrFz">
-                    <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                    <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                     <node concept="3CnSsL" id="3f8ZVRYf_oM" role="3Coj4f">
                       <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                       <node concept="37vLTw" id="84ljAGDg3E" role="3CoRuB">
@@ -672,7 +672,7 @@
                 <node concept="3clFbS" id="3f8ZVRYdTFI" role="3eOfB_">
                   <node concept="2MkqsV" id="3f8ZVRYdVlx" role="3cqZAp">
                     <node concept="3Cnw8n" id="3f8ZVRYfC5W" role="1urrFz">
-                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                       <node concept="3CnSsL" id="3f8ZVRYfC5X" role="3Coj4f">
                         <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                         <node concept="37vLTw" id="84ljAGDg6L" role="3CoRuB">
@@ -719,7 +719,7 @@
                       <node concept="3clFbS" id="3f8ZVRYe6LF" role="1zc67A">
                         <node concept="2MkqsV" id="3f8ZVRYe6X3" role="3cqZAp">
                           <node concept="3Cnw8n" id="3f8ZVRYfCbF" role="1urrFz">
-                            <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                            <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                             <node concept="3CnSsL" id="3f8ZVRYfCbG" role="3Coj4f">
                               <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                               <node concept="37vLTw" id="84ljAGDg9S" role="3CoRuB">
@@ -798,7 +798,7 @@
                   </node>
                   <node concept="2Mj0R9" id="3f8ZVRYe7X$" role="3cqZAp">
                     <node concept="3Cnw8n" id="3f8ZVRYfD01" role="1urrFz">
-                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_GoalStructureElementsNames_basedOnPrefix" />
+                      <ref role="QpYPw" node="3f8ZVRYftjp" resolve="fix_EntitiesNames_basedOnPrefix" />
                       <node concept="3CnSsL" id="3f8ZVRYfD02" role="3Coj4f">
                         <ref role="QkamJ" node="3f8ZVRYftxu" resolve="nodeWithPrefixedName" />
                         <node concept="37vLTw" id="84ljAGDgbq" role="3CoRuB">
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
index ba22e9704..360680030 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/com.fasten.meta.linters.msd
@@ -24,7 +24,7 @@
     <language slang="l:7866978e-a0f0-4cc7-81bc-4d213d9375e1:jetbrains.mps.lang.smodel" version="19" />
     <language slang="l:c7fb639f-be78-4307-89b0-b5959c3fa8c8:jetbrains.mps.lang.text" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-    <language slang="l:40ab19e9-751a-4433-b645-0e65160e58a0:org.mpsqa.lint.generic" version="0" />
+    <language slang="l:40ab19e9-751a-4433-b645-0e65160e58a0:org.mpsqa.lint.generic" version="1" />
   </languageVersions>
   <dependencyVersions>
     <module reference="97efeb54-e757-4c3b-b175-aa20f7476a23(com.fasten.meta.linters)" version="0" />
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
index 3800b9c96..d6a398ffd 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.filesystem_level.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
index 3cf9d2555..5b03cf4a3 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.behavior_level.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
index 5a9011dcc..1faf38ec6 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.expression_level.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
index dcaebdf1e..1489b7dd9 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.landev_aspects.generator_level.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
index 2413f0360..dde229eb4 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.model_level.mps
@@ -2,7 +2,7 @@
 <model ref="r:7f28bd12-d21d-4c95-8613-64ad2bd87166(com.fasten.meta.linters.model_level)">
   <persistence version="9" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
index f67c9abdd..ab5069183 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.module_level.mps
@@ -2,7 +2,7 @@
 <model ref="r:54059a0b-024a-42ab-b8cd-2453fed4f7ff(com.fasten.meta.linters.module_level)">
   <persistence version="9" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
index fd7d69854..0b0b8ab99 100644
--- a/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
+++ b/code/languages/com.mbeddr.formal.repo_admin/solutions/com.fasten.meta.linters/models/com.fasten.meta.linters.nodes_level.mps
@@ -3,7 +3,7 @@
   <persistence version="9" />
   <attribute name="doNotGenerate" value="false" />
   <languages>
-    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="0" />
+    <use id="40ab19e9-751a-4433-b645-0e65160e58a0" name="org.mpsqa.lint.generic" version="1" />
     <use id="7866978e-a0f0-4cc7-81bc-4d213d9375e1" name="jetbrains.mps.lang.smodel" version="19" />
     <use id="446c26eb-2b7b-4bf0-9b35-f83fa582753e" name="jetbrains.mps.lang.modelapi" version="0" />
   </languages>
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/tmp/.gitkeep b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn.doc/tmp/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
index d136f99de..5d6c15710 100644
--- a/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
+++ b/code/languages/com.mbeddr.formal.safety/languages/com.mbeddr.formal.safety.gsn/models/com.mbeddr.formal.safety.gsn.editor.mps
@@ -6785,7 +6785,7 @@
                         <property role="2bfB8j" value="true" />
                         <property role="373rjd" value="true" />
                         <ref role="1Y3XeK" to="hyam:~ActionListener" resolve="ActionListener" />
-                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" />
+                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
                         <node concept="3Tm1VV" id="YXkTXVBn9M" role="1B3o_S" />
                         <node concept="3clFb_" id="YXkTXVBn9N" role="jymVt">
                           <property role="TrG5h" value="actionPerformed" />
@@ -6833,7 +6833,7 @@
                             </node>
                           </node>
                           <node concept="2AHcQZ" id="YXkTXVBna3" role="2AJF6D">
-                            <ref role="2AI5Lk" to="wyt6:~Override" />
+                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                           </node>
                         </node>
                       </node>
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
index b784913d5..b34bdd43d 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
@@ -17311,6 +17311,22 @@
             </node>
           </node>
         </node>
+        <node concept="3rtmxn" id="63c49URuxt2" role="3bR31x">
+          <node concept="3LXTmp" id="63c49URuxt3" role="3rtmxm">
+            <node concept="3qWCbU" id="63c49URuxt4" role="3LXTna">
+              <property role="3qWCbO" value="icons/**, resources/**" />
+            </node>
+            <node concept="398BVA" id="63c49URuxt5" role="3LXTmr">
+              <ref role="398BVh" node="1FMyjUPkmcT" resolve="mbeddr.formal.safety.code" />
+              <node concept="2Ry0Ak" id="63c49URuxt6" role="iGT6I">
+                <property role="2Ry0Am" value="tests" />
+                <node concept="2Ry0Ak" id="63c49URuxt7" role="2Ry0An">
+                  <property role="2Ry0Am" value="test.mbeddr.formal.safety.argument.modelquery" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="4ziKDEngCOU" role="2G$12L">
         <property role="BnDLt" value="true" />
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps
index c01ba3ad9..7178da7ce 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.mbeddr.formal.gsn/models/test.mbeddr.formal.gsn._000_gsn_generic_tests@tests.mps
@@ -158,7 +158,7 @@
             </node>
             <node concept="2OqwBi" id="3T9YlBtr2am" role="33vP2m">
               <node concept="3xONca" id="3T9YlBtr2an" role="2Oq$k0">
-                <ref role="3xOPvv" node="3vv33A$G6VH" resolve="two_lines" />
+                <ref role="3xOPvv" node="3vv33A$G6VH" resolve="two_lines_1" />
               </node>
               <node concept="2qgKlT" id="3T9YlBtr2ao" role="2OqNvi">
                 <ref role="37wK5l" to="89jy:3T9YlBtnHHf" resolve="doFormatDescription" />
@@ -172,7 +172,7 @@
           </node>
           <node concept="2OqwBi" id="3T9YlBtr3xJ" role="3tpDZA">
             <node concept="37vLTw" id="3T9YlBtr2fa" role="2Oq$k0">
-              <ref role="3cqZAo" node="3T9YlBtr2al" resolve="doFormatDescription" />
+              <ref role="3cqZAo" node="3T9YlBtr2al" resolve="two_lines_1_formatted_description" />
             </node>
             <node concept="34oBXx" id="3T9YlBtr6zI" role="2OqNvi" />
           </node>
@@ -184,7 +184,7 @@
           <node concept="2OqwBi" id="3T9YlBtre2h" role="3tpDZA">
             <node concept="2OqwBi" id="3T9YlBtr6D3" role="2Oq$k0">
               <node concept="37vLTw" id="3T9YlBtr6Aw" role="2Oq$k0">
-                <ref role="3cqZAo" node="3T9YlBtr2al" resolve="doFormatDescription" />
+                <ref role="3cqZAo" node="3T9YlBtr2al" resolve="two_lines_1_formatted_description" />
               </node>
               <node concept="1uHKPH" id="3T9YlBtrdmP" role="2OqNvi" />
             </node>
@@ -216,7 +216,7 @@
           </node>
           <node concept="2OqwBi" id="3T9YlBtsKJ8" role="3tpDZA">
             <node concept="37vLTw" id="3T9YlBtsKJ9" role="2Oq$k0">
-              <ref role="3cqZAo" node="3T9YlBtsKJ1" resolve="doFormatDescription" />
+              <ref role="3cqZAo" node="3T9YlBtsKJ1" resolve="two_lines_2_formatted_description" />
             </node>
             <node concept="34oBXx" id="3T9YlBtsKJa" role="2OqNvi" />
           </node>
@@ -228,7 +228,7 @@
           <node concept="2OqwBi" id="3T9YlBtsKJd" role="3tpDZA">
             <node concept="2OqwBi" id="3T9YlBtsKJe" role="2Oq$k0">
               <node concept="37vLTw" id="3T9YlBtsKJf" role="2Oq$k0">
-                <ref role="3cqZAo" node="3T9YlBtsKJ1" resolve="doFormatDescription" />
+                <ref role="3cqZAo" node="3T9YlBtsKJ1" resolve="two_lines_2_formatted_description" />
               </node>
               <node concept="1uHKPH" id="3T9YlBtsKJg" role="2OqNvi" />
             </node>