Skip to content

Commit 05dffd2

Browse files
committed
Combine two similar quickfixes into one (#1476).
1 parent 774241c commit 05dffd2

File tree

1 file changed

+39
-58
lines changed

1 file changed

+39
-58
lines changed

code/languages/org.iets3.opensource/languages/org.iets3.variability.configuration.base/models/org.iets3.variability.configuration.base.typesystem.mps

Lines changed: 39 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -4527,13 +4527,19 @@
45274527
<ref role="2Gs0qQ" node="61z6J8WtRbi" resolve="sc" />
45284528
</node>
45294529
<node concept="3Cnw8n" id="61z6J8Wu5WQ" role="1urrFz">
4530-
<ref role="QpYPw" node="61z6J8Wu65N" resolve="fix_InconsistentFeatureConfig" />
4530+
<ref role="QpYPw" node="7WsNHxj$1Q_" resolve="fix_InvalidReferenceToFeature" />
45314531
<node concept="3CnSsL" id="61z6J8Wu7yn" role="3Coj4f">
4532-
<ref role="QkamJ" node="61z6J8Wu65O" resolve="fc" />
4532+
<ref role="QkamJ" node="7WsNHxj$2hX" resolve="fc" />
45334533
<node concept="2GrUjf" id="61z6J8Wu7yp" role="3CoRuB">
45344534
<ref role="2Gs0qQ" node="61z6J8WtRbi" resolve="sc" />
45354535
</node>
45364536
</node>
4537+
<node concept="3CnSsL" id="6U83TeHcPPx" role="3Coj4f">
4538+
<ref role="QkamJ" node="6U83TeHckkd" resolve="problem" />
4539+
<node concept="Xl_RD" id="6U83TeHcPPL" role="3CoRuB">
4540+
<property role="Xl_RC" value="inconsistent reference" />
4541+
</node>
4542+
</node>
45374543
</node>
45384544
<node concept="AMVWg" id="61z6J8Wu8Et" role="lGtFl">
45394545
<property role="TrG5h" value="inconsistent_ref_to_feature_with_cardinality" />
@@ -4687,6 +4693,12 @@
46874693
<ref role="3cqZAo" node="7WsNHxjzGSm" resolve="it" />
46884694
</node>
46894695
</node>
4696+
<node concept="3CnSsL" id="6U83TeHcP0T" role="3Coj4f">
4697+
<ref role="QkamJ" node="6U83TeHckkd" resolve="problem" />
4698+
<node concept="Xl_RD" id="6U83TeHcP4Q" role="3CoRuB">
4699+
<property role="Xl_RC" value="non-unique reference" />
4700+
</node>
4701+
</node>
46904702
</node>
46914703
<node concept="AMVWg" id="7WsNHxj$a1Y" role="lGtFl">
46924704
<property role="TrG5h" value="non_unique_ref_to_feature" />
@@ -4763,13 +4775,19 @@
47634775
<ref role="2Gs0qQ" node="61z6J8Wu9_A" resolve="sc" />
47644776
</node>
47654777
<node concept="3Cnw8n" id="61z6J8Wu9_U" role="1urrFz">
4766-
<ref role="QpYPw" node="61z6J8Wu65N" resolve="fix_InconsistentFeatureConfig" />
4778+
<ref role="QpYPw" node="7WsNHxj$1Q_" resolve="fix_InvalidReferenceToFeature" />
47674779
<node concept="3CnSsL" id="61z6J8Wu9_V" role="3Coj4f">
4768-
<ref role="QkamJ" node="61z6J8Wu65O" resolve="fc" />
4780+
<ref role="QkamJ" node="7WsNHxj$2hX" resolve="fc" />
47694781
<node concept="2GrUjf" id="61z6J8Wu9_W" role="3CoRuB">
47704782
<ref role="2Gs0qQ" node="61z6J8Wu9_A" resolve="sc" />
47714783
</node>
47724784
</node>
4785+
<node concept="3CnSsL" id="6U83TeHcRxO" role="3Coj4f">
4786+
<ref role="QkamJ" node="6U83TeHckkd" resolve="problem" />
4787+
<node concept="Xl_RD" id="6U83TeHcRy4" role="3CoRuB">
4788+
<property role="Xl_RC" value="inconsistent reference" />
4789+
</node>
4790+
</node>
47734791
</node>
47744792
<node concept="AMVWg" id="61z6J8Wu9_X" role="lGtFl">
47754793
<property role="TrG5h" value="inconsistent_ref_to_feature" />
@@ -4805,13 +4823,17 @@
48054823
</node>
48064824
<node concept="Q5z_Y" id="7WsNHxj$1Q_">
48074825
<property role="3GE5qa" value="configuration" />
4808-
<property role="TrG5h" value="fix_NonUniqueReferenceToFeature" />
4826+
<property role="TrG5h" value="fix_InvalidReferenceToFeature" />
48094827
<node concept="Q6JDH" id="7WsNHxj$2hX" role="Q6Id_">
48104828
<property role="TrG5h" value="fc" />
48114829
<node concept="3Tqbb2" id="7WsNHxj$2hY" role="Q6QK4">
48124830
<ref role="ehGHo" to="4ndm:5NPKd17BG$t" resolve="FeatureConfiguration" />
48134831
</node>
48144832
</node>
4833+
<node concept="Q6JDH" id="6U83TeHckkd" role="Q6Id_">
4834+
<property role="TrG5h" value="problem" />
4835+
<node concept="17QB3L" id="6U83TeHcklL" role="Q6QK4" />
4836+
</node>
48154837
<node concept="Q5ZZ6" id="7WsNHxj$1QA" role="Q6x$H">
48164838
<node concept="3clFbS" id="7WsNHxj$1QB" role="2VODD2">
48174839
<node concept="3clFbF" id="7WsNHxj$8J4" role="3cqZAp">
@@ -4832,8 +4854,18 @@
48324854
<property role="Xl_RC" value="'" />
48334855
</node>
48344856
<node concept="3cpWs3" id="7WsNHxj$5Qi" role="3uHU7B">
4835-
<node concept="Xl_RD" id="7WsNHxj$2yw" role="3uHU7B">
4836-
<property role="Xl_RC" value="Remove this non-unique reference to feature '" />
4857+
<node concept="3cpWs3" id="6U83TeHcklT" role="3uHU7B">
4858+
<node concept="3cpWs3" id="6U83TeHclWB" role="3uHU7B">
4859+
<node concept="Xl_RD" id="6U83TeHclXH" role="3uHU7B">
4860+
<property role="Xl_RC" value="Remove this " />
4861+
</node>
4862+
<node concept="QwW4i" id="6U83TeHckDH" role="3uHU7w">
4863+
<ref role="QwW4h" node="6U83TeHckkd" resolve="problem" />
4864+
</node>
4865+
</node>
4866+
<node concept="Xl_RD" id="7WsNHxj$2yw" role="3uHU7w">
4867+
<property role="Xl_RC" value=" to feature '" />
4868+
</node>
48374869
</node>
48384870
<node concept="2OqwBi" id="7WsNHxj$7xI" role="3uHU7w">
48394871
<node concept="2OqwBi" id="7WsNHxj$6hW" role="2Oq$k0">
@@ -4854,56 +4886,5 @@
48544886
</node>
48554887
</node>
48564888
</node>
4857-
<node concept="Q5z_Y" id="61z6J8Wu65N">
4858-
<property role="3GE5qa" value="configuration" />
4859-
<property role="TrG5h" value="fix_InconsistentFeatureConfig" />
4860-
<node concept="Q6JDH" id="61z6J8Wu65O" role="Q6Id_">
4861-
<property role="TrG5h" value="fc" />
4862-
<node concept="3Tqbb2" id="61z6J8Wu65P" role="Q6QK4">
4863-
<ref role="ehGHo" to="4ndm:5NPKd17BG$t" resolve="FeatureConfiguration" />
4864-
</node>
4865-
</node>
4866-
<node concept="Q5ZZ6" id="61z6J8Wu65Q" role="Q6x$H">
4867-
<node concept="3clFbS" id="61z6J8Wu65R" role="2VODD2">
4868-
<node concept="3clFbF" id="61z6J8Wu65S" role="3cqZAp">
4869-
<node concept="2OqwBi" id="61z6J8Wu65T" role="3clFbG">
4870-
<node concept="QwW4i" id="61z6J8Wu65U" role="2Oq$k0">
4871-
<ref role="QwW4h" node="61z6J8Wu65O" resolve="fc" />
4872-
</node>
4873-
<node concept="3YRAZt" id="61z6J8Wu65V" role="2OqNvi" />
4874-
</node>
4875-
</node>
4876-
</node>
4877-
</node>
4878-
<node concept="QznSV" id="61z6J8Wu65W" role="QzAvj">
4879-
<node concept="3clFbS" id="61z6J8Wu65X" role="2VODD2">
4880-
<node concept="3clFbF" id="61z6J8Wu65Y" role="3cqZAp">
4881-
<node concept="3cpWs3" id="61z6J8Wu65Z" role="3clFbG">
4882-
<node concept="Xl_RD" id="61z6J8Wu660" role="3uHU7w">
4883-
<property role="Xl_RC" value="'" />
4884-
</node>
4885-
<node concept="3cpWs3" id="61z6J8Wu661" role="3uHU7B">
4886-
<node concept="Xl_RD" id="61z6J8Wu662" role="3uHU7B">
4887-
<property role="Xl_RC" value="Remove this inconsistent reference to feature '" />
4888-
</node>
4889-
<node concept="2OqwBi" id="61z6J8Wu663" role="3uHU7w">
4890-
<node concept="2OqwBi" id="61z6J8Wu664" role="2Oq$k0">
4891-
<node concept="QwW4i" id="61z6J8Wu665" role="2Oq$k0">
4892-
<ref role="QwW4h" node="61z6J8Wu65O" resolve="fc" />
4893-
</node>
4894-
<node concept="3TrEf2" id="61z6J8Wu666" role="2OqNvi">
4895-
<ref role="3Tt5mk" to="4ndm:5NPKd17BG$u" resolve="targetFeature" />
4896-
</node>
4897-
</node>
4898-
<node concept="3TrcHB" id="61z6J8Wu667" role="2OqNvi">
4899-
<ref role="3TsBF5" to="tpck:h0TrG11" resolve="name" />
4900-
</node>
4901-
</node>
4902-
</node>
4903-
</node>
4904-
</node>
4905-
</node>
4906-
</node>
4907-
</node>
49084889
</model>
49094890

0 commit comments

Comments
 (0)