From 4af0192761bfc5047f3608791cfb31e80a08cb5e Mon Sep 17 00:00:00 2001
From: Alexander Pann <apann@itemis.com>
Date: Mon, 14 Oct 2024 09:21:49 +0200
Subject: [PATCH] tables: address review findings

---
 .../generator/template/main@generator.mps     | 161 +++++++++---------
 .../slisson/mps/tables/runtime/gridmodel.mps  |  40 ++++-
 2 files changed, 113 insertions(+), 88 deletions(-)

diff --git a/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps b/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
index 000b373f4..f4f43948d 100644
--- a/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
+++ b/code/tables/languages/de.slisson.mps.tables/generator/template/main@generator.mps
@@ -2893,6 +2893,17 @@
               <node concept="2es0OD" id="dzDMr0FVsd" role="2OqNvi">
                 <node concept="1bVj0M" id="dzDMr0FVsf" role="23t8la">
                   <node concept="3clFbS" id="dzDMr0FVsg" role="1bW5cS">
+                    <node concept="3clFbJ" id="3zknox6GW3w" role="3cqZAp">
+                      <node concept="3clFbS" id="3zknox6GW3y" role="3clFbx">
+                        <node concept="3cpWs6" id="3zknox6H0bi" role="3cqZAp" />
+                      </node>
+                      <node concept="3clFbC" id="3zknox6GXpk" role="3clFbw">
+                        <node concept="10Nm6u" id="3zknox6GYfX" role="3uHU7w" />
+                        <node concept="37vLTw" id="3zknox6GWJE" role="3uHU7B">
+                          <ref role="3cqZAo" node="dzDMr0FVsh" resolve="header" />
+                        </node>
+                      </node>
+                    </node>
                     <node concept="3cpWs8" id="63uETA64d6U" role="3cqZAp">
                       <node concept="3cpWsn" id="63uETA64d6V" role="3cpWs9">
                         <property role="TrG5h" value="findIndex" />
@@ -3016,104 +3027,94 @@
                         </node>
                       </node>
                     </node>
