Skip to content

Commit 5a86d3f

Browse files
dbinkeledbinkele
authored
Merge pull request #1464 from IETS3/merge/mps20241
Merge maintenance/mps20241 into maintenance/mps20251
2 parents c338a44 + 2ca3828 commit 5a86d3f

File tree

1 file changed

+202
-35
lines changed

1 file changed

+202
-35
lines changed

‎code/languages/org.iets3.opensource/languages/org.iets3.variability.artifacts.base/models/org.iets3.variability.artifacts.base.plugin.mps‎

Lines changed: 202 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,15 @@
110110
</concept>
111111
<concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
112112
<reference id="1188208074048" name="annotation" index="2AI5Lk" />
113+
<child id="1188214630783" name="value" index="2B76xF" />
113114
</concept>
114115
<concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ngI" index="2AJDlI">
115116
<child id="1188208488637" name="annotation" index="2AJF6D" />
116117
</concept>
118+
<concept id="1188214545140" name="jetbrains.mps.baseLanguage.structure.AnnotationInstanceValue" flags="ng" index="2B6LJw">
119+
<reference id="1188214555875" name="key" index="2B6OnR" />
120+
<child id="1188214607812" name="value" index="2B70Vg" />
121+
</concept>
117122
<concept id="1095950406618" name="jetbrains.mps.baseLanguage.structure.DivExpression" flags="nn" index="FJ1c_" />
118123
<concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
119124
<reference id="2820489544401957798" name="classifier" index="HV5vE" />
@@ -321,6 +326,7 @@
321326
<concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
322327
<reference id="1116615189566" name="classifier" index="3VsUkX" />
323328
</concept>
329+
<concept id="1178893518978" name="jetbrains.mps.baseLanguage.structure.ThisConstructorInvocation" flags="nn" index="1VxSAg" />
324330
<concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
325331
<concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
326332
<reference id="1170346070688" name="classifier" index="1Y3XeK" />
@@ -16751,18 +16757,32 @@
1675116757
<property role="3GE5qa" value="filtering" />
1675216758
<property role="TrG5h" value="FilteringError" />
1675316759
<node concept="3Tm1VV" id="79xAww0fFxX" role="1B3o_S" />
16754-
<node concept="312cEg" id="79xAww0fIqA" role="jymVt">
16755-
<property role="TrG5h" value="location" />
16760+
<node concept="312cEg" id="7dVHCAJ2miA" role="jymVt">
16761+
<property role="TrG5h" value="config" />
1675616762
<property role="3TUv4t" value="true" />
16757-
<node concept="3Tm6S6" id="79xAww0fIqB" role="1B3o_S" />
16758-
<node concept="17QB3L" id="79xAww0ZmIH" role="1tU5fm" />
16763+
<node concept="3Tm6S6" id="7dVHCAJ27Uz" role="1B3o_S" />
16764+
<node concept="3Tqbb2" id="7dVHCAJ2mfU" role="1tU5fm">
16765+
<ref role="ehGHo" to="4ndm:5NPKd17BG$l" resolve="FeatureModelConfiguration" />
16766+
</node>
1675916767
</node>
1676016768
<node concept="312cEg" id="79xAww0fIqD" role="jymVt">
1676116769
<property role="TrG5h" value="message" />
1676216770
<property role="3TUv4t" value="true" />
1676316771
<node concept="3Tm6S6" id="79xAww0fIqE" role="1B3o_S" />
1676416772
<node concept="17QB3L" id="79xAww0fIqF" role="1tU5fm" />
1676516773
</node>
16774+
<node concept="312cEg" id="79xAww0fIqA" role="jymVt">
16775+
<property role="TrG5h" value="locationPath" />
16776+
<property role="3TUv4t" value="true" />
16777+
<node concept="3Tm6S6" id="79xAww0fIqB" role="1B3o_S" />
16778+
<node concept="17QB3L" id="79xAww0ZmIH" role="1tU5fm" />
16779+
</node>
16780+
<node concept="312cEg" id="7dVHCAJw1lS" role="jymVt">
16781+
<property role="TrG5h" value="locationNode" />
16782+
<property role="3TUv4t" value="true" />
16783+
<node concept="3Tm6S6" id="7dVHCAJvh8e" role="1B3o_S" />
16784+
<node concept="3Tqbb2" id="7dVHCAJvCEA" role="1tU5fm" />
16785+
</node>
1676616786
<node concept="2tJIrI" id="79xAww0fIqG" role="jymVt" />
1676716787
<node concept="3clFbW" id="79xAww0fIqH" role="jymVt">
1676816788
<node concept="37vLTG" id="79xAww0fIqI" role="3clF46">
@@ -16778,61 +16798,208 @@
1677816798
<node concept="3cqZAl" id="79xAww0fIqM" role="3clF45" />
1677916799
<node concept="3Tm1VV" id="79xAww0fIqN" role="1B3o_S" />
1678016800
<node concept="3clFbS" id="79xAww0fIqO" role="3clF47">
16781-
<node concept="3clFbF" id="79xAww0fIqP" role="3cqZAp">
16782-
<node concept="37vLTI" id="79xAww0fIqQ" role="3clFbG">
16783-
<node concept="2OqwBi" id="79xAww0ZnP8" role="37vLTx">
16784-
<node concept="37vLTw" id="79xAww0fIqR" role="2Oq$k0">
16785-
<ref role="3cqZAo" node="79xAww0fIqI" resolve="ap" />
16801+
<node concept="1VxSAg" id="7dVHCAJ5zh7" role="3cqZAp">
16802+
<ref role="37wK5l" node="7dVHCAJ57mQ" resolve="FilteringError" />
16803+
<node concept="10Nm6u" id="7dVHCAJ5zCl" role="37wK5m" />
16804+
<node concept="37vLTw" id="7dVHCAJ5$pi" role="37wK5m">
16805+
<ref role="3cqZAo" node="79xAww0fIqI" resolve="ap" />
16806+
</node>
16807+
<node concept="37vLTw" id="7dVHCAJ5_5t" role="37wK5m">
16808+
<ref role="3cqZAo" node="79xAww0fIqK" resolve="message" />
16809+
</node>
16810+
<node concept="10Nm6u" id="7dVHCAJxLXI" role="37wK5m" />
16811+
</node>
16812+
</node>
16813+
<node concept="2AHcQZ" id="7dVHCAJ5_GA" role="2AJF6D">
16814+
<ref role="2AI5Lk" to="wyt6:~Deprecated" resolve="Deprecated" />
16815+
<node concept="2B6LJw" id="7dVHCAJ5NxJ" role="2B76xF">
16816+
<ref role="2B6OnR" to="wyt6:~Deprecated.since()" resolve="since" />
16817+
<node concept="Xl_RD" id="7dVHCAJ5UrY" role="2B70Vg">
16818+
<property role="Xl_RC" value="2025-10-01" />
16819+
</node>
16820+
</node>
16821+
</node>
16822+
</node>
16823+
<node concept="2tJIrI" id="7dVHCAJ4Ko9" role="jymVt" />
16824+
<node concept="3clFbW" id="7dVHCAJ57mQ" role="jymVt">
16825+
<node concept="37vLTG" id="7dVHCAJ5lnn" role="3clF46">
16826+
<property role="TrG5h" value="config" />
16827+
<node concept="3Tqbb2" id="7dVHCAJ5lno" role="1tU5fm">
16828+
<ref role="ehGHo" to="4ndm:5NPKd17BG$l" resolve="FeatureModelConfiguration" />
16829+
</node>
16830+
</node>
16831+
<node concept="37vLTG" id="7dVHCAJ5lnp" role="3clF46">
16832+
<property role="TrG5h" value="ap" />
16833+
<node concept="3uibUv" id="7dVHCAJ5lnq" role="1tU5fm">
16834+
<ref role="3uigEE" to="i05g:5LihCoMh$14" resolve="ArtifactPath" />
16835+
</node>
16836+
</node>
16837+
<node concept="37vLTG" id="7dVHCAJ5lnr" role="3clF46">
16838+
<property role="TrG5h" value="message" />
16839+
<node concept="17QB3L" id="7dVHCAJ5lns" role="1tU5fm" />
16840+
</node>
16841+
<node concept="37vLTG" id="7dVHCAJweEu" role="3clF46">
16842+
<property role="TrG5h" value="location" />
16843+
<node concept="3Tqbb2" id="7dVHCAJwr5B" role="1tU5fm" />
16844+
</node>
16845+
<node concept="3cqZAl" id="7dVHCAJ57mS" role="3clF45" />
16846+
<node concept="3Tm1VV" id="7dVHCAJ57mT" role="1B3o_S" />
16847+
<node concept="3clFbS" id="7dVHCAJ57mU" role="3clF47">
16848+
<node concept="3clFbF" id="7dVHCAJ5lrJ" role="3cqZAp">
16849+
<node concept="37vLTI" id="7dVHCAJ5lrK" role="3clFbG">
16850+
<node concept="37vLTw" id="7dVHCAJ5lrL" role="37vLTx">
16851+
<ref role="3cqZAo" node="7dVHCAJ5lnn" resolve="config" />
16852+
</node>
16853+
<node concept="2OqwBi" id="7dVHCAJ5lrM" role="37vLTJ">
16854+
<node concept="Xjq3P" id="7dVHCAJ5lrN" role="2Oq$k0" />
16855+
<node concept="2OwXpG" id="7dVHCAJ5lrO" role="2OqNvi">
16856+
<ref role="2Oxat5" node="7dVHCAJ2miA" resolve="config" />
1678616857
</node>
16787-
<node concept="liA8E" id="79xAww0ZpLv" role="2OqNvi">
16858+
</node>
16859+
</node>
16860+
</node>
16861+
<node concept="3clFbF" id="7dVHCAJ5ls1" role="3cqZAp">
16862+
<node concept="37vLTI" id="7dVHCAJ5ls2" role="3clFbG">
16863+
<node concept="37vLTw" id="7dVHCAJ5ls3" role="37vLTx">
16864+
<ref role="3cqZAo" node="7dVHCAJ5lnr" resolve="message" />
16865+
</node>
16866+
<node concept="2OqwBi" id="7dVHCAJ5ls4" role="37vLTJ">
16867+
<node concept="Xjq3P" id="7dVHCAJ5ls5" role="2Oq$k0" />
16868+
<node concept="2OwXpG" id="7dVHCAJ5ls6" role="2OqNvi">
16869+
<ref role="2Oxat5" node="79xAww0fIqD" resolve="message" />
16870+
</node>
16871+
</node>
16872+
</node>
16873+
</node>
16874+
<node concept="3clFbF" id="7dVHCAJ5lrR" role="3cqZAp">
16875+
<node concept="37vLTI" id="7dVHCAJ5lrS" role="3clFbG">
16876+
<node concept="2OqwBi" id="7dVHCAJ5lrT" role="37vLTx">
16877+
<node concept="37vLTw" id="7dVHCAJ5lrU" role="2Oq$k0">
16878+
<ref role="3cqZAo" node="7dVHCAJ5lnp" resolve="ap" />
16879+
</node>
16880+
<node concept="liA8E" id="7dVHCAJ5lrV" role="2OqNvi">
1678816881
<ref role="37wK5l" to="i05g:3hajdyqGNO9" resolve="asInstancePath" />
1678916882
</node>
1679016883
</node>
16791-
<node concept="2OqwBi" id="79xAww0fIqS" role="37vLTJ">
16792-
<node concept="Xjq3P" id="79xAww0fIqT" role="2Oq$k0" />
16793-
<node concept="2OwXpG" id="79xAww0fIqU" role="2OqNvi">
16794-
<ref role="2Oxat5" node="79xAww0fIqA" resolve="location" />
16884+
<node concept="2OqwBi" id="7dVHCAJ5lrW" role="37vLTJ">
16885+
<node concept="Xjq3P" id="7dVHCAJ5lrX" role="2Oq$k0" />
16886+
<node concept="2OwXpG" id="7dVHCAJ5lrY" role="2OqNvi">
16887+
<ref role="2Oxat5" node="79xAww0fIqA" resolve="locationPath" />
1679516888
</node>
1679616889
</node>
1679716890
</node>
1679816891
</node>
16799-
<node concept="3clFbF" id="79xAww0fIqV" role="3cqZAp">
16800-
<node concept="37vLTI" id="79xAww0fIqW" role="3clFbG">
16801-
<node concept="37vLTw" id="79xAww0fIqX" role="37vLTx">
16802-
<ref role="3cqZAo" node="79xAww0fIqK" resolve="message" />
16892+
<node concept="3clFbF" id="7dVHCAJwO4x" role="3cqZAp">
16893+
<node concept="37vLTI" id="7dVHCAJxcpA" role="3clFbG">
16894+
<node concept="37vLTw" id="7dVHCAJxp62" role="37vLTx">
16895+
<ref role="3cqZAo" node="7dVHCAJweEu" resolve="location" />
1680316896
</node>
16804-
<node concept="2OqwBi" id="79xAww0fIqY" role="37vLTJ">
16805-
<node concept="Xjq3P" id="79xAww0fIqZ" role="2Oq$k0" />
16806-
<node concept="2OwXpG" id="79xAww0fIr0" role="2OqNvi">
16807-
<ref role="2Oxat5" node="79xAww0fIqD" resolve="message" />
16897+
<node concept="2OqwBi" id="7dVHCAJwOhe" role="37vLTJ">
16898+
<node concept="Xjq3P" id="7dVHCAJwO4v" role="2Oq$k0" />
16899+
<node concept="2OwXpG" id="7dVHCAJx0LH" role="2OqNvi">
16900+
<ref role="2Oxat5" node="7dVHCAJw1lS" resolve="locationNode" />
1680816901
</node>
1680916902
</node>
1681016903
</node>
1681116904
</node>
1681216905
</node>
1681316906
</node>
16907+
<node concept="2tJIrI" id="7dVHCAJqYe1" role="jymVt" />
16908+
<node concept="3clFb_" id="7dVHCAJqZeW" role="jymVt">
16909+
<property role="TrG5h" value="getConfig" />
16910+
<node concept="3clFbS" id="7dVHCAJqZeZ" role="3clF47">
16911+
<node concept="3clFbF" id="7dVHCAJqZJK" role="3cqZAp">
16912+
<node concept="2OqwBi" id="7dVHCAJr0im" role="3clFbG">
16913+
<node concept="Xjq3P" id="7dVHCAJqZJJ" role="2Oq$k0" />
16914+
<node concept="2OwXpG" id="7dVHCAJr0IL" role="2OqNvi">
16915+
<ref role="2Oxat5" node="7dVHCAJ2miA" resolve="config" />
16916+
</node>
16917+
</node>
16918+
</node>
16919+
</node>
16920+
<node concept="3Tm1VV" id="7dVHCAJqYXB" role="1B3o_S" />
16921+
<node concept="3Tqbb2" id="7dVHCAJqZcp" role="3clF45">
16922+
<ref role="ehGHo" to="4ndm:5NPKd17BG$l" resolve="FeatureModelConfiguration" />
16923+
</node>
16924+
</node>
16925+
<node concept="2tJIrI" id="7dVHCAJylxD" role="jymVt" />
16926+
<node concept="3clFb_" id="7dVHCAJz5qM" role="jymVt">
16927+
<property role="TrG5h" value="getLocation" />
16928+
<node concept="3clFbS" id="7dVHCAJz5qP" role="3clF47">
16929+
<node concept="3clFbF" id="7dVHCAJz5XS" role="3cqZAp">
16930+
<node concept="2OqwBi" id="7dVHCAJz6y9" role="3clFbG">
16931+
<node concept="Xjq3P" id="7dVHCAJz5XR" role="2Oq$k0" />
16932+
<node concept="2OwXpG" id="7dVHCAJzjWU" role="2OqNvi">
16933+
<ref role="2Oxat5" node="7dVHCAJw1lS" resolve="locationNode" />
16934+
</node>
16935+
</node>
16936+
</node>
16937+
</node>
16938+
<node concept="3Tm1VV" id="7dVHCAJyHZo" role="1B3o_S" />
16939+
<node concept="3Tqbb2" id="7dVHCAJyTeo" role="3clF45" />
16940+
</node>
1681416941
<node concept="2tJIrI" id="79xAww0fIr5" role="jymVt" />
1681516942
<node concept="3clFb_" id="79xAww0socv" role="jymVt">
1681616943
<property role="TrG5h" value="toString" />
1681716944
<node concept="3Tm1VV" id="79xAww0socw" role="1B3o_S" />
1681816945
<node concept="17QB3L" id="79xAww0sotf" role="3clF45" />
1681916946
<node concept="3clFbS" id="79xAww0socz" role="3clF47">
16820-
<node concept="3clFbF" id="79xAww0spRT" role="3cqZAp">
16821-
<node concept="3cpWs3" id="79xAww0szXz" role="3clFbG">
16822-
<node concept="Xl_RD" id="79xAww0s$0s" role="3uHU7w">
16823-
<property role="Xl_RC" value="'" />
16824-
</node>
16825-
<node concept="3cpWs3" id="79xAww0st9Q" role="3uHU7B">
16826-
<node concept="3cpWs3" id="79xAww0srfV" role="3uHU7B">
16827-
<node concept="37vLTw" id="79xAww0spRQ" role="3uHU7B">
16828-
<ref role="3cqZAo" node="79xAww0fIqD" resolve="message" />
16947+
<node concept="3cpWs8" id="7dVHCAJ67xR" role="3cqZAp">
16948+
<node concept="3cpWsn" id="7dVHCAJ67xS" role="3cpWs9">
16949+
<property role="TrG5h" value="msg" />
16950+
<node concept="17QB3L" id="7dVHCAJ5Rlb" role="1tU5fm" />
16951+
<node concept="3cpWs3" id="7dVHCAJ67xT" role="33vP2m">
16952+
<node concept="3cpWs3" id="7dVHCAJ67xU" role="3uHU7B">
16953+
<node concept="3cpWs3" id="7dVHCAJ67xV" role="3uHU7B">
16954+
<node concept="37vLTw" id="7dVHCAJ67xW" role="3uHU7B">
16955+
<ref role="3cqZAo" node="79xAww0fIqD" resolve="message" />
16956+
</node>
16957+
<node concept="Xl_RD" id="7dVHCAJ67xX" role="3uHU7w">
16958+
<property role="Xl_RC" value=" in '" />
16959+
</node>
1682916960
</node>
16830-
<node concept="Xl_RD" id="79xAww0sriO" role="3uHU7w">
16831-
<property role="Xl_RC" value=" in '" />
16961+
<node concept="37vLTw" id="7dVHCAJ67xY" role="3uHU7w">
16962+
<ref role="3cqZAo" node="79xAww0fIqA" resolve="locationPath" />
1683216963
</node>
1683316964
</node>
16834-
<node concept="37vLTw" id="79xAww0stcJ" role="3uHU7w">
16835-
<ref role="3cqZAo" node="79xAww0fIqA" resolve="location" />
16965+
<node concept="Xl_RD" id="7dVHCAJ67xZ" role="3uHU7w">
16966+
<property role="Xl_RC" value="'" />
16967+
</node>
16968+
</node>
16969+
</node>
16970+
</node>
16971+
<node concept="3clFbF" id="7dVHCAJ69uB" role="3cqZAp">
16972+
<node concept="3K4zz7" id="7dVHCAJ69uv" role="3clFbG">
16973+
<node concept="2OqwBi" id="7dVHCAJ6aHK" role="3K4Cdx">
16974+
<node concept="37vLTw" id="7dVHCAJ69Y$" role="2Oq$k0">
16975+
<ref role="3cqZAo" node="7dVHCAJ2miA" resolve="config" />
16976+
</node>
16977+
<node concept="3w_OXm" id="7dVHCAJ6b$G" role="2OqNvi" />
16978+
</node>
16979+
<node concept="37vLTw" id="7dVHCAJ6bVo" role="3K4E3e">
16980+
<ref role="3cqZAo" node="7dVHCAJ67xS" resolve="msg" />
16981+
</node>
16982+
<node concept="3cpWs3" id="7dVHCAJ3p24" role="3K4GZi">
16983+
<node concept="Xl_RD" id="7dVHCAJ3p4X" role="3uHU7w">
16984+
<property role="Xl_RC" value="'" />
16985+
</node>
16986+
<node concept="3cpWs3" id="7dVHCAJ3nzu" role="3uHU7B">
16987+
<node concept="3cpWs3" id="7dVHCAJ6f3C" role="3uHU7B">
16988+
<node concept="Xl_RD" id="7dVHCAJ6f6x" role="3uHU7w">
16989+
<property role="Xl_RC" value=" with configuration '" />
16990+
</node>
16991+
<node concept="37vLTw" id="7dVHCAJ67y0" role="3uHU7B">
16992+
<ref role="3cqZAo" node="7dVHCAJ67xS" resolve="msg" />
16993+
</node>
16994+
</node>
16995+
<node concept="2OqwBi" id="7dVHCAJ3o9c" role="3uHU7w">
16996+
<node concept="37vLTw" id="7dVHCAJ3nLJ" role="2Oq$k0">
16997+
<ref role="3cqZAo" node="7dVHCAJ2miA" resolve="config" />
16998+
</node>
16999+
<node concept="3TrcHB" id="7dVHCAJ3oQI" role="2OqNvi">
17000+
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
17001+
</node>
17002+
</node>
1683617003
</node>
1683717004
</node>
1683817005
</node>

0 commit comments

Comments
 (0)