Merge pull request #290 from mbeddr/merge/MPS-2024.1

Merge maintenance/MPS-2023.2 into maintenance/MPS-2024.1

Author: Alexander Pann

code/languages/org.mpsqa.arch/languages/org.mpsqa.arch/models/org.mpsqa.arch.behavior.mps

@@ -625,14 +625,14 @@
         <node concept="3cpWs8" id="fm3v0WWNEK" role="3cqZAp">
           <node concept="3cpWsn" id="fm3v0WWNEL" role="3cpWs9">
             <property role="TrG5h" value="allModules" />
+            <node concept="BsUDl" id="fm3v0WWNEM" role="33vP2m">
+              <ref role="37wK5l" node="fm3v0WRLT8" resolve="getModulesOnWhichThisModuleDepends" />
+            </node>
             <node concept="2hMVRd" id="2pcEbw5tgIr" role="1tU5fm">
               <node concept="3uibUv" id="2pcEbw5tgIt" role="2hN53Y">
                 <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
               </node>
             </node>
-            <node concept="BsUDl" id="fm3v0WWNEM" role="33vP2m">
-              <ref role="37wK5l" node="fm3v0WRLT8" resolve="getModulesOnWhichThisModuleDepends" />
-            </node>
           </node>
         </node>
         <node concept="3clFbF" id="fm3v0WWQV4" role="3cqZAp">
@@ -795,11 +795,6 @@
     <node concept="13i0hz" id="fm3v0WRLT8" role="13h7CS">
       <property role="TrG5h" value="getModulesOnWhichThisModuleDepends" />
       <node concept="3Tm1VV" id="fm3v0WRLT9" role="1B3o_S" />
-      <node concept="2hMVRd" id="2pcEbw5sWad" role="3clF45">
-        <node concept="3uibUv" id="2pcEbw5sWaf" role="2hN53Y">
-          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
-        </node>
-      </node>
       <node concept="3clFbS" id="fm3v0WRLTb" role="3clF47">
         <node concept="3cpWs8" id="fm3v0WXjzt" role="3cqZAp">
           <node concept="3cpWsn" id="fm3v0WXjzu" role="3cpWs9">
@@ -1217,6 +1212,11 @@
           </node>
         </node>
       </node>
+      <node concept="2hMVRd" id="2pcEbw5sWad" role="3clF45">
+        <node concept="3uibUv" id="2pcEbw5sWaf" role="2hN53Y">
+          <ref role="3uigEE" to="lui2:~SModule" resolve="SModule" />
+        </node>
+      </node>
     </node>
     <node concept="13i0hz" id="fm3v0WTSU$" role="13h7CS">
       <property role="TrG5h" value="getUsedLanguages" />

code/languages/org.mpsqa.lint/languages/org.mpsqa.lint.generic/models/org.mpsqa.lint.generic.typesystem.mps

@@ -28,11 +28,6 @@
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" />
     <import index="vndm" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel.language(MPS.Core/)" />
     <import index="w1kc" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.smodel(MPS.Core/)" />
-    <import index="b9kz" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm.ex(MPS.IDEA/)" />
-    <import index="g1qu" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.util.ui(MPS.IDEA/)" />
-    <import index="jkny" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.wm(MPS.IDEA/)" />
-    <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
-    <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
     <import index="z1c4" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.project(MPS.Platform/)" />
     <import index="qqy" ref="r:baac1a2f-1e52-45fa-95c5-02a3dfae441c(org.mpsqa.lint.generic.util)" />
     <import index="3a50" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide(MPS.Platform/)" />