Skip to content

Add support for partial model merge policy and default actions #1023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mfsoliveira wants to merge 8 commits into from
Closed

Add support for partial model merge policy and default actions #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f7fa544
Support partial merge policy and default merge actions
mfsoliveira Nov 6, 2024
34b5fdf
Fix build script and runtime dependency
mfsoliveira Nov 16, 2024
6188938
Update model-merger.md
mfsoliveira Nov 16, 2024
bbc2b24
Merge branch 'maintenance/mps20232' into feature/ModelMergeDefaults_3
mfsoliveira Nov 18, 2024
bcaf666
Ran migrations
mfsoliveira Nov 18, 2024
ee6c601
Run migrations
mfsoliveira Nov 18, 2024
9976973
Merge remote-tracking branch 'origin/feature/ModelMergeDefaults_3' in…
mfsoliveira Nov 18, 2024
a49ec83
Remove debug statement
mfsoliveira Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8124,9 +8124,9 @@
</node>
</node>
<node concept="1E1JtA" id="5zr7Q_1BD5a" role="2G$12L">
<property role="BnDLt" value="true" />
<property role="TrG5h" value="de.itemis.model.merge.runtime" />
<property role="3LESm3" value="aa8cbd62-5e1f-4d0b-a6e2-189711774c91" />
<property role="BnDLt" value="true" />
<node concept="398BVA" id="5zr7Q_1BDfe" role="3LF7KH">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="5RxOLvL3$92" role="iGT6I">
Expand Down Expand Up @@ -8232,6 +8232,11 @@
<ref role="3bR37D" to="ffeo:rD7wKO6k$" resolve="MPS.Generator" />
</node>
</node>
<node concept="1SiIV0" id="29H$Uu5tuHc" role="3bR37C">
<node concept="3bR9La" id="29H$Uu5tuHd" role="1SiIV1">
<ref role="3bR37D" node="6860Y5A00Lp" resolve="de.itemis.mps.utils.serializer.xml" />
</node>
</node>
</node>
<node concept="1E1JtD" id="5zr7Q_1BAoJ" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down
1 change: 1 addition & 0 deletions code/languages/de.itemis.model.merge/de.itemis.model.merge.mpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
<language slang="l:774bf8a0-62e5-41e1-af63-f4812e60e48b:jetbrains.mps.baseLanguage.checkedDots" version="0" />
<language slang="l:443f4c36-fcf5-4eb6-9500-8d06ed259e3e:jetbrains.mps.baseLanguage.classifiers" version="0" />
<language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
<language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
Expand Down
253 changes: 253 additions & 0 deletions code/languages/de.itemis.model.merge/models/de.itemis.model.merge.behavior.mps
View file
Open in desktop

Large diffs are not rendered by default.

566 changes: 368 additions & 198 deletions code/languages/de.itemis.model.merge/models/de.itemis.model.merge.editor.mps
View file
Open in desktop

Large diffs are not rendered by default.