-                    <node concept="3clFbJ" id="dzDMr0_W5m" role="3cqZAp">
-                      <node concept="3clFbS" id="dzDMr0_W5o" role="3clFbx">
-                        <node concept="3clFbJ" id="1ieETfbgMhz" role="3cqZAp">
-                          <node concept="3clFbS" id="1ieETfbgMh_" role="3clFbx">
-                            <node concept="3clFbF" id="dzDMr0sj2w" role="3cqZAp">
-                              <node concept="2OqwBi" id="dzDMr0su5S" role="3clFbG">
-                                <node concept="37vLTw" id="dzDMr0_Uqh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="dzDMr0FVsh" resolve="header" />
-                                </node>
-                                <node concept="liA8E" id="dzDMr0szJZ" role="2OqNvi">
-                                  <ref role="37wK5l" to="6dpw:74LepNRZ_mF" resolve="setRowInsertBeforeHandler" />
-                                  <node concept="2ShNRf" id="dzDMr0sAnV" role="37wK5m">
-                                    <node concept="1pGfFk" id="dzDMr0sIp8" role="2ShVmc">
-                                      <property role="373rjd" value="true" />
-                                      <ref role="37wK5l" to="6dpw:28GSY8argx7" resolve="HeaderNodeInsertAction" />
-                                      <node concept="37vLTw" id="63uETA64OVw" role="37wK5m">
-                                        <ref role="3cqZAo" node="63uETA64fBG" resolve="index" />
-                                      </node>
-                                      <node concept="37vLTw" id="dzDMr0sLxb" role="37wK5m">
-                                        <ref role="3cqZAo" node="66vYtX1MAUW" resolve="insertAction" />
-                                      </node>
-                                    </node>
+                    <node concept="3clFbJ" id="1ieETfbgMhz" role="3cqZAp">
+                      <node concept="3clFbS" id="1ieETfbgMh_" role="3clFbx">
+                        <node concept="3clFbF" id="dzDMr0sj2w" role="3cqZAp">
+                          <node concept="2OqwBi" id="dzDMr0su5S" role="3clFbG">
+                            <node concept="37vLTw" id="dzDMr0_Uqh" role="2Oq$k0">
+                              <ref role="3cqZAo" node="dzDMr0FVsh" resolve="header" />
+                            </node>
+                            <node concept="liA8E" id="dzDMr0szJZ" role="2OqNvi">
+                              <ref role="37wK5l" to="6dpw:74LepNRZ_mF" resolve="setRowInsertBeforeHandler" />
+                              <node concept="2ShNRf" id="dzDMr0sAnV" role="37wK5m">
+                                <node concept="1pGfFk" id="dzDMr0sIp8" role="2ShVmc">
+                                  <property role="373rjd" value="true" />
+                                  <ref role="37wK5l" to="6dpw:28GSY8argx7" resolve="HeaderNodeInsertAction" />
+                                  <node concept="37vLTw" id="63uETA64OVw" role="37wK5m">
+                                    <ref role="3cqZAo" node="63uETA64fBG" resolve="index" />
+                                  </node>
+                                  <node concept="37vLTw" id="dzDMr0sLxb" role="37wK5m">
+                                    <ref role="3cqZAo" node="66vYtX1MAUW" resolve="insertAction" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbF" id="74LepNS0IfQ" role="3cqZAp">
-                              <node concept="2OqwBi" id="74LepNS0IfR" role="3clFbG">
-                                <node concept="37vLTw" id="74LepNS0IfS" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="dzDMr0FVsh" resolve="header" />
-                                </node>
-                                <node concept="liA8E" id="74LepNS0IfT" role="2OqNvi">
-                                  <ref role="37wK5l" to="6dpw:dzDMr0rBjq" resolve="setRowInsertHandler" />
-                                  <node concept="2ShNRf" id="74LepNS0IfU" role="37wK5m">
-                                    <node concept="1pGfFk" id="74LepNS0IfV" role="2ShVmc">
-                                      <property role="373rjd" value="true" />
-                                      <ref role="37wK5l" to="6dpw:28GSY8argx7" resolve="HeaderNodeInsertAction" />
-                                      <node concept="3cpWs3" id="74LepNS0KIq" role="37wK5m">
-                                        <node concept="3cmrfG" id="74LepNS0KK5" role="3uHU7w">
-                                          <property role="3cmrfH" value="1" />
-                                        </node>
-                                        <node concept="37vLTw" id="74LepNS0IfW" role="3uHU7B">
-                                          <ref role="3cqZAo" node="63uETA64fBG" resolve="index" />
-                                        </node>
-                                      </node>
-                                      <node concept="37vLTw" id="74LepNS0IfX" role="37wK5m">
-                                        <ref role="3cqZAo" node="66vYtX1MAUW" resolve="insertAction" />
-                                      </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="74LepNS0IfQ" role="3cqZAp">
+                          <node concept="2OqwBi" id="74LepNS0IfR" role="3clFbG">
+                            <node concept="37vLTw" id="74LepNS0IfS" role="2Oq$k0">
+                              <ref role="3cqZAo" node="dzDMr0FVsh" resolve="header" />
+                            </node>
+                            <node concept="liA8E" id="74LepNS0IfT" role="2OqNvi">
+                              <ref role="37wK5l" to="6dpw:dzDMr0rBjq" resolve="setRowInsertHandler" />
+                              <node concept="2ShNRf" id="74LepNS0IfU" role="37wK5m">
+                                <node concept="1pGfFk" id="74LepNS0IfV" role="2ShVmc">
+                                  <property role="373rjd" value="true" />
+                                  <ref role="37wK5l" to="6dpw:28GSY8argx7" resolve="HeaderNodeInsertAction" />
+                                  <node concept="3cpWs3" id="74LepNS0KIq" role="37wK5m">
+                                    <node concept="3cmrfG" id="74LepNS0KK5" role="3uHU7w">
+                                      <property role="3cmrfH" value="1" />
+                                    </node>
+                                    <node concept="37vLTw" id="74LepNS0IfW" role="3uHU7B">
+                                      <ref role="3cqZAo" node="63uETA64fBG" resolve="index" />
                                     </node>
                                   </node>
+                                  <node concept="37vLTw" id="74LepNS0IfX" role="37wK5m">
+                                    <ref role="3cqZAo" node="66vYtX1MAUW" resolve="insertAction" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="3y3z36" id="1ieETfbgPd0" role="3clFbw">
-                            <node concept="10Nm6u" id="1ieETfbgPRy" role="3uHU7w" />
-                            <node concept="37vLTw" id="1ieETfbgMZI" role="3uHU7B">
-                              <ref role="3cqZAo" node="66vYtX1MAUW" resolve="insertAction" />
-                            </node>
-                          </node>
                         </node>
