Merge pull request #2438 from mbeddr/merge/mps20222

Merge maintenance/mps20222 into maintenance/mps20223
mbeddr · May 16, 2024 · b67f491 · b67f491
2 parents 1f6e8d8 + c5f0465
commit b67f491
Show file tree

Hide file tree

Showing 7 changed files with 3,765 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The project does _not_ follow
 Semantic Versioning and the changes are simply documented in reverse chronological order, grouped by calendar month.
 
+# May 2024
+
+## com.mbeddr.core
+
+### Added
+
+- The image aspect ratio is now kept when scaling the image in the presentation mode down to the maximum size.
+- Antialising is now activated for images displayed in the presentation mode.
+
+## com.mbeddr.mpsutil
+
+### Added
+
+- A new generic class `Traversal<T>` is provided. It allows to do breadth-first traversals on data structures like graphs or trees. It is robust against cycles.
+
 # April 2024
 
 ## com.mbeddr.core

diff --git a/...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps b/...uages/com.mbeddr.build/solutions/com.mbeddr.platform/models/com/mbeddr/platform/build.mps
@@ -22858,11 +22858,6 @@
             <ref role="3bR37D" node="5fGcQI947Ca" resolve="com.mbeddr.mpsutil.common" />
           </node>
         </node>
-        <node concept="1SiIV0" id="9jWrhFpXqx" role="3bR37C">
-          <node concept="3bR9La" id="9jWrhFpXqy" role="1SiIV1">
-            <ref role="3bR37D" to="90a9:PE3B26QCrP" resolve="org.apache.commons" />
-          </node>
-        </node>
         <node concept="1BupzO" id="9jWrhFpXqP" role="3bR31x">
           <property role="3ZfqAx" value="models" />
           <property role="1Hdu6h" value="true" />
@@ -22885,6 +22880,16 @@
             </node>
           </node>
         </node>
+        <node concept="1SiIV0" id="QrefRhijNV" role="3bR37C">
+          <node concept="3bR9La" id="QrefRhijNW" role="1SiIV1">
+            <ref role="3bR37D" to="ffeo:1ia2VB5guYy" resolve="MPS.IDEA" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="QrefRhijNX" role="3bR37C">
+          <node concept="3bR9La" id="QrefRhijNY" role="1SiIV1">
+            <ref role="3bR37D" node="vOGyTeKpB6" resolve="com.mbeddr.mpsutil.ecore.stubs" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="4_9e_MLhX80" role="2G$12L">
         <property role="BnDLt" value="true" />

diff --git a/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps b/code/languages/com.mbeddr.doc/languages/com.mbeddr.doc/languageModels/editor.mps
@@ -20,6 +20,7 @@
     <use id="28f9e497-3b42-4291-aeba-0a1039153ab1" name="jetbrains.mps.lang.plugin" version="5" />
     <use id="774bf8a0-62e5-41e1-af63-f4812e60e48b" name="jetbrains.mps.baseLanguage.checkedDots" version="0" />
     <use id="9d69e719-78c8-4286-90db-fb19c107d049" name="com.mbeddr.mpsutil.grammarcells" version="2" />
+    <use id="443f4c36-fcf5-4eb6-9500-8d06ed259e3e" name="jetbrains.mps.baseLanguage.classifiers" version="0" />
     <devkit ref="fbc25dd2-5da4-483a-8b19-70928e1b62d7(jetbrains.mps.devkit.general-purpose)" />
   </languages>
   <imports>
@@ -31,7 +32,6 @@
     <import index="87nw" ref="r:ca2ab6bb-f6e7-4c0f-a88c-b78b9b31fff3(de.slisson.mps.richtext.structure)" />
     <import index="grvc" ref="b4d28e19-7d2d-47e9-943e-3a41f97a0e52/r:e4b7e230-de2a-46ac-9f53-996b361d25ef(com.mbeddr.mpsutil.plantuml.node/com.mbeddr.mpsutil.plantuml.node.behavior)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="kt01" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.datatransfer(JDK/)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="zf81" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.net(JDK/)" />
@@ -76,15 +76,15 @@
     <import index="k4pk" ref="c0488c1e-322f-4f38-92d4-5520a7ce96c1/r:e053bdde-b82f-4d5b-a735-e0af382d4ef2(com.mbeddr.mpsutil.plantuml.pluginSolution/com.mbeddr.mpsutil.plantuml.pluginSolution.plugin)" />
     <import index="4nm9" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.openapi.project(MPS.IDEA/)" />
     <import index="alof" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.project(MPS.Platform/)" />
