Skip to content

Commit 676a762

Browse files
mfsoliveiramfsoliveira
committed
Apply remigrate
1 parent 26ca7f1 commit 676a762

File tree

14 files changed

+47
-47
lines changed

14 files changed

+47
-47
lines changed

‎code/languages/de.itemis.model.merge.baselang/sandbox/models/de.itemis.model.merge.baselang.sandbox.plugin.mps‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@
5353
<language id="539e8939-08ef-497c-a5fd-25dd10137a55" name="de.itemis.model.merge">
5454
<concept id="7137735640371846599" name="de.itemis.model.merge.structure.IdFunction" flags="ig" index="230_S" />
5555
<concept id="7137735640371849272" name="de.itemis.model.merge.structure.IdFunctionParam" flags="ng" index="233M7" />
56-
<concept id="1912777765298260981" name="de.itemis.model.merge.structure.MergePolicy" flags="ng" index="1olsrb">
56+
<concept id="1912777765298260981" name="de.itemis.model.merge.structure.ConceptMergingPolicy" flags="ng" index="1olsrb">
5757
<reference id="4176264672384277229" name="conceptRef" index="24zOxU" />
5858
<child id="7137735640372265540" name="idFunction" index="21DrV" />
5959
<child id="1912777765298654333" name="propertyPolicies" index="1orW53" />
6060
</concept>
61-
<concept id="1912777765298266446" name="de.itemis.model.merge.structure.EmptyMergeItem" flags="ng" index="1oluLK" />
62-
<concept id="1912777765298163335" name="de.itemis.model.merge.structure.ModelMerge" flags="ng" index="1olOeT">
63-
<child id="1912777765298260982" name="items" index="1olsr8" />
61+
<concept id="1912777765298266446" name="de.itemis.model.merge.structure.EmptyMergingPolicy" flags="ng" index="1oluLK" />
62+
<concept id="1912777765298163335" name="de.itemis.model.merge.structure.ModelMergingPolicy" flags="ng" index="1olOeT">
63+
<child id="1912777765298260982" name="policies" index="1olsr8" />
6464
<child id="2222162468665533253" name="lang" index="3WPhuS" />
6565
</concept>
6666
<concept id="1912777765298652712" name="de.itemis.model.merge.structure.PropertyPolicy" flags="ng" index="1orWGm">

‎code/languages/de.itemis.model.merge/generator/templates/[email protected]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
<node concept="2OqwBi" id="3Wln5KITvoU" role="2Oq$k0">
701701
<node concept="30H73N" id="3Wln5KITuNK" role="2Oq$k0" />
702702
<node concept="3Tsc0h" id="3Wln5KITvDQ" role="2OqNvi">
703-
<ref role="3TtcxE" to="mopj:1EbzjT2R$JQ" resolve="items" />
703+
<ref role="3TtcxE" to="mopj:1EbzjT2R$JQ" resolve="policies" />
704704
</node>
705705
</node>
706706
<node concept="v3k3i" id="3Wln5KITyZ4" role="2OqNvi">

‎code/languages/de.itemis.model.merge/models/de.itemis.model.merge.behavior.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@
14191419
<node concept="2OqwBi" id="1yAYHyQ7lxe" role="2Oq$k0">
14201420
<node concept="2OqwBi" id="1yAYHyQ7lxf" role="2Oq$k0">
14211421
<node concept="37vLTw" id="1yAYHyQ7lxg" role="2Oq$k0">
1422-
<ref role="3cqZAo" node="1yAYHyQ78$P" resolve="modelmerge" />
1422+
<ref role="3cqZAo" node="1yAYHyQ78$P" resolve="mergingPolicy" />
14231423
</node>
14241424
<node concept="3Tsc0h" id="1yAYHyQ7lxh" role="2OqNvi">
14251425
<ref role="3TtcxE" to="mopj:1EbzjT2R$JQ" resolve="policies" />
@@ -1472,7 +1472,7 @@
14721472
<ref role="37wK5l" to="33ny:~Optional.ofNullable(java.lang.Object)" resolve="ofNullable" />
14731473
<ref role="1Pybhc" to="33ny:~Optional" resolve="Optional" />
14741474
<node concept="37vLTw" id="6CwG2k87w2x" role="37wK5m">
1475-
<ref role="3cqZAo" node="1yAYHyQ7lxc" resolve="mergePolicyChild" />
1475+
<ref role="3cqZAo" node="1yAYHyQ7lxc" resolve="childPolicy" />
14761476
</node>
14771477
</node>
14781478
<node concept="liA8E" id="6CwG2k87w2y" role="2OqNvi">

