Reduce errors to warnings when finding missing policies.

JetBrains · Dec 4, 2024 · a833d9c · a833d9c
1 parent 60ae630
commit a833d9c
Show file tree

Hide file tree

Showing 10 changed files with 761 additions and 723 deletions.
diff --git a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.behavior.mps b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.behavior.mps
@@ -1396,7 +1396,7 @@
         </node>
         <node concept="3cpWs8" id="1yAYHyQ78$O" role="3cqZAp">
           <node concept="3cpWsn" id="1yAYHyQ78$P" role="3cpWs9">
-            <property role="TrG5h" value="modelmerge" />
+            <property role="TrG5h" value="mergingPolicy" />
             <node concept="3Tqbb2" id="1yAYHyQ78uC" role="1tU5fm">
               <ref role="ehGHo" to="mopj:1EbzjT2RcU7" resolve="ModelMergingPolicy" />
             </node>
@@ -1414,7 +1414,7 @@
         </node>
         <node concept="3cpWs8" id="1yAYHyQ7lxb" role="3cqZAp">
           <node concept="3cpWsn" id="1yAYHyQ7lxc" role="3cpWs9">
-            <property role="TrG5h" value="mergePolicyChild" />
+            <property role="TrG5h" value="childPolicy" />
             <node concept="3Tqbb2" id="1yAYHyQ7lu1" role="1tU5fm">
               <ref role="ehGHo" to="mopj:1EbzjT2R$JP" resolve="ConceptMergingPolicy" />
             </node>

diff --git a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.editor.mps b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.editor.mps
@@ -364,6 +364,16 @@
           <node concept="2iRkQZ" id="78fCHIExZbM" role="2czzBx" />
         </node>
       </node>
+      <node concept="3EZMnI" id="5HyGTP182kd" role="3EZMnx">
+        <node concept="VPM3Z" id="5HyGTP182kf" role="3F10Kt" />
+        <node concept="3F0ifn" id="5HyGTP182yV" role="3EZMnx">
+          <property role="3F0ifm" value="Partial policy: " />
+        </node>
+        <node concept="3F0A7n" id="5HyGTP182Ag" role="3EZMnx">
+          <ref role="1NtTu8" to="mopj:5HbTgGuQTJM" resolve="partialPolicy" />
+        </node>
+        <node concept="2iRfu4" id="5HyGTP182ki" role="2iSdaV" />
+      </node>
       <node concept="3F2HdR" id="1EbzjT2RA56" role="3EZMnx">
         <ref role="1NtTu8" to="mopj:1EbzjT2R$JQ" resolve="policies" />
         <node concept="2iRkQZ" id="1EbzjT2RA58" role="2czzBx" />

diff --git a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.structure.mps
@@ -90,6 +90,11 @@
     <node concept="PrWs8" id="4mbxYkJdXnB" role="PzmwI">
       <ref role="PrY4T" to="tpck:h0TrEE$" resolve="INamedConcept" />
     </node>
+    <node concept="1TJgyi" id="5HbTgGuQTJM" role="1TKVEl">
+      <property role="IQ2nx" value="6578603516629851122" />
+      <property role="TrG5h" value="partialPolicy" />
+      <ref role="AX2Wp" to="tpck:fKAQMTB" resolve="boolean" />
+    </node>
   </node>
   <node concept="1TIwiD" id="1EbzjT2R$JP">
     <property role="EcuMT" value="1912777765298260981" />

diff --git a/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.typesystem.mps b/code/languages/de.itemis.model.merge/models/de.itemis.model.merge.typesystem.mps
diff --git a/.../solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps b/.../solutions/de.itemis.model.merge.runtime/models/de.itemis.model.merge.runtime.runtime.mps
@@ -4095,7 +4095,7 @@
       </node>
       <node concept="3Tm1VV" id="32ggi2DqhCm" role="1B3o_S" />
       <node concept="37vLTG" id="32ggi2DqhHN" role="3clF46">
-        <property role="TrG5h" value="modelMerge" />
+        <property role="TrG5h" value="mergingPolicy" />
         <node concept="3Tqbb2" id="32ggi2DqhHM" role="1tU5fm">
           <ref role="ehGHo" to="mopj:1EbzjT2RcU7" resolve="ModelMergingPolicy" />
         </node>
