Skip to content

Commit

Permalink
Merge pull request #742 from JetBrains/merge/mps20213
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20213 into maintenance/mps20222
  • Loading branch information
@alexanderpann
alexanderpann authored Jan 16, 2024
2 parents 1dee363 + 1537c37 commit 315d641
Show file tree
Hide file tree
Showing 3 changed files with 258 additions and 4 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ The project does _not_ follow Semantic Versioning and the changes are documented

## January 2024

### Fixed

- com.mbeddr.mpsutil.modellisteners: The newly supported interface listeners are now backward compatible and doesn't require regenerating the listener aspects anymore.

### Changed

- de.itemis.editor.diagram: The ELK dependencies were updated to the latest version.
Expand Down
250 changes: 250 additions & 0 deletions ...beddr.mpsutil.modellisteners.runtime/models/com/mbeddr/mpsutil/modellisteners/runtime.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
<concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
<reference id="1116615189566" name="classifier" index="3VsUkX" />
</concept>
<concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
<concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
<reference id="1170346070688" name="classifier" index="1Y3XeK" />
<child id="1201186121363" name="typeParameter" index="2Ghqu4" />
Expand Down Expand Up @@ -2807,6 +2808,39 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="7R36s5Xvqri" role="jymVt" />
<node concept="3clFbW" id="7R36s5Xvt0e" role="jymVt">
<node concept="3cqZAl" id="7R36s5Xvt0f" role="3clF45" />
<node concept="3clFbS" id="7R36s5Xvt0h" role="3clF47">
<node concept="1VxSAg" id="7R36s5XvuVT" role="3cqZAp">
<ref role="37wK5l" node="52ZF9D3cc01" resolve="ChildListener" />
<node concept="10QFUN" id="7R36s5XvvR1" role="37wK5m">
<node concept="3uibUv" id="7R36s5Xvw01" role="10QFUM">
<ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
</node>
<node concept="37vLTw" id="7R36s5Xvv7J" role="10QFUP">
<ref role="3cqZAo" node="7R36s5XvtlV" resolve="concept" />
</node>
</node>
<node concept="37vLTw" id="7R36s5Xvvz8" role="37wK5m">
<ref role="3cqZAo" node="7R36s5Xvts8" resolve="role" />
</node>
</node>
</node>
<node concept="3Tm1VV" id="7R36s5XvsOL" role="1B3o_S" />
<node concept="37vLTG" id="7R36s5XvtlV" role="3clF46">
<property role="TrG5h" value="concept" />
<node concept="3uibUv" id="7R36s5XvtlU" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
</node>
</node>
<node concept="37vLTG" id="7R36s5Xvts8" role="3clF46">
<property role="TrG5h" value="role" />
<node concept="3uibUv" id="7R36s5Xvty9" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SContainmentLink" resolve="SContainmentLink" />
</node>
</node>
</node>
<node concept="2tJIrI" id="52ZF9D3cet1" role="jymVt" />
<node concept="3clFb_" id="52ZF9D3cage" role="jymVt">
<property role="1EzhhJ" value="false" />
Expand Down Expand Up @@ -2973,6 +3007,41 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="7R36s5XvXP4" role="jymVt" />
<node concept="3clFbW" id="7R36s5XvXYg" role="jymVt">
<node concept="3cqZAl" id="7R36s5XvXYh" role="3clF45" />
<node concept="3clFbS" id="7R36s5XvXYj" role="3clF47">
<node concept="1VxSAg" id="7R36s5XvY9x" role="3cqZAp">
<ref role="37wK5l" node="5iW7uqbGJyY" resolve="ReferenceListener" />
<node concept="1eOMI4" id="7R36s5XvYbB" role="37wK5m">
<node concept="10QFUN" id="7R36s5XvYb$" role="1eOMHV">
<node concept="3uibUv" id="7R36s5XvYdc" role="10QFUM">
<ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
</node>
<node concept="37vLTw" id="7R36s5XvYhq" role="10QFUP">
<ref role="3cqZAo" node="7R36s5XvY4U" resolve="concept" />
</node>
</node>
</node>
<node concept="37vLTw" id="7R36s5XvYBR" role="37wK5m">
<ref role="3cqZAo" node="7R36s5XvY6g" resolve="role" />
</node>
</node>
</node>
<node concept="3Tm1VV" id="7R36s5XvXVe" role="1B3o_S" />
<node concept="37vLTG" id="7R36s5XvY4U" role="3clF46">
<property role="TrG5h" value="concept" />
<node concept="3uibUv" id="7R36s5XvY4T" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
</node>
</node>
<node concept="37vLTG" id="7R36s5XvY6g" role="3clF46">
<property role="TrG5h" value="role" />
<node concept="3uibUv" id="7R36s5XvY7K" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
</node>
</node>
</node>
<node concept="2tJIrI" id="5iW7uqbGJze" role="jymVt" />
<node concept="3clFb_" id="5iW7uqbGJzm" role="jymVt">
<property role="1EzhhJ" value="false" />
Expand Down Expand Up @@ -3076,6 +3145,41 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="7R36s5XvWDT" role="jymVt" />
<node concept="3clFbW" id="7R36s5XvWGO" role="jymVt">
<node concept="3cqZAl" id="7R36s5XvWGP" role="3clF45" />
<node concept="3clFbS" id="7R36s5XvWGR" role="3clF47">
<node concept="1VxSAg" id="7R36s5XvWKo" role="3cqZAp">
<ref role="37wK5l" node="5iW7uqbGSuH" resolve="ReferenceAddedListener" />
<node concept="1eOMI4" id="7R36s5XvWLT" role="37wK5m">
<node concept="10QFUN" id="7R36s5XvWLQ" role="1eOMHV">
<node concept="3uibUv" id="7R36s5XvWMH" role="10QFUM">
<ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
</node>
<node concept="37vLTw" id="7R36s5XvWR4" role="10QFUP">
<ref role="3cqZAo" node="7R36s5XvWIb" resolve="concept" />
</node>
</node>
</node>
<node concept="37vLTw" id="7R36s5XvWWx" role="37wK5m">
<ref role="3cqZAo" node="7R36s5XvWIF" resolve="role" />
</node>
</node>
</node>
<node concept="3Tm1VV" id="7R36s5XvWFF" role="1B3o_S" />
<node concept="37vLTG" id="7R36s5XvWIb" role="3clF46">
<property role="TrG5h" value="concept" />
<node concept="3uibUv" id="7R36s5XvWIa" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
</node>
</node>
<node concept="37vLTG" id="7R36s5XvWIF" role="3clF46">
<property role="TrG5h" value="role" />
<node concept="3uibUv" id="7R36s5XvWJl" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
</node>
</node>
</node>
</node>
<node concept="312cEu" id="5iW7uqbGSIA">
<property role="TrG5h" value="ReferenceRemovedListener" />
Expand Down Expand Up @@ -3114,6 +3218,41 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="7R36s5XvZ6s" role="jymVt" />
<node concept="3clFbW" id="7R36s5XvZ9L" role="jymVt">
<node concept="3cqZAl" id="7R36s5XvZ9M" role="3clF45" />
<node concept="3clFbS" id="7R36s5XvZ9O" role="3clF47">
<node concept="1VxSAg" id="7R36s5XvZfr" role="3cqZAp">
<ref role="37wK5l" node="5iW7uqbGSYW" resolve="ReferenceRemovedListener" />
<node concept="1eOMI4" id="7R36s5XvZh9" role="37wK5m">
<node concept="10QFUN" id="7R36s5XvZh6" role="1eOMHV">
<node concept="3uibUv" id="7R36s5XvZhX" role="10QFUM">
<ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
</node>
<node concept="37vLTw" id="7R36s5XvZmn" role="10QFUP">
<ref role="3cqZAo" node="7R36s5XvZbl" resolve="concept" />
</node>
</node>
</node>
<node concept="37vLTw" id="7R36s5XvZth" role="37wK5m">
<ref role="3cqZAo" node="7R36s5XvZc2" resolve="role" />
</node>
</node>
</node>
<node concept="3Tm1VV" id="7R36s5XvZ8r" role="1B3o_S" />
<node concept="37vLTG" id="7R36s5XvZbl" role="3clF46">
<property role="TrG5h" value="concept" />
<node concept="3uibUv" id="7R36s5XvZbk" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
</node>
</node>
<node concept="37vLTG" id="7R36s5XvZc2" role="3clF46">
<property role="TrG5h" value="role" />
<node concept="3uibUv" id="7R36s5XvZcG" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SReferenceLink" resolve="SReferenceLink" />
</node>
</node>
</node>
</node>
<node concept="3HP615" id="5iW7uqbOQBG">
<property role="TrG5h" value="IPropertyListener" />
Expand Down Expand Up @@ -3198,6 +3337,39 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="7R36s5XvOfr" role="jymVt" />
<node concept="3clFbW" id="7R36s5XvQWz" role="jymVt">
<node concept="3cqZAl" id="7R36s5XvQW$" role="3clF45" />
<node concept="3clFbS" id="7R36s5XvQWA" role="3clF47">
<node concept="1VxSAg" id="7R36s5XvR8s" role="3cqZAp">
<ref role="37wK5l" node="5iW7uqbPrCG" resolve="PropertyListener" />
<node concept="10QFUN" id="7R36s5XvRb0" role="37wK5m">
<node concept="3uibUv" id="7R36s5XvRcF" role="10QFUM">
<ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
</node>
<node concept="37vLTw" id="7R36s5XvRja" role="10QFUP">
<ref role="3cqZAo" node="7R36s5XvR2Q" resolve="concept" />
</node>
</node>
<node concept="37vLTw" id="7R36s5XvRlK" role="37wK5m">
<ref role="3cqZAo" node="7R36s5XvR4D" resolve="property" />
</node>
</node>
</node>
<node concept="3Tm1VV" id="7R36s5XvOjU" role="1B3o_S" />
<node concept="37vLTG" id="7R36s5XvR2Q" role="3clF46">
<property role="TrG5h" value="concept" />
<node concept="3uibUv" id="7R36s5XvR2P" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
</node>
</node>
<node concept="37vLTG" id="7R36s5XvR4D" role="3clF46">
<property role="TrG5h" value="property" />
<node concept="3uibUv" id="7R36s5XvR6g" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
</node>
</node>
</node>
<node concept="2tJIrI" id="5iW7uqbPrzP" role="jymVt" />
<node concept="3Tm1VV" id="5iW7uqbPq78" role="1B3o_S" />
<node concept="3uibUv" id="5iW7uqbPqUK" role="EKbjA">
Expand Down Expand Up @@ -3405,6 +3577,32 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="7R36s5XvZyF" role="jymVt" />
<node concept="3clFbW" id="7R36s5XvZ_k" role="jymVt">
<node concept="3cqZAl" id="7R36s5XvZ_l" role="3clF45" />
<node concept="3clFbS" id="7R36s5XvZ_n" role="3clF47">
<node concept="1VxSAg" id="7R36s5Xw0fZ" role="3cqZAp">
<ref role="37wK5l" node="5iW7uqbUR8m" resolve="RootAddedListener" />
<node concept="1eOMI4" id="7R36s5Xw0hC" role="37wK5m">
<node concept="10QFUN" id="7R36s5Xw0h_" role="1eOMHV">
<node concept="3uibUv" id="7R36s5Xw0iM" role="10QFUM">
<ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
</node>
<node concept="37vLTw" id="7R36s5Xw0nC" role="10QFUP">
<ref role="3cqZAo" node="7R36s5XvZAz" resolve="concept" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="7R36s5XvZ$f" role="1B3o_S" />
<node concept="37vLTG" id="7R36s5XvZAz" role="3clF46">
<property role="TrG5h" value="concept" />
<node concept="3uibUv" id="7R36s5XvZAy" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
</node>
</node>
</node>
</node>
<node concept="312cEu" id="5iW7uqbURds">
<property role="TrG5h" value="RootRemovedListener" />
Expand Down Expand Up @@ -3434,6 +3632,32 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="7R36s5Xw0L6" role="jymVt" />
<node concept="3clFbW" id="7R36s5Xw0NF" role="jymVt">
<node concept="3cqZAl" id="7R36s5Xw0NG" role="3clF45" />
<node concept="3clFbS" id="7R36s5Xw0NI" role="3clF47">
<node concept="1VxSAg" id="7R36s5Xw0Qy" role="3cqZAp">
<ref role="37wK5l" node="5iW7uqbURdw" resolve="RootRemovedListener" />
<node concept="1eOMI4" id="7R36s5Xw0Sb" role="37wK5m">
<node concept="10QFUN" id="7R36s5Xw0S8" role="1eOMHV">
<node concept="3uibUv" id="7R36s5Xw0Tl" role="10QFUM">
<ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
</node>
<node concept="37vLTw" id="7R36s5Xw0Yb" role="10QFUP">
<ref role="3cqZAo" node="7R36s5Xw0OU" resolve="concept" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="7R36s5Xw0ME" role="1B3o_S" />
<node concept="37vLTG" id="7R36s5Xw0OU" role="3clF46">
<property role="TrG5h" value="concept" />
<node concept="3uibUv" id="7R36s5Xw0OT" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
</node>
</node>
</node>
</node>
<node concept="312cEu" id="5iW7uqbURkH">
<property role="TrG5h" value="RootBeforeRemovedListener" />
Expand Down Expand Up @@ -3463,6 +3687,32 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="7R36s5Xw0sR" role="jymVt" />
<node concept="3clFbW" id="7R36s5Xw0vs" role="jymVt">
<node concept="3cqZAl" id="7R36s5Xw0vt" role="3clF45" />
<node concept="3clFbS" id="7R36s5Xw0vv" role="3clF47">
<node concept="1VxSAg" id="7R36s5Xw0zH" role="3cqZAp">
<ref role="37wK5l" node="5iW7uqbURkL" resolve="RootBeforeRemovedListener" />
<node concept="1eOMI4" id="7R36s5Xw0_m" role="37wK5m">
<node concept="10QFUN" id="7R36s5Xw0_j" role="1eOMHV">
<node concept="3uibUv" id="7R36s5Xw0Aw" role="10QFUM">
<ref role="3uigEE" to="c17a:~SAbstractConcept" resolve="SAbstractConcept" />
</node>
<node concept="37vLTw" id="7R36s5Xw0Fm" role="10QFUP">
<ref role="3cqZAo" node="7R36s5Xw0wF" resolve="concept" />
</node>
</node>
</node>
</node>
</node>
<node concept="3Tm1VV" id="7R36s5Xw0ur" role="1B3o_S" />
<node concept="37vLTG" id="7R36s5Xw0wF" role="3clF46">
<property role="TrG5h" value="concept" />
<node concept="3uibUv" id="7R36s5Xw0wE" role="1tU5fm">
<ref role="3uigEE" to="c17a:~SConcept" resolve="SConcept" />
</node>
</node>
</node>
</node>
<node concept="312cEu" id="ncHX0ORFPi">
<property role="3GE5qa" value="" />
Expand Down
8 changes: 4 additions & 4 deletions code/modellisteners/com.mbeddr.mpsutil.modellisteners/generator/template/[email protected]
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
<node concept="1Y3b0j" id="52ZF9D3d0d_" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="1Y3XeK" to="slod:52ZF9D3ca19" resolve="ChildListener" />
<ref role="37wK5l" to="slod:52ZF9D3cc01" resolve="ChildListener" />
<ref role="37wK5l" to="slod:7R36s5Xvt0e" resolve="ChildListener" />
<node concept="3Tm1VV" id="52ZF9D3d0dA" role="1B3o_S" />
<node concept="35c_gC" id="52ZF9D3cSsV" role="37wK5m">
<ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
Expand Down Expand Up @@ -428,7 +428,7 @@
<node concept="1Y3b0j" id="52ZF9D3ed6F" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="1Y3XeK" to="slod:52ZF9D3ca19" resolve="ChildListener" />
<ref role="37wK5l" to="slod:52ZF9D3cc01" resolve="ChildListener" />
<ref role="37wK5l" to="slod:7R36s5Xvt0e" resolve="ChildListener" />
<node concept="3Tm1VV" id="52ZF9D3ed6G" role="1B3o_S" />
<node concept="35c_gC" id="52ZF9D3ed6H" role="37wK5m">
<ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
Expand Down Expand Up @@ -571,7 +571,7 @@
<node concept="1Y3b0j" id="52ZF9D3ees5" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="1Y3XeK" to="slod:52ZF9D3ca19" resolve="ChildListener" />
<ref role="37wK5l" to="slod:52ZF9D3cc01" resolve="ChildListener" />
<ref role="37wK5l" to="slod:7R36s5Xvt0e" resolve="ChildListener" />
<node concept="3Tm1VV" id="52ZF9D3ees6" role="1B3o_S" />
<node concept="35c_gC" id="52ZF9D3ees7" role="37wK5m">
<ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
Expand Down Expand Up @@ -1012,7 +1012,7 @@
<node concept="1Y3b0j" id="5iW7uqbPCyj" role="YeSDq">
<property role="2bfB8j" value="true" />
<ref role="1Y3XeK" to="slod:5iW7uqbPq77" resolve="PropertyListener" />
<ref role="37wK5l" to="slod:5iW7uqbPrCG" resolve="PropertyListener" />
<ref role="37wK5l" to="slod:7R36s5XvQWz" resolve="PropertyListener" />
<node concept="3Tm1VV" id="5iW7uqbPCyk" role="1B3o_S" />
<node concept="35c_gC" id="5iW7uqbPCyl" role="37wK5m">
<ref role="35c_gD" to="tpck:gw2VY9q" resolve="BaseConcept" />
Expand Down

0 comments on commit 315d641

Please sign in to comment.