‎code/languages/de.itemis.model.merge/models/de.itemis.model.merge.typesystem.mps‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2279,7 +2279,7 @@
22792279
<property role="TrG5h" value="mmp" />
22802280
<node concept="nSUau" id="6CwG2k7Ofrg" role="1tU5fm">
22812281
<node concept="3uibUv" id="6CwG2k7OgYo" role="nSUat">
2282-
<ref role="3uigEE" to="gunp:6CwG2k7NbpD" resolve="MissingMergePolicies" />
2282+
<ref role="3uigEE" to="gunp:6CwG2k7NbpD" resolve="MissingMergingPolicies" />
22832283
</node>
22842284
</node>
22852285
</node>
@@ -2380,7 +2380,7 @@
23802380
<property role="TrG5h" value="mp" />
23812381
<node concept="nSUau" id="6CwG2k7RWQK" role="1tU5fm">
23822382
<node concept="3uibUv" id="6CwG2k7RZyj" role="nSUat">
2383-
<ref role="3uigEE" to="gunp:6CwG2k7NbpD" resolve="MissingMergePolicies" />
2383+
<ref role="3uigEE" to="gunp:6CwG2k7NbpD" resolve="MissingMergingPolicies" />
23842384
</node>
23852385
</node>
23862386
</node>

‎code/languages/de.itemis.model.simple.demo.enums/models/de.itemis.model.simple.demo.enums.structure.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<property role="EcuMT" value="3615041602350286780" />
6868
<property role="TrG5h" value="ConceptWithEnum" />
6969
<property role="19KtqR" value="true" />
70-
<ref role="1TJDcQ" to="tpck:gw2VY9q" />
70+
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
7171
<node concept="1TJgyi" id="38FdiWsmgEl" role="1TKVEl">
7272
<property role="IQ2nx" value="3615041602350287509" />
7373
<property role="TrG5h" value="data" />

