Skip to content

Commit eb47ab0

Browse files
mfsoliveiramfsoliveira
authored
Merge pull request #1083 from mfsoliveira/feature/ModelMerge_ReduceFromErrorsToWarnings
Reduce from errors to warnings when finding missing policies.
2 parents c303704 + 06f0374 commit eb47ab0

File tree

40 files changed

+2077
-1330
lines changed

40 files changed

+2077
-1330
lines changed

‎code/.mps/modules.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.children/de.itemis.model.simple.demo.children.mpl" folder="modelmerger2.test.language" />
8181
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection.keeper/de.itemis.model.simple.demo.collection.keeper.mpl" folder="modelmerger2.test.language" />
8282
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.collection/de.itemis.model.simple.demo.collection.mpl" folder="modelmerger2.test.language" />
83+
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.enums/de.itemis.model.simple.demo.enums.mpl" folder="modelmerger2.test.language" />
8384
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.property/de.itemis.model.simple.demo.property.mpl" folder="modelmerger2.test.language" />
8485
<modulePath path="$PROJECT_DIR$/languages/de.itemis.model.simple.demo.reference/de.itemis.model.simple.demo.reference.mpl" folder="modelmerger2.test.language" />
8586
<modulePath path="$PROJECT_DIR$/langvis/languages/com.dslfoundry.langvis.demolang/com.dslfoundry.langvis.demolang.mpl" folder="langvis" />