@@ -4786,7 +4786,7 @@
         <ref role="3uigEE" node="2V55j61W8Fq" resolve="ModelMerger" />
       </node>
       <node concept="37vLTG" id="3a5mjFh18tT" role="3clF46">
-        <property role="TrG5h" value="modelMerge" />
+        <property role="TrG5h" value="mergingPolicy" />
         <node concept="3Tqbb2" id="3a5mjFh18tU" role="1tU5fm">
           <ref role="ehGHo" to="mopj:1EbzjT2RcU7" resolve="ModelMergingPolicy" />
         </node>
@@ -9222,15 +9222,27 @@
               </node>
             </node>
           </node>
-          <node concept="3eOSWO" id="6XtVDsmyWDk" role="3clFbw">
-            <node concept="3cmrfG" id="6XtVDsmyWEW" role="3uHU7w">
-              <property role="3cmrfH" value="0" />
+          <node concept="1Wc70l" id="5HyGTP1aDxe" role="3clFbw">
+            <node concept="3fqX7Q" id="5HyGTP1aLVp" role="3uHU7B">
+              <node concept="2OqwBi" id="5HyGTP1aLVr" role="3fr31v">
+                <node concept="37vLTw" id="5HyGTP1aLVs" role="2Oq$k0">
+                  <ref role="3cqZAo" node="2QNuyuiLuq_" resolve="modelMerge" />
+                </node>
+                <node concept="3TrcHB" id="5HyGTP1aLVt" role="2OqNvi">
+                  <ref role="3TsBF5" to="mopj:5HbTgGuQTJM" resolve="partialPolicy" />
+                </node>
+              </node>
             </node>
-            <node concept="2OqwBi" id="6XtVDsmySJ2" role="3uHU7B">
-              <node concept="37vLTw" id="6XtVDsmyR3I" role="2Oq$k0">
-                <ref role="3cqZAo" node="6XtVDsmy$sD" resolve="missingConcepts" />
+            <node concept="3eOSWO" id="6XtVDsmyWDk" role="3uHU7w">
+              <node concept="3cmrfG" id="6XtVDsmyWEW" role="3uHU7w">
+                <property role="3cmrfH" value="0" />
+              </node>
+              <node concept="2OqwBi" id="6XtVDsmySJ2" role="3uHU7B">
+                <node concept="37vLTw" id="6XtVDsmyR3I" role="2Oq$k0">
+                  <ref role="3cqZAo" node="6XtVDsmy$sD" resolve="missingConcepts" />
+                </node>
+                <node concept="34oBXx" id="6XtVDsmz1yR" role="2OqNvi" />
               </node>
-              <node concept="34oBXx" id="6XtVDsmz1yR" role="2OqNvi" />
             </node>
           </node>
         </node>
@@ -9333,7 +9345,7 @@
         <ref role="3uigEE" node="2QNuyuiL5OR" resolve="MergerResolverImpl" />
       </node>
       <node concept="37vLTG" id="2QNuyuiLuq_" role="3clF46">
-        <property role="TrG5h" value="modelMerge" />
+        <property role="TrG5h" value="mergingPolicy" />
         <node concept="3Tqbb2" id="2QNuyuiLuqA" role="1tU5fm">
           <ref role="ehGHo" to="mopj:1EbzjT2RcU7" resolve="ModelMergingPolicy" />
         </node>

diff --git a/...ons/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps b/...ons/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.plugin.mps
@@ -121,16 +121,16 @@
       <concept id="2120062183195930062" name="de.itemis.model.merge.structure.ActionCollectionFunctionRightParam" flags="ng" index="2Iixis" />
       <concept id="2120062183195394475" name="de.itemis.model.merge.structure.ActionCollectionFunctionLeftParam" flags="ng" index="2IszzT" />
       <concept id="2120062183195260387" name="de.itemis.model.merge.structure.ManualCollectionAction" flags="ig" index="2Iv4ML" />
-      <concept id="1912777765298260981" name="de.itemis.model.merge.structure.MergePolicy" flags="ng" index="1olsrb">
+      <concept id="1912777765298260981" name="de.itemis.model.merge.structure.ConceptMergingPolicy" flags="ng" index="1olsrb">
         <reference id="4176264672384277229" name="conceptRef" index="24zOxU" />
         <child id="7137735640372265540" name="idFunction" index="21DrV" />
         <child id="1912777765298654333" name="propertyPolicies" index="1orW53" />
         <child id="4427572733332903915" name="referencePolicies" index="1IWF8q" />
         <child id="8422540920006574021" name="childPolicies" index="3JN1Yi" />
       </concept>