‎code/solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3844,7 +3844,7 @@
38443844
<node concept="1eOMI4" id="6MgS2unbc1L" role="3uHU7w">
38453845
<node concept="2OqwBi" id="6MgS2unbc1M" role="1eOMHV">
38463846
<node concept="37vLTw" id="32ggi2Dqja8" role="2Oq$k0">
3847-
<ref role="3cqZAo" node="32ggi2DqhHN" resolve="modelMerge" />
3847+
<ref role="3cqZAo" node="32ggi2DqhHN" resolve="mergingPolicy" />
38483848
</node>
38493849
<node concept="2qgKlT" id="6MgS2unbc1Q" role="2OqNvi">
38503850
<ref role="37wK5l" to="rnx3:28CFLxJaWOS" resolve="globalId" />
@@ -4756,13 +4756,13 @@
47564756
<ref role="1Pybhc" node="18W7Z4VeRuj" resolve="PolicyMergerResolver" />
47574757
<ref role="37wK5l" node="2QNuyuiLuqz" resolve="run" />
47584758
<node concept="37vLTw" id="3a5mjFh18u2" role="37wK5m">
4759-
<ref role="3cqZAo" node="3a5mjFh18tT" resolve="modelMerge" />
4759+
<ref role="3cqZAo" node="3a5mjFh18tT" resolve="mergingPolicy" />
47604760
</node>
47614761
<node concept="2ShNRf" id="3a5mjFh18u3" role="37wK5m">
47624762
<node concept="1pGfFk" id="3a5mjFh18u4" role="2ShVmc">
47634763
<ref role="37wK5l" node="32ggi2DqhCi" resolve="ContentHolderFactoryExtension" />
47644764
<node concept="37vLTw" id="3a5mjFh18u5" role="37wK5m">
4765-
<ref role="3cqZAo" node="3a5mjFh18tT" resolve="modelMerge" />
4765+
<ref role="3cqZAo" node="3a5mjFh18tT" resolve="mergingPolicy" />
47664766
</node>
47674767
</node>
47684768
</node>
@@ -4772,7 +4772,7 @@
47724772
<node concept="3clFbF" id="3a5mjFh18u6" role="3cqZAp">
47734773
<node concept="2ShNRf" id="3a5mjFh18u7" role="3clFbG">
47744774
<node concept="1pGfFk" id="3a5mjFh18u8" role="2ShVmc">
4775-
<ref role="37wK5l" node="3a5mjFgYr6e" resolve="ModelMergerRunner" />
4775+
<ref role="37wK5l" node="3a5mjFgYr6e" resolve="ModelMerger" />
47764776
<node concept="37vLTw" id="3a5mjFh18u9" role="37wK5m">
47774777
<ref role="3cqZAo" node="3a5mjFh18tZ" resolve="modelMergeResult" />
47784778
</node>
@@ -9109,7 +9109,7 @@
91099109
</node>
91109110
<node concept="2ShNRf" id="7wnapcW0H9g" role="37wK5m">
91119111
<node concept="HV5vD" id="7wnapcW0H9h" role="2ShVmc">
9112-
<ref role="HV5vE" node="450aOM1SYvz" resolve="Impl" />
9112+
<ref role="HV5vE" node="450aOM1SYvz" resolve="ContentHolderFactory.Impl" />
91139113
</node>
91149114
</node>
91159115
</node>
@@ -9145,7 +9145,7 @@
91459145
<ref role="1Pybhc" node="2rVXF9$L4no" resolve="ConceptGraphBuilder" />
91469146
<node concept="2OqwBi" id="1trrptaAwvS" role="37wK5m">
91479147
<node concept="37vLTw" id="1trrptaAwvT" role="2Oq$k0">
9148-
<ref role="3cqZAo" node="2QNuyuiLuq_" resolve="modelMerge" />
9148+
<ref role="3cqZAo" node="2QNuyuiLuq_" resolve="mergingPolicy" />
91499149
</node>
91509150
<node concept="2qgKlT" id="1trrptaAwvU" role="2OqNvi">
91519151
<ref role="37wK5l" to="rnx3:3xJ_LYXlmVz" resolve="languageConcepts" />
@@ -9167,7 +9167,7 @@
91679167
</node>
91689168
<node concept="2OqwBi" id="1trrptaAyao" role="33vP2m">
91699169
<node concept="37vLTw" id="1trrptaAyap" role="2Oq$k0">
9170-
<ref role="3cqZAo" node="2QNuyuiLuq_" resolve="modelMerge" />
9170+
<ref role="3cqZAo" node="2QNuyuiLuq_" resolve="mergingPolicy" />
91719171
</node>
91729172
<node concept="2qgKlT" id="1trrptaAyaq" role="2OqNvi">
91739173
<ref role="37wK5l" to="rnx3:3xJ_LYXj1c6" resolve="conceptToDefinedMergePolicy" />
@@ -9195,7 +9195,7 @@
91959195
</node>
91969196
</node>
91979197
<node concept="37vLTw" id="6B0NpqHsVXX" role="37wK5m">
9198-
<ref role="3cqZAo" node="2QNuyuiLuq_" resolve="modelMerge" />
9198+
<ref role="3cqZAo" node="2QNuyuiLuq_" resolve="mergingPolicy" />
91999199
</node>
92009200
<node concept="2OqwBi" id="6B0NpqHtN1Q" role="37wK5m">
92019201
<node concept="37vLTw" id="6B0NpqHtN1R" role="2Oq$k0">
@@ -9224,7 +9224,7 @@
92249224
<node concept="3fqX7Q" id="5HyGTP1aLVp" role="3uHU7B">
92259225
<node concept="2OqwBi" id="5HyGTP1aLVr" role="3fr31v">
92269226
<node concept="37vLTw" id="5HyGTP1aLVs" role="2Oq$k0">
9227-
<ref role="3cqZAo" node="2QNuyuiLuq_" resolve="modelMerge" />
9227+
<ref role="3cqZAo" node="2QNuyuiLuq_" resolve="mergingPolicy" />
92289228
</node>
92299229
<node concept="3TrcHB" id="5HyGTP1aLVt" role="2OqNvi">
92309230
<ref role="3TsBF5" to="mopj:5HbTgGuQTJM" resolve="partialPolicy" />
@@ -9368,7 +9368,7 @@
93689368
<node concept="TUZQ0" id="6B0NpqHvdyn" role="3nqlJM">
93699369
<property role="TUZQ4" value="modelMerge defined by user" />
93709370
<node concept="zr_55" id="6B0NpqHvdyp" role="zr_5Q">
9371-
<ref role="zr_51" node="2QNuyuiLuq_" resolve="modelMerge" />
9371+
<ref role="zr_51" node="2QNuyuiLuq_" resolve="mergingPolicy" />
93729372
</node>
93739373
</node>
93749374
<node concept="TUZQ0" id="6B0NpqHvdyq" role="3nqlJM">
@@ -10166,7 +10166,7 @@
1016610166
<node concept="37vLTI" id="1FQTM0rQ0xl" role="3clFbG">
1016710167
<node concept="Rm8GO" id="1FQTM0rQ0xm" role="37vLTx">
1016810168
<ref role="Rm8GQ" node="1trrptaBMq3" resolve="property" />
10169-
<ref role="1Px2BO" node="1trrptaBMbp" resolve="MergePolicyConflict.Type" />
10169+
<ref role="1Px2BO" node="1trrptaBMbp" resolve="MergingPolicyConflict.Type" />
1017010170
</node>
1017110171
<node concept="2OqwBi" id="1FQTM0rQ0xn" role="37vLTJ">
1017210172
<node concept="37vLTw" id="1FQTM0rQ0xo" role="2Oq$k0">
@@ -10314,7 +10314,7 @@
1031410314
<node concept="37vLTI" id="1FQTM0rQ0xN" role="3clFbG">
1031510315
<node concept="Rm8GO" id="1FQTM0rQ0xO" role="37vLTx">
1031610316
<ref role="Rm8GQ" node="1trrptaBO1u" resolve="child" />
10317-
<ref role="1Px2BO" node="1trrptaBMbp" resolve="MergePolicyConflict.Type" />
10317+
<ref role="1Px2BO" node="1trrptaBMbp" resolve="MergingPolicyConflict.Type" />
1031810318
</node>
1031910319
<node concept="2OqwBi" id="1FQTM0rQ0xP" role="37vLTJ">
1032010320
<node concept="37vLTw" id="1FQTM0rQ0xQ" role="2Oq$k0">
@@ -10427,7 +10427,7 @@
1042710427
<node concept="37vLTI" id="3PLTv5jM0X7" role="3clFbG">
1042810428
<node concept="Rm8GO" id="60iGZSK0ZIv" role="37vLTx">
1042910429
<ref role="Rm8GQ" node="60iGZSK0Rew" resolve="reference" />
10430-
<ref role="1Px2BO" node="1trrptaBMbp" resolve="MergePolicyConflict.Type" />
10430+
<ref role="1Px2BO" node="1trrptaBMbp" resolve="MergingPolicyConflict.Type" />
1043110431
</node>
1043210432
<node concept="2OqwBi" id="3PLTv5jM0X9" role="37vLTJ">
1043310433
<node concept="37vLTw" id="3PLTv5jM0Xa" role="2Oq$k0">
@@ -10469,7 +10469,7 @@
1046910469
<node concept="37vLTI" id="60iGZSK0PBe" role="3clFbG">
1047010470
<node concept="Rm8GO" id="60iGZSK10B8" role="37vLTx">
1047110471
<ref role="Rm8GQ" node="60iGZSK0Qq0" resolve="idFunction" />
10472-
<ref role="1Px2BO" node="1trrptaBMbp" resolve="MergePolicyConflict.Type" />
10472+
<ref role="1Px2BO" node="1trrptaBMbp" resolve="MergingPolicyConflict.Type" />
1047310473
</node>
1047410474
<node concept="2OqwBi" id="60iGZSK0PBg" role="37vLTJ">
1047510475
<node concept="37vLTw" id="60iGZSK0PBh" role="2Oq$k0">
@@ -11878,7 +11878,7 @@
1187811878
<node concept="YS8fn" id="3EHNiwzxL05" role="3cqZAp">
1187911879
<node concept="2ShNRf" id="3EHNiwzxL06" role="YScLw">
1188011880
<node concept="1pGfFk" id="3EHNiwzxL07" role="2ShVmc">
11881-
<ref role="37wK5l" node="7TOowlgU2mX" resolve="MergePolicyConflict" />
11881+
<ref role="37wK5l" node="7TOowlgU2mX" resolve="MergingPolicyConflict" />
1188211882
<node concept="37vLTw" id="1trrptaCV5I" role="37wK5m">
1188311883
<ref role="3cqZAo" node="3EHNiwzsGL7" resolve="key" />
1188411884
</node>
@@ -13377,11 +13377,11 @@
1337713377
<property role="TrG5h" value="type" />
1337813378
<node concept="3Tm1VV" id="1trrptaBTh4" role="1B3o_S" />
1337913379
<node concept="3uibUv" id="1trrptaBUT4" role="1tU5fm">
13380-
<ref role="3uigEE" node="1trrptaBMbp" resolve="MergePolicyConflict.Type" />
13380+
<ref role="3uigEE" node="1trrptaBMbp" resolve="MergingPolicyConflict.Type" />
1338113381
</node>
1338213382
<node concept="Rm8GO" id="1trrptaBWR3" role="33vP2m">
1338313383
<ref role="Rm8GQ" node="1trrptaBPE5" resolve="unkown" />
13384-
<ref role="1Px2BO" node="1trrptaBMbp" resolve="MergePolicyConflict.Type" />
13384+
<ref role="1Px2BO" node="1trrptaBMbp" resolve="MergingPolicyConflict.Type" />
1338513385
</node>
1338613386
</node>
1338713387
<node concept="2tJIrI" id="7TOowlgU2m3" role="jymVt" />