‎code/build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18956,6 +18956,11 @@
1895618956
</node>
1895718957
</node>
1895818958
</node>
18959+
<node concept="1SiIV0" id="75IoIgYoAtf" role="3bR37C">
18960+
<node concept="3bR9La" id="75IoIgYoAtg" role="1SiIV1">
18961+
<ref role="3bR37D" node="75IoIgYo$Z9" resolve="de.itemis.model.simple.demo.enums" />
18962+
</node>
18963+
</node>
1895918964
</node>
1896018965
<node concept="1E1JtA" id="5Jy3PcPRnpY" role="2G$12L">
1896118966
<property role="BnDLt" value="true" />
@@ -19355,6 +19360,95 @@
1935519360
</node>
1935619361
</node>
1935719362
</node>
19363+
<node concept="1E1JtD" id="75IoIgYo$Z9" role="2G$12L">
19364+
<property role="BnDLt" value="true" />
19365+
<property role="TrG5h" value="de.itemis.model.simple.demo.enums" />
19366+
<property role="3LESm3" value="bf491fd2-a197-456a-8354-b3b225d4e871" />
19367+
<node concept="398BVA" id="75IoIgYo$Za" role="3LF7KH">
19368+
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
19369+
<node concept="2Ry0Ak" id="75IoIgYo$Zb" role="iGT6I">
19370+
<property role="2Ry0Am" value="languages" />
19371+
<node concept="2Ry0Ak" id="75IoIgYo$Zc" role="2Ry0An">
19372+
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
19373+
<node concept="2Ry0Ak" id="75IoIgYo_s6" role="2Ry0An">
19374+
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums.mpl" />
19375+
</node>
19376+
</node>
19377+
</node>
19378+
</node>
19379+
<node concept="1BupzO" id="75IoIgYo$Ze" role="3bR31x">
19380+
<property role="3ZfqAx" value="models" />
19381+
<property role="1Hdu6h" value="true" />
19382+
<property role="1HemKv" value="true" />
19383+
<node concept="3LXTmp" id="75IoIgYo$Zf" role="1HemKq">
19384+
<node concept="398BVA" id="75IoIgYo$Zg" role="3LXTmr">
19385+
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
19386+
<node concept="2Ry0Ak" id="75IoIgYo$Zh" role="iGT6I">
19387+
<property role="2Ry0Am" value="languages" />
19388+
<node concept="2Ry0Ak" id="75IoIgYo$Zi" role="2Ry0An">
19389+
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
19390+
<node concept="2Ry0Ak" id="75IoIgYo$Zj" role="2Ry0An">
19391+
<property role="2Ry0Am" value="models" />
19392+
</node>
19393+
</node>
19394+
</node>
19395+
</node>
19396+
<node concept="3qWCbU" id="75IoIgYo$Zk" role="3LXTna">
19397+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
19398+
</node>
19399+
</node>
19400+
</node>
19401+
<node concept="3rtmxn" id="75IoIgYo$Zl" role="3bR31x">
19402+
<node concept="3LXTmp" id="75IoIgYo$Zm" role="3rtmxm">
19403+
<node concept="398BVA" id="75IoIgYo$Zn" role="3LXTmr">
19404+
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
19405+
<node concept="2Ry0Ak" id="75IoIgYo$Zo" role="iGT6I">
19406+
<property role="2Ry0Am" value="languages" />
19407+
<node concept="2Ry0Ak" id="75IoIgYo_Ja" role="2Ry0An">
19408+
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
19409+
</node>
19410+
</node>
19411+
</node>
19412+
<node concept="3qWCbU" id="75IoIgYo$Zq" role="3LXTna">
19413+
<property role="3qWCbO" value="icons/**, resources/**" />
19414+
</node>
19415+
</node>
19416+
</node>
19417+
<node concept="1SiIV0" id="75IoIgYo_WM" role="3bR37C">
19418+
<node concept="3bR9La" id="75IoIgYo_WN" role="1SiIV1">
19419+
<ref role="3bR37D" node="2UnEDPCh8Ac" resolve="de.itemis.model.simple.demo.property" />
19420+
</node>
19421+
</node>
19422+
<node concept="1yeLz9" id="75IoIgYo_X2" role="1TViLv">
19423+
<property role="TrG5h" value="de.itemis.model.simple.demo.enums.generator" />
19424+
<property role="3LESm3" value="7306450b-0779-41f2-97a4-8a2ed3686b8d" />
19425+
<node concept="1BupzO" id="75IoIgYo_Xk" role="3bR31x">
19426+
<property role="3ZfqAx" value="generator/templates" />
19427+
<property role="1Hdu6h" value="true" />
19428+
<property role="1HemKv" value="true" />
19429+
<node concept="3LXTmp" id="75IoIgYo_Xl" role="1HemKq">
19430+
<node concept="398BVA" id="75IoIgYo_X3" role="3LXTmr">
19431+
<ref role="398BVh" node="PE3B26neqW" resolve="extensions.code" />
19432+
<node concept="2Ry0Ak" id="75IoIgYo_X4" role="iGT6I">
19433+
<property role="2Ry0Am" value="languages" />
19434+
<node concept="2Ry0Ak" id="75IoIgYo_X5" role="2Ry0An">
19435+
<property role="2Ry0Am" value="de.itemis.model.simple.demo.enums" />
19436+
<node concept="2Ry0Ak" id="75IoIgYo_X6" role="2Ry0An">
19437+
<property role="2Ry0Am" value="generator" />
19438+
<node concept="2Ry0Ak" id="75IoIgYo_X7" role="2Ry0An">
19439+
<property role="2Ry0Am" value="templates" />
19440+
</node>
19441+
</node>
19442+
</node>
19443+
</node>
19444+
</node>
19445+
<node concept="3qWCbU" id="75IoIgYo_Xm" role="3LXTna">
19446+
<property role="3qWCbO" value="**/*.mps, **/*.mpsr, **/.model" />
19447+
</node>
19448+
</node>
19449+
</node>
19450+
</node>
19451+
</node>
1935819452
</node>
1935919453
<node concept="2G$12M" id="T8sXq9o52B" role="3989C9">
1936019454
<property role="TrG5h" value="plaintextgen-tests" />
@@ -23359,6 +23453,9 @@
2335923453
<node concept="L2wRC" id="2UnEDPCihk6" role="39821P">
2336023454
<ref role="L2wRA" node="2UnEDPCh8Ac" resolve="de.itemis.model.simple.demo.property" />
2336123455
</node>
23456+
<node concept="L2wRC" id="75IoIgYo$Ff" role="39821P">
23457+
<ref role="L2wRA" node="75IoIgYo$Z9" resolve="de.itemis.model.simple.demo.enums" />
23458+
</node>
2336223459
<node concept="L2wRC" id="2UnEDPClM$0" role="39821P">
2336323460
<ref role="L2wRA" node="2UnEDPClLCV" resolve="de.itemis.model.simple.demo.children" />
2336423461
</node>