-    <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" implicit="true" />
-    <import index="kwxp" ref="b4d28e19-7d2d-47e9-943e-3a41f97a0e52/r:4903509f-5416-46ff-9a8b-44b5a178b568(com.mbeddr.mpsutil.plantuml.node/com.mbeddr.mpsutil.plantuml.node.structure)" implicit="true" />
-    <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" implicit="true" />
-    <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" implicit="true" />
-    <import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" implicit="true" />
-    <import index="xlb7" ref="r:cf42fd0a-68d2-493b-8b77-961658617704(jetbrains.mps.lang.modelapi.behavior)" implicit="true" />
-    <import index="lwvz" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.selection(MPS.Editor/)" implicit="true" />
-    <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" implicit="true" />
-    <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" implicit="true" />
+    <import index="tpen" ref="r:00000000-0000-4000-0000-011c895902c3(jetbrains.mps.baseLanguage.editor)" />
+    <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" />
+    <import index="xlb7" ref="r:cf42fd0a-68d2-493b-8b77-961658617704(jetbrains.mps.lang.modelapi.behavior)" />
+    <import index="lwvz" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.selection(MPS.Editor/)" />
+    <import index="vs0r" ref="r:f7764ca4-8c75-4049-922b-08516400a727(com.mbeddr.core.base.structure)" />
+    <import index="dvox" ref="r:9dfd3567-3b1f-4edb-85a0-3981ca2bfd8c(jetbrains.mps.lang.modelapi.structure)" />
+    <import index="kwxp" ref="b4d28e19-7d2d-47e9-943e-3a41f97a0e52/r:4903509f-5416-46ff-9a8b-44b5a178b568(com.mbeddr.mpsutil.plantuml.node/com.mbeddr.mpsutil.plantuml.node.structure)" />
+    <import index="tbr6" ref="r:6a005c26-87c0-43c4-8cf3-49ffba1099df(de.slisson.mps.richtext.behavior)" />
+    <import index="71xd" ref="742f6602-5a2f-4313-aa6e-ae1cd4ffdc61/java:jetbrains.mps.ide.tools(MPS.Platform/)" />
   </imports>
   <registry>
     <language id="a247e09e-2435-45ba-b8d2-07e93feba96a" name="jetbrains.mps.baseLanguage.tuples">
@@ -486,6 +486,7 @@
       </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
+      <concept id="1070534436861" name="jetbrains.mps.baseLanguage.structure.FloatType" flags="in" index="10OMs4" />
       <concept id="1070534513062" name="jetbrains.mps.baseLanguage.structure.DoubleType" flags="in" index="10P55v" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
       <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
@@ -12923,15 +12924,11 @@
             </node>
           </node>
         </node>
-        <node concept="3clFbF" id="7$0InQiQylY" role="3cqZAp">
-          <node concept="37vLTI" id="7$0InQiQ_kJ" role="3clFbG">
-            <node concept="2OqwBi" id="7$0InQiQzi6" role="37vLTJ">
-              <node concept="Xjq3P" id="7$0InQiQylW" role="2Oq$k0" />
-              <node concept="2OwXpG" id="7$0InQiQ$m8" role="2OqNvi">
-                <ref role="2Oxat5" node="7$0InQiQfHT" resolve="width" />
-              </node>
-            </node>
-            <node concept="3K4zz7" id="7$0InQiQOS7" role="37vLTx">
+        <node concept="3cpWs8" id="1za3inKvghJ" role="3cqZAp">
+          <node concept="3cpWsn" id="1za3inKvghM" role="3cpWs9">
+            <property role="TrG5h" value="newWidth" />
+            <node concept="10OMs4" id="1za3inK_1Fb" role="1tU5fm" />
+            <node concept="3K4zz7" id="7$0InQiQOS7" role="33vP2m">
               <node concept="2OqwBi" id="7$0InQiQRkS" role="3K4GZi">
                 <node concept="37vLTw" id="7$0InQiQPOL" role="2Oq$k0">
                   <ref role="3cqZAo" node="7$0InQiL72O" resolve="imageIcon" />
@@ -12964,6 +12961,43 @@
             </node>
           </node>
         </node>