‎code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.enumLeft.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<registry>
99
<language id="bf491fd2-a197-456a-8354-b3b225d4e871" name="de.itemis.model.simple.demo.enums">
1010
<concept id="3615041602350286780" name="de.itemis.model.simple.demo.enums.structure.ConceptWithEnum" flags="ng" index="Iszaj">
11-
<child id="3615041602350295310" name="id" index="IsxKx" />
11+
<child id="3615041602350295310" name="idProperty" index="IsxKx" />
1212
</concept>
1313
</language>
1414
<language id="e50b0500-6fd7-4c7f-a730-9d841358ca2b" name="de.itemis.model.simple.demo.property">

‎code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.enumRight.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<language id="bf491fd2-a197-456a-8354-b3b225d4e871" name="de.itemis.model.simple.demo.enums">
1111
<concept id="3615041602350286780" name="de.itemis.model.simple.demo.enums.structure.ConceptWithEnum" flags="ng" index="Iszaj">
1212
<property id="3615041602350287509" name="data" index="IszYU" />
13-
<child id="3615041602350295310" name="id" index="IsxKx" />
13+
<child id="3615041602350295310" name="idProperty" index="IsxKx" />
1414
</concept>
1515
</language>
1616
<language id="e50b0500-6fd7-4c7f-a730-9d841358ca2b" name="de.itemis.model.simple.demo.property">