98 changes: 90 additions & 8 deletions code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,15 @@
<property role="EcuMT" value="1912777765298163335" />
<property role="TrG5h" value="ModelMerge" />
<property role="19KtqR" value="true" />
<node concept="1TJgyj" id="1EbzjT2R$JQ" role="1TKVEi">
<property role="IQ2ns" value="1912777765298260982" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="items" />
<property role="20lbJX" value="fLJekj5/_0__n" />
<ref role="20lvS9" node="1EbzjT2R$JU" resolve="ModelMergeItem" />
<node concept="1TJgyi" id="2GFEb9MrdCG" role="1TKVEl">
<property role="IQ2nx" value="3110765452006840876" />
<property role="TrG5h" value="partialPolicy" />
<ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
</node>
<node concept="1TJgyi" id="5Ql4oYC0__d" role="1TKVEl">
<property role="IQ2nx" value="6743315325753907533" />
<property role="TrG5h" value="useDefaults" />
<ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
</node>
<node concept="1TJgyj" id="1VmHfRy0Ud5" role="1TKVEi">
<property role="IQ2ns" value="2222162468665533253" />
Expand All @@ -87,13 +90,29 @@
<property role="20lbJX" value="fLJekj5/_0__n" />
<ref role="20lvS9" to="tp25:3TEgbCBRn3N" resolve="LanguageRefExpression" />
</node>
<node concept="1TJgyj" id="kewvT_SiLF" role="1TKVEi">
<property role="IQ2ns" value="364371549494520939" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="defaultAction" />
<ref role="20lvS9" node="3P8JlgmMYnQ" resolve="MergerDefaultAction" />
</node>
<node concept="1TJgyj" id="1EbzjT2R$JQ" role="1TKVEi">
<property role="IQ2ns" value="1912777765298260982" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="items" />
<property role="20lbJX" value="fLJekj5/_0__n" />
<ref role="20lvS9" node="1EbzjT2R$JU" resolve="ModelMergeItem" />
</node>
<node concept="PrWs8" id="4mbxYkJdXnB" role="PzmwI">
<ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
</node>
</node>
<node concept="1TIwiD" id="1EbzjT2R$JP">
<property role="EcuMT" value="1912777765298260981" />
<property role="TrG5h" value="MergePolicy" />
<node concept="PrWs8" id="1EbzjT2R$JV" role="PzmwI">
<ref role="PrY4T" node="1EbzjT2R$JU" resolve="ModelMergeItem" />
</node>
<node concept="1TJgyj" id="3BP4DuXu_FH" role="1TKVEi">
<property role="IQ2ns" value="4176264672384277229" />
<property role="20kJfa" value="conceptRef" />
Expand Down Expand Up @@ -127,8 +146,10 @@
<property role="20lbJX" value="fLJekj5/_0__n" />
<ref role="20lvS9" node="3PLTv5jwPx8" resolve="ReferencePolicy" />
</node>
<node concept="PrWs8" id="1EbzjT2R$JV" role="PzmwI">
<ref role="PrY4T" node="1EbzjT2R$JU" resolve="ModelMergeItem" />
<node concept="1TJgyi" id="5xmpdH7cpzi" role="1TKVEl">
<property role="IQ2nx" value="6365386016289822930" />
<property role="TrG5h" value="useDefaults" />
<ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
</node>
</node>
<node concept="PlHQZ" id="1EbzjT2R$JU">
Expand Down Expand Up @@ -514,5 +535,66 @@
<property role="R4oN_" value="Right Version" />
<ref role="1TJDcQ" to="tpee:g76ryKb" resolve="ConceptFunctionParameter" />
</node>
<node concept="1TIwiD" id="3P8JlgmMYnQ">
<property role="EcuMT" value="4415987603494135286" />
<property role="TrG5h" value="MergerDefaultAction" />
<ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
<node concept="1TJgyj" id="zgvH9CGvYJ" role="1TKVEi">
<property role="IQ2ns" value="635146989623967663" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="propertyAction" />
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" node="6zqIeMU2RWS" resolve="AbstractMergeAction" />
</node>
<node concept="1TJgyj" id="zgvH9CGxS0" role="1TKVEi">
<property role="IQ2ns" value="635146989623975424" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="singleChildAction" />
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" node="6zqIeMU2RWS" resolve="AbstractMergeAction" />
</node>
<node concept="1TJgyj" id="zgvH9CGyNu" role="1TKVEi">
<property role="IQ2ns" value="635146989623979230" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="optionalChildAction" />
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" node="6zqIeMU2RWS" resolve="AbstractMergeAction" />
</node>
<node concept="1TJgyj" id="zgvH9CGzp5" role="1TKVEi">
<property role="IQ2ns" value="635146989623981637" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="existsOnlyOnRightAction" />
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" node="6zqIeMU2RWS" resolve="AbstractMergeAction" />
</node>
<node concept="1TJgyj" id="zgvH9CZ$22" role="1TKVEi">
<property role="IQ2ns" value="635146989628964994" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="existsOnlyOnLeftAction" />
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" node="6zqIeMU2RWS" resolve="AbstractMergeAction" />
</node>
<node concept="1TJgyj" id="zgvH9CZ$2a" role="1TKVEi">
<property role="IQ2ns" value="635146989628965002" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="elementOnBothAction" />
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" node="6zqIeMU2RWS" resolve="AbstractMergeAction" />
</node>
<node concept="1TJgyj" id="zgvH9CGX3U" role="1TKVEi">
<property role="IQ2ns" value="635146989624086778" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20kJfa" value="singleRefAction" />
<property role="20lbJX" value="fLJekj4/_1" />
<ref role="20lvS9" node="6zqIeMU2RWS" resolve="AbstractMergeAction" />
</node>
<node concept="1TJgyj" id="zgvH9CH6fk" role="1TKVEi">
<property role="IQ2ns" value="635146989624124372" />
<property role="20lmBu" value="fLJjDmT/aggregation" />
<property role="20lbJX" value="fLJekj4/_1" />
<property role="20kJfa" value="optionalRefAction" />
<ref role="20lvS9" node="6zqIeMU2RWS" resolve="AbstractMergeAction" />
</node>
</node>
</model>

Loading