+        <node concept="3cpWs8" id="1za3inKvz1i" role="3cqZAp">
+          <node concept="3cpWsn" id="1za3inKvz1l" role="3cpWs9">
+            <property role="TrG5h" value="newAspectRatio" />
+            <node concept="10OMs4" id="1za3inKvz1g" role="1tU5fm" />
+            <node concept="FJ1c_" id="1za3inKy2$7" role="33vP2m">
+              <node concept="37vLTw" id="1za3inKy3TG" role="3uHU7w">
+                <ref role="3cqZAo" node="1za3inKvghM" resolve="newWidth" />
+              </node>
+              <node concept="2OqwBi" id="1za3inKAPZE" role="3uHU7B">
+                <node concept="37vLTw" id="1za3inKAPZF" role="2Oq$k0">
+                  <ref role="3cqZAo" node="7$0InQiL72O" resolve="imageIcon" />
+                </node>
+                <node concept="liA8E" id="1za3inKAPZG" role="2OqNvi">
+                  <ref role="37wK5l" to="dxuu:~ImageIcon.getIconWidth()" resolve="getIconWidth" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7$0InQiQylY" role="3cqZAp">
+          <node concept="37vLTI" id="7$0InQiQ_kJ" role="3clFbG">
+            <node concept="2OqwBi" id="7$0InQiQzi6" role="37vLTJ">
+              <node concept="Xjq3P" id="7$0InQiQylW" role="2Oq$k0" />
+              <node concept="2OwXpG" id="7$0InQiQ$m8" role="2OqNvi">
+                <ref role="2Oxat5" node="7$0InQiQfHT" resolve="width" />
+              </node>
+            </node>
+            <node concept="1eOMI4" id="1za3inK_hym" role="37vLTx">
+              <node concept="10QFUN" id="1za3inK_hyj" role="1eOMHV">
+                <node concept="10Oyi0" id="1za3inK_hyo" role="10QFUM" />
+                <node concept="37vLTw" id="1za3inK_m9r" role="10QFUP">
+                  <ref role="3cqZAo" node="1za3inKvghM" resolve="newWidth" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="7$0InQiQFzH" role="3cqZAp">
           <node concept="37vLTI" id="7$0InQiQIpg" role="3clFbG">
             <node concept="2OqwBi" id="7$0InQiQG8J" role="37vLTJ">
@@ -12972,17 +13006,26 @@
                 <ref role="2Oxat5" node="7$0InQiQhoy" resolve="height" />
               </node>
             </node>
-            <node concept="2OqwBi" id="7$0InQiNG$j" role="37vLTx">
-              <node concept="37vLTw" id="7$0InQiNG0V" role="2Oq$k0">
-                <ref role="3cqZAo" node="7$0InQiL72O" resolve="imageIcon" />
-              </node>
-              <node concept="liA8E" id="7$0InQiNH1N" role="2OqNvi">
-                <ref role="37wK5l" to="dxuu:~ImageIcon.getIconHeight()" resolve="getIconHeight" />
+            <node concept="10QFUN" id="1za3inKwfiO" role="37vLTx">
+              <node concept="1eOMI4" id="1za3inKw1Vc" role="10QFUP">
+                <node concept="FJ1c_" id="1za3inKvSxj" role="1eOMHV">
+                  <node concept="37vLTw" id="1za3inKvVye" role="3uHU7w">
+                    <ref role="3cqZAo" node="1za3inKvz1l" resolve="newAspectRatio" />
+                  </node>
+                  <node concept="2OqwBi" id="7$0InQiNG$j" role="3uHU7B">
+                    <node concept="37vLTw" id="7$0InQiNG0V" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7$0InQiL72O" resolve="imageIcon" />
+                    </node>
+                    <node concept="liA8E" id="7$0InQiNH1N" role="2OqNvi">
+                      <ref role="37wK5l" to="dxuu:~ImageIcon.getIconHeight()" resolve="getIconHeight" />
+                    </node>
+                  </node>
+                </node>
               </node>
+              <node concept="10Oyi0" id="1za3inKwfiP" role="10QFUM" />
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="7$0InQj1Lyq" role="3cqZAp" />
         <node concept="3cpWs6" id="7$0InQj1Mrc" role="3cqZAp">
           <node concept="Xjq3P" id="7$0InQj1W3z" role="3cqZAk" />
         </node>