-                        <node concept="3clFbJ" id="1ieETfbgU_5" role="3cqZAp">
-                          <node concept="3clFbS" id="1ieETfbgU_7" role="3clFbx">
-                            <node concept="3clFbF" id="25cxNQTkbyf" role="3cqZAp">
-                              <node concept="2OqwBi" id="25cxNQTkbyg" role="3clFbG">
-                                <node concept="37vLTw" id="25cxNQTkbyh" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="dzDMr0FVsh" resolve="header" />
-                                </node>
-                                <node concept="liA8E" id="25cxNQTkbyi" role="2OqNvi">
-                                  <ref role="37wK5l" to="6dpw:25cxNQTjAuB" resolve="setRowDeleteHandler" />
-                                  <node concept="2ShNRf" id="25cxNQTkbyj" role="37wK5m">
-                                    <node concept="1pGfFk" id="25cxNQTkbyk" role="2ShVmc">
-                                      <property role="373rjd" value="true" />
-                                      <ref role="37wK5l" to="6dpw:28GSY8are1j" resolve="HeaderNodeDeleteAction" />
-                                      <node concept="37vLTw" id="25cxNQTkbyl" role="37wK5m">
-                                        <ref role="3cqZAo" node="63uETA64fBG" resolve="index" />
-                                      </node>
-                                      <node concept="37vLTw" id="25cxNQTkbym" role="37wK5m">
-                                        <ref role="3cqZAo" node="1k7j3NOhXAQ" resolve="deleteAction" />
-                                      </node>
-                                    </node>
+                      </node>
+                      <node concept="3y3z36" id="1ieETfbgPd0" role="3clFbw">
+                        <node concept="10Nm6u" id="1ieETfbgPRy" role="3uHU7w" />
+                        <node concept="37vLTw" id="1ieETfbgMZI" role="3uHU7B">
+                          <ref role="3cqZAo" node="66vYtX1MAUW" resolve="insertAction" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbJ" id="1ieETfbgU_5" role="3cqZAp">
+                      <node concept="3clFbS" id="1ieETfbgU_7" role="3clFbx">
+                        <node concept="3clFbF" id="25cxNQTkbyf" role="3cqZAp">
+                          <node concept="2OqwBi" id="25cxNQTkbyg" role="3clFbG">
+                            <node concept="37vLTw" id="25cxNQTkbyh" role="2Oq$k0">
+                              <ref role="3cqZAo" node="dzDMr0FVsh" resolve="header" />
+                            </node>
+                            <node concept="liA8E" id="25cxNQTkbyi" role="2OqNvi">
+                              <ref role="37wK5l" to="6dpw:25cxNQTjAuB" resolve="setRowDeleteHandler" />
+                              <node concept="2ShNRf" id="25cxNQTkbyj" role="37wK5m">
+                                <node concept="1pGfFk" id="25cxNQTkbyk" role="2ShVmc">
+                                  <property role="373rjd" value="true" />
+                                  <ref role="37wK5l" to="6dpw:28GSY8are1j" resolve="HeaderNodeDeleteAction" />
+                                  <node concept="37vLTw" id="25cxNQTkbyl" role="37wK5m">
+                                    <ref role="3cqZAo" node="63uETA64fBG" resolve="index" />
+                                  </node>
+                                  <node concept="37vLTw" id="25cxNQTkbym" role="37wK5m">
+                                    <ref role="3cqZAo" node="1k7j3NOhXAQ" resolve="deleteAction" />
                                   </node>
                                 </node>
                               </node>
                             </node>
                           </node>
-                          <node concept="3y3z36" id="1ieETfbgXxC" role="3clFbw">
-                            <node concept="10Nm6u" id="1ieETfbgXDx" role="3uHU7w" />
-                            <node concept="37vLTw" id="1ieETfbgVkz" role="3uHU7B">
-                              <ref role="3cqZAo" node="1k7j3NOhXAQ" resolve="deleteAction" />
-                            </node>
-                          </node>
                         </node>
                       </node>
-                      <node concept="3y3z36" id="dzDMr0_Xfw" role="3clFbw">
-                        <node concept="10Nm6u" id="dzDMr0_Xnp" role="3uHU7w" />
-                        <node concept="37vLTw" id="dzDMr0_WFg" role="3uHU7B">
-                          <ref role="3cqZAo" node="dzDMr0FVsh" resolve="header" />
+                      <node concept="3y3z36" id="1ieETfbgXxC" role="3clFbw">
+                        <node concept="10Nm6u" id="1ieETfbgXDx" role="3uHU7w" />
+                        <node concept="37vLTw" id="1ieETfbgVkz" role="3uHU7B">
+                          <ref role="3cqZAo" node="1k7j3NOhXAQ" resolve="deleteAction" />
                         </node>
                       </node>
                     </node>
diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps
index 728358c0b..282575a83 100644
--- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps
+++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/gridmodel.mps
@@ -171,6 +171,7 @@
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
       <concept id="1225271221393" name="jetbrains.mps.baseLanguage.structure.NPENotEqualsExpression" flags="nn" index="17QLQc" />
       <concept id="1225271283259" name="jetbrains.mps.baseLanguage.structure.NPEEqualsExpression" flags="nn" index="17R0WA" />
+      <concept id="1225271408483" name="jetbrains.mps.baseLanguage.structure.IsNotEmptyOperation" flags="nn" index="17RvpY" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -13389,16 +13390,39 @@
       <node concept="17QB3L" id="1cFYsK3mC0T" role="3clF45" />
       <node concept="3Tm1VV" id="1cFYsK3mC0U" role="1B3o_S" />
       <node concept="3clFbS" id="1cFYsK3mC0W" role="3clF47">
-        <node concept="3clFbF" id="1cFYsK3mCKS" role="3cqZAp">
-          <node concept="3cpWs3" id="1cFYsK3mCR3" role="3clFbG">
-            <node concept="2OqwBi" id="2obP5Y846Fk" role="3uHU7w">
-              <node concept="37vLTw" id="1cFYsK3mCRz" role="2Oq$k0">
+        <node concept="3cpWs8" id="3zknox6HBxm" role="3cqZAp">
+          <node concept="3cpWsn" id="3zknox6HBxp" role="3cpWs9">
+            <property role="TrG5h" value="presentation" />
+            <node concept="17QB3L" id="3zknox6HBxk" role="1tU5fm" />
+            <node concept="2OqwBi" id="3zknox6HDnd" role="33vP2m">
+              <node concept="37vLTw" id="3zknox6HCCt" role="2Oq$k0">
                 <ref role="3cqZAo" node="7C0FR5AJwUb" resolve="myNode" />
               </node>
-              <node concept="2Iv5rx" id="2obP5Y846Fl" role="2OqNvi" />
+              <node concept="2Iv5rx" id="3zknox6HDVF" role="2OqNvi" />
             </node>
-            <node concept="Xl_RD" id="1cFYsK3mCKR" role="3uHU7B">
-              <property role="Xl_RC" value="" />
+          </node>
+        </node>
+        <node concept="3clFbJ" id="3zknox6HFTq" role="3cqZAp">
+          <node concept="3clFbS" id="3zknox6HFTs" role="3clFbx">
+            <node concept="3cpWs6" id="3zknox6HJNX" role="3cqZAp">
+              <node concept="37vLTw" id="3zknox6HLsH" role="3cqZAk">
+                <ref role="3cqZAo" node="3zknox6HBxp" resolve="presentation" />
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="3zknox6HInY" role="3clFbw">
+            <node concept="37vLTw" id="3zknox6HGtx" role="2Oq$k0">
+              <ref role="3cqZAo" node="3zknox6HBxp" resolve="presentation" />
+            </node>
+            <node concept="17RvpY" id="3zknox6HJ7a" role="2OqNvi" />
+          </node>
+          <node concept="9aQIb" id="3zknox6HLZe" role="9aQIa">
+            <node concept="3clFbS" id="3zknox6HLZf" role="9aQI4">
+              <node concept="3cpWs6" id="3zknox6HMFJ" role="3cqZAp">
+                <node concept="1rXfSq" id="3zknox6HNh_" role="3cqZAk">
+                  <ref role="37wK5l" node="7bbwKxst88y" resolve="getValue" />
+                </node>
+              </node>
             </node>
           </node>
         </node>
@@ -35210,7 +35234,7 @@
                     <ref role="3cqZAo" node="3t1pVywiesE" resolve="myGridElement" />
                   </node>
                   <node concept="liA8E" id="25cxNQTNC06" role="2OqNvi">
-                    <ref role="37wK5l" node="3GKqtdqRN0N" resolve="setInsertAction" />
+                    <ref role="37wK5l" node="WOxe9PtF7I" resolve="setDeleteAction" />
                     <node concept="37vLTw" id="25cxNQTNC07" role="37wK5m">
                       <ref role="3cqZAo" node="3t1pVywiedp" resolve="action" />
                     </node>