-      <concept id="1912777765298266446" name="de.itemis.model.merge.structure.EmptyMergeItem" flags="ng" index="1oluLK" />
-      <concept id="1912777765298163335" name="de.itemis.model.merge.structure.ModelMerge" flags="ng" index="1olOeT">
-        <child id="1912777765298260982" name="items" index="1olsr8" />
+      <concept id="1912777765298266446" name="de.itemis.model.merge.structure.EmptyMergingPolicy" flags="ng" index="1oluLK" />
+      <concept id="1912777765298163335" name="de.itemis.model.merge.structure.ModelMergingPolicy" flags="ng" index="1olOeT">
+        <child id="1912777765298260982" name="policies" index="1olsr8" />
         <child id="8218966909317017940" name="additonalLangs" index="3oy5ef" />
         <child id="2222162468665533253" name="lang" index="3WPhuS" />
       </concept>
@@ -422,12 +422,6 @@
       </node>
     </node>
     <node concept="1oluLK" id="6Ltuup4JpXJ" role="1olsr8" />
-    <node concept="pHN19" id="3pc485VUmVr" role="3WPhuS">
-      <node concept="2V$Bhx" id="6_mEBr3QEVw" role="2V$M_3">
-        <property role="2V$B1T" value="8688ed72-e0ba-44cb-9688-5c8397cb5bbb" />
-        <property role="2V$B1Q" value="de.itemis.model.simple.demo.children" />
-      </node>
-    </node>
     <node concept="1olsrb" id="3pc485VUmVt" role="1olsr8">
       <ref role="24zOxU" to="yeyq:32ggi2DCpGw" resolve="PropertyDummy" />
       <node concept="230_S" id="3pc485VUnjS" role="21DrV">
@@ -471,6 +465,12 @@
         </node>
       </node>
     </node>
+    <node concept="pHN19" id="3pc485VUmVr" role="3WPhuS">
+      <node concept="2V$Bhx" id="6_mEBr3QEVw" role="2V$M_3">
+        <property role="2V$B1T" value="8688ed72-e0ba-44cb-9688-5c8397cb5bbb" />
+        <property role="2V$B1Q" value="de.itemis.model.simple.demo.children" />
+      </node>
+    </node>
   </node>
   <node concept="1olOeT" id="6Ltuup4JpkP">
     <property role="TrG5h" value="CollectionChildMerger" />

diff --git a/...ons/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.result.mps b/...ons/de.itemis.model.merge.simple.demo/models/de.itemis.model.merge.simple.demo.result.mps
@@ -20,11 +20,11 @@
       </concept>
     </language>
   </registry>
-  <node concept="1d83UR" id="5anw8kxKXpM">
-    <node concept="2pctC0" id="5anw8kxKXpN" role="1d83UQ">
+  <node concept="1d83UR" id="3pc485Vw3Jr">
+    <node concept="2pctC0" id="5HyGTP1s362" role="1d83UQ">
       <property role="2pctC1" value="lala&lt;---&gt;lala" />
     </node>
-    <node concept="2pctC0" id="5anw8kxKXpO" role="1aoamK">
+    <node concept="2pctC0" id="5HyGTP1s364" role="1aoamK">
       <property role="2pctC1" value="haha&lt;---&gt;haha" />
     </node>
   </node>

diff --git a/...odel.merge.test.integration/models/[email protected] b/...odel.merge.test.integration/models/[email protected]
@@ -173,8 +173,8 @@
       </concept>
     </language>
     <language id="539e8939-08ef-497c-a5fd-25dd10137a55" name="de.itemis.model.merge">
-      <concept id="6402745832171993510" name="de.itemis.model.merge.structure.ModelMergeExecution" flags="ng" index="poArf">
-        <reference id="6402745832172080681" name="modelMerge" index="pot50" />
+      <concept id="6402745832171993510" name="de.itemis.model.merge.structure.ModelMergingConfiguration" flags="ng" index="poArf">
+        <reference id="6402745832172080681" name="mergingPolicy" index="pot50" />
         <child id="6402745832172399733" name="right" index="ppbcs" />
         <child id="6402745832172287192" name="left" index="ppIIL" />
       </concept>