‎code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,6 @@
733733
<concept id="1201306600024" name="jetbrains.mps.baseLanguage.collections.structure.ContainsKeyOperation" flags="nn" index="2Nt0df">
734734
<child id="1201654602639" name="key" index="38cxEo" />
735735
</concept>
736-
<concept id="1203518072036" name="jetbrains.mps.baseLanguage.collections.structure.SmartClosureParameterDeclaration" flags="ig" index="Rh6nW" />
737736
<concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
738737
<child id="1205679832066" name="ascending" index="2S7zOq" />
739738
</concept>
@@ -89562,14 +89561,14 @@
8956289561
<ref role="3cqZAo" node="6HawCQIfmqS" resolve="style" />
8956389562
</node>
8956489563
<node concept="37vLTw" id="4sEIQIBKza1" role="37wK5m">
89565-
<ref role="3cqZAo" node="4sEIQIBKza2" resolve="it" />
89564+
<ref role="3cqZAo" node="39HLrNfr3Ao" resolve="it" />
8956689565
</node>
8956789566
</node>
8956889567
</node>
8956989568
</node>
89570-
<node concept="Rh6nW" id="4sEIQIBKza2" role="1bW2Oz">
89569+
<node concept="gl6BB" id="39HLrNfr3Ao" role="1bW2Oz">
8957189570
<property role="TrG5h" value="it" />
89572-
<node concept="2jxLKc" id="4sEIQIBKza3" role="1tU5fm" />
89571+
<node concept="2jxLKc" id="39HLrNfr3Ap" role="1tU5fm" />
8957389572
</node>
8957489573
</node>
8957589574
</node>
@@ -89608,14 +89607,14 @@
8960889607
<node concept="1rXfSq" id="4sEIQIBLcwx" role="3clFbG">
8960989608
<ref role="37wK5l" node="74e51JlviKR" resolve="resetButtonVisibility" />
8961089609
<node concept="37vLTw" id="4sEIQIBLfzy" role="37wK5m">
89611-
<ref role="3cqZAo" node="4sEIQIBL8Fs" resolve="it" />
89610+
<ref role="3cqZAo" node="39HLrNfr3Aq" resolve="it" />
8961289611
</node>
8961389612
</node>
8961489613
</node>
8961589614
</node>
89616-
<node concept="Rh6nW" id="4sEIQIBL8Fs" role="1bW2Oz">
89615+
<node concept="gl6BB" id="39HLrNfr3Aq" role="1bW2Oz">
8961789616
<property role="TrG5h" value="it" />
89618-
<node concept="2jxLKc" id="4sEIQIBL8Ft" role="1tU5fm" />
89617+
<node concept="2jxLKc" id="39HLrNfr3Ar" role="1tU5fm" />
8961989618
</node>
8962089619
</node>
8962189620
</node>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<node concept="gft3U" id="5anw8kxNuEs" role="1lVwrX">
7676
<node concept="2YIFZM" id="2cYlIwYGnFW" role="gfFT$">
7777
<ref role="37wK5l" to="gunp:2cYlIwYEMiU" resolve="run" />
78-
<ref role="1Pybhc" to="gunp:2cYlIwY_fxg" resolve="ModelMergeExecutionRunner" />
78+
<ref role="1Pybhc" to="gunp:2cYlIwY_fxg" resolve="ModelMergingRunner" />
7979
<node concept="10Nm6u" id="2cYlIwYEMMV" role="37wK5m">
8080
<node concept="29HgVG" id="2cYlIwYKCiG" role="lGtFl">
8181
<node concept="3NFfHV" id="2cYlIwYKCiH" role="3NFExx">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<node concept="2pIpSj" id="5anw8kxL67F" role="2pJxcM">
101101
<ref role="2pIpSl" to="tp25:g$ehGDh" resolve="concept" />
102102
<node concept="36bGnv" id="2cYlIwYKxU9" role="28nt2d">
103-
<ref role="36bGnp" to="mopj:1EbzjT2RcU7" resolve="ModelMerge" />
103+
<ref role="36bGnp" to="mopj:1EbzjT2RcU7" resolve="ModelMergingPolicy" />
104104
</node>
105105
</node>
106106
</node>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
<node concept="3cpWsn" id="6QQNrZxI98" role="3cpWs9">
205205
<property role="TrG5h" value="modelMerge" />
206206
<node concept="3Tqbb2" id="6QQNrZxI99" role="1tU5fm">
207-
<ref role="ehGHo" to="mopj:1EbzjT2RcU7" resolve="ModelMerge" />
207+
<ref role="ehGHo" to="mopj:1EbzjT2RcU7" resolve="ModelMergingPolicy" />
208208
</node>
209209
<node concept="2OqwBi" id="6QQNrZxJJu" role="33vP2m">
210210
<node concept="2tJFMh" id="6QQNrZxJyQ" role="2Oq$k0">

‎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">

0 commit comments

Comments
 (0)