@@ -13066,6 +13109,61 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="1za3inKImcw" role="3cqZAp">
+          <node concept="2OqwBi" id="1za3inKIpOY" role="3clFbG">
+            <node concept="37vLTw" id="1za3inKIn$5" role="2Oq$k0">
+              <ref role="3cqZAo" node="7$0InQiL73Q" resolve="g2d" />
+            </node>
+            <node concept="liA8E" id="1za3inKIpOZ" role="2OqNvi">
+              <ref role="37wK5l" to="z60i:~Graphics2D.setRenderingHint(java.awt.RenderingHints$Key,java.lang.Object)" resolve="setRenderingHint" />
+              <node concept="10M0yZ" id="1za3inKIpP0" role="37wK5m">
+                <ref role="1PxDUh" to="z60i:~RenderingHints" resolve="RenderingHints" />
+                <ref role="3cqZAo" to="z60i:~RenderingHints.KEY_INTERPOLATION" resolve="KEY_INTERPOLATION" />
+              </node>
+              <node concept="10M0yZ" id="1za3inKYqs6" role="37wK5m">
+                <ref role="3cqZAo" to="z60i:~RenderingHints.VALUE_INTERPOLATION_BILINEAR" resolve="VALUE_INTERPOLATION_BILINEAR" />
+                <ref role="1PxDUh" to="z60i:~RenderingHints" resolve="RenderingHints" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1za3inKImc$" role="3cqZAp">
+          <node concept="2OqwBi" id="1za3inKIqx7" role="3clFbG">
+            <node concept="37vLTw" id="1za3inKIneb" role="2Oq$k0">
+              <ref role="3cqZAo" node="7$0InQiL73Q" resolve="g2d" />
+            </node>
+            <node concept="liA8E" id="1za3inKIqx8" role="2OqNvi">
+              <ref role="37wK5l" to="z60i:~Graphics2D.setRenderingHint(java.awt.RenderingHints$Key,java.lang.Object)" resolve="setRenderingHint" />
+              <node concept="10M0yZ" id="1za3inKIqx9" role="37wK5m">
+                <ref role="1PxDUh" to="z60i:~RenderingHints" resolve="RenderingHints" />
+                <ref role="3cqZAo" to="z60i:~RenderingHints.KEY_RENDERING" resolve="KEY_RENDERING" />
+              </node>
+              <node concept="10M0yZ" id="1za3inKIqxa" role="37wK5m">
+                <ref role="1PxDUh" to="z60i:~RenderingHints" resolve="RenderingHints" />
+                <ref role="3cqZAo" to="z60i:~RenderingHints.VALUE_RENDER_QUALITY" resolve="VALUE_RENDER_QUALITY" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="1za3inKImcC" role="3cqZAp">
+          <node concept="2OqwBi" id="1za3inKIq3c" role="3clFbG">
+            <node concept="37vLTw" id="1za3inKInTv" role="2Oq$k0">
+              <ref role="3cqZAo" node="7$0InQiL73Q" resolve="g2d" />
+            </node>
+            <node concept="liA8E" id="1za3inKIq3d" role="2OqNvi">
+              <ref role="37wK5l" to="z60i:~Graphics2D.setRenderingHint(java.awt.RenderingHints$Key,java.lang.Object)" resolve="setRenderingHint" />
+              <node concept="10M0yZ" id="1za3inKIq3e" role="37wK5m">
+                <ref role="1PxDUh" to="z60i:~RenderingHints" resolve="RenderingHints" />
+                <ref role="3cqZAo" to="z60i:~RenderingHints.KEY_ANTIALIASING" resolve="KEY_ANTIALIASING" />
+              </node>
+              <node concept="10M0yZ" id="1za3inKIq3f" role="37wK5m">
+                <ref role="1PxDUh" to="z60i:~RenderingHints" resolve="RenderingHints" />
+                <ref role="3cqZAo" to="z60i:~RenderingHints.VALUE_ANTIALIAS_ON" resolve="VALUE_ANTIALIAS_ON" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="1za3inKIjpa" role="3cqZAp" />
         <node concept="3cpWs8" id="7$0InQiL73g" role="3cqZAp">
           <node concept="3cpWsn" id="7$0InQiL73f" role="3cpWs9">
             <property role="TrG5h" value="imageWidth" />

diff --git a/code/languages/com.mbeddr.mpsutil/.mps/modules.xml b/code/languages/com.mbeddr.mpsutil/.mps/modules.xml
@@ -193,12 +193,6 @@
       <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.contextactions/tests.com.mbeddr.mpsutil.contextactions.msd" folder="rest.contextActions" />
       <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.ecore.modelImportExport/test.com.mbeddr.mpsutil.ecore.modelImportExport.msd" folder="rest.ecore.tests" />
       <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.ecoreimporter.runtime/test.com.mbeddr.mpsutil.ecore.metaModelImport.msd" folder="rest.ecore.tests" />
-      <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage1.mpl" folder="rest.ecore.tests.modelImporterExporterLanguages" />
-      <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage2.mpl" folder="rest.ecore.tests.modelImporterExporterLanguages" />
-      <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage3.mpl" folder="rest.ecore.tests.modelImporterExporterLanguages" />
-      <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage4.mpl" folder="rest.ecore.tests.modelImporterExporterLanguages" />
-      <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage5.mpl" folder="rest.ecore.tests.modelImporterExporterLanguages" />
-      <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6/test.com.mbeddr.mpsutil.ecoretransformation.modelImportExport.testLanguage6.mpl" folder="rest.ecore.tests.modelImporterExporterLanguages" />
       <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.extensionclass/test.com.mbeddr.mpsutil.extensionclass.msd" folder="staging.extensionclass" />
       <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.iconchar.test/test.com.mbeddr.mpsutil.iconchar.test.msd" folder="stable.iconchar" />
       <modulePath path="$PROJECT_DIR$/tests/test.com.mbeddr.mpsutil.iconchar/test.com.mbeddr.mpsutil.iconchar.mpl" folder="stable.iconchar" />