diff --git a/code/solutions/de.itemis.model.merge.test/models/[email protected] b/code/solutions/de.itemis.model.merge.test/models/[email protected]
@@ -189,15 +189,15 @@
       <concept id="7137735640371846599" name="de.itemis.model.merge.structure.IdFunction" flags="ig" index="230_S" />
       <concept id="7137735640371849272" name="de.itemis.model.merge.structure.IdFunctionParam" flags="ng" index="233M7" />
       <concept id="7555554651740524246" name="de.itemis.model.merge.structure.Right" flags="ng" index="3iOvoU" />
-      <concept id="1912777765298260981" name="de.itemis.model.merge.structure.MergePolicy" flags="ng" index="1olsrb">
+      <concept id="1912777765298260981" name="de.itemis.model.merge.structure.ConceptMergingPolicy" flags="ng" index="1olsrb">
         <reference id="4176264672384277229" name="conceptRef" index="24zOxU" />
         <child id="7137735640372265540" name="idFunction" index="21DrV" />
         <child id="1912777765298654333" name="propertyPolicies" index="1orW53" />
         <child id="8422540920006574021" name="childPolicies" index="3JN1Yi" />
       </concept>
-      <concept id="1912777765298266446" name="de.itemis.model.merge.structure.EmptyMergeItem" flags="ng" index="1oluLK" />
-      <concept id="1912777765298163335" name="de.itemis.model.merge.structure.ModelMerge" flags="ng" index="1olOeT">
-        <child id="1912777765298260982" name="items" index="1olsr8" />
+      <concept id="1912777765298266446" name="de.itemis.model.merge.structure.EmptyMergingPolicy" flags="ng" index="1oluLK" />
+      <concept id="1912777765298163335" name="de.itemis.model.merge.structure.ModelMergingPolicy" flags="ng" index="1olOeT">
+        <child id="1912777765298260982" name="policies" index="1olsr8" />
         <child id="2222162468665533253" name="lang" index="3WPhuS" />
       </concept>
       <concept id="1912777765298654154" name="de.itemis.model.merge.structure.Left" flags="ng" index="1orWrO" />

diff --git a/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps b/code/solutions/de.itemis.model.merge.test/models/de.itemis.model.merge.test.util.mps
@@ -150,15 +150,15 @@
     </language>
     <language id="539e8939-08ef-497c-a5fd-25dd10137a55" name="de.itemis.model.merge">
       <concept id="7137735640371846599" name="de.itemis.model.merge.structure.IdFunction" flags="ig" index="230_S" />
-      <concept id="1912777765298260981" name="de.itemis.model.merge.structure.MergePolicy" flags="ng" index="1olsrb">
+      <concept id="1912777765298260981" name="de.itemis.model.merge.structure.ConceptMergingPolicy" flags="ng" index="1olsrb">
         <reference id="4176264672384277229" name="conceptRef" index="24zOxU" />
         <child id="7137735640372265540" name="idFunction" index="21DrV" />
         <child id="1912777765298654333" name="propertyPolicies" index="1orW53" />
         <child id="8422540920006574021" name="childPolicies" index="3JN1Yi" />
       </concept>
-      <concept id="1912777765298266446" name="de.itemis.model.merge.structure.EmptyMergeItem" flags="ng" index="1oluLK" />
-      <concept id="1912777765298163335" name="de.itemis.model.merge.structure.ModelMerge" flags="ng" index="1olOeT">
-        <child id="1912777765298260982" name="items" index="1olsr8" />
+      <concept id="1912777765298266446" name="de.itemis.model.merge.structure.EmptyMergingPolicy" flags="ng" index="1oluLK" />
+      <concept id="1912777765298163335" name="de.itemis.model.merge.structure.ModelMergingPolicy" flags="ng" index="1olOeT">
+        <child id="1912777765298260982" name="policies" index="1olsr8" />
         <child id="2222162468665533253" name="lang" index="3WPhuS" />
       </concept>
       <concept id="1912777765298654154" name="de.itemis.model.merge.structure.Left" flags="ng" index="1orWrO" />