‎code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.merge.exec.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@
291291
</node>
292292
<node concept="poArf" id="38FdiWsmxTE">
293293
<property role="TrG5h" value="ConceptWithEnumExec" />
294-
<ref role="pot50" to="2y6h:38FdiWsmiLf" resolve="ConceptWithEnum" />
294+
<ref role="pot50" to="2y6h:38FdiWsmiLf" resolve="MergeConceptWithEnum" />
295295
<node concept="1Xw6AR" id="38FdiWsmxTF" role="ppIIL">
296296
<node concept="1dCxOl" id="38FdiWsmylu" role="1XwpL7">
297297
<property role="1XweGQ" value="r:91ea9791-daad-455e-bc56-6603fc63e28c" />

‎code/solutions/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,7 @@
16201620
<node concept="2OqwBi" id="38FdiWsmurk" role="2Oq$k0">
16211621
<node concept="233M7" id="38FdiWsmugD" role="2Oq$k0" />
16221622
<node concept="3TrEf2" id="38FdiWsmuJI" role="2OqNvi">
1623-
<ref role="3Tt5mk" to="7y8w:38FdiWsmi$e" resolve="id" />
1623+
<ref role="3Tt5mk" to="7y8w:38FdiWsmi$e" resolve="idProperty" />
16241624
</node>
16251625
</node>
16261626
<node concept="3TrcHB" id="38FdiWsmvDg" role="2OqNvi">

0 commit comments

Comments
 (0)