From 1cbd5defffc6b0e5f070fb413d1bed2d959ff78c Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Fri, 13 Sep 2019 13:44:23 +0200
Subject: [PATCH] Drop PrintDelegate stack, avoid memory leaks.

---
 .../models/jetbrains.mps.logic.dataform.mps   | 317 +----------
 .../models/plugin.mps                         | 522 +++++++-----------
 2 files changed, 213 insertions(+), 626 deletions(-)

diff --git a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
index d28d5ef8..b77ec472 100644
--- a/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
+++ b/coderules/languages/jetbrains.mps.logic/runtime/models/jetbrains.mps.logic.dataform.mps
@@ -54,10 +54,6 @@
       <concept id="1188220165133" name="jetbrains.mps.baseLanguage.structure.ArrayLiteral" flags="nn" index="2BsdOp">
         <child id="1188220173759" name="item" index="2BsfMF" />
       </concept>
-      <concept id="1153952380246" name="jetbrains.mps.baseLanguage.structure.TryStatement" flags="nn" index="2GUZhq">
-        <child id="1153952416686" name="body" index="2GV8ay" />
-        <child id="1153952429843" name="finallyBody" index="2GVbov" />
-      </concept>
       <concept id="2820489544401957797" name="jetbrains.mps.baseLanguage.structure.DefaultClassCreator" flags="nn" index="HV5vD">
         <reference id="2820489544401957798" name="classifier" index="HV5vE" />
       </concept>
@@ -112,9 +108,6 @@
         <child id="1081256993305" name="classType" index="2ZW6by" />
         <child id="1081256993304" name="leftExpression" index="2ZW6bz" />
       </concept>
-      <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
-        <reference id="1144433057691" name="classifier" index="1PxDUh" />
-      </concept>
       <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
       <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
@@ -298,7 +291,6 @@
       <concept id="1080120340718" name="jetbrains.mps.baseLanguage.structure.AndExpression" flags="nn" index="1Wc70l" />
       <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
         <reference id="1170346070688" name="classifier" index="1Y3XeK" />
-        <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
       </concept>
     </language>
     <language id="f2801650-65d5-424e-bb1b-463a8781b786" name="jetbrains.mps.baseLanguage.javadoc">
@@ -3144,36 +3136,11 @@
       <node concept="3Tm1VV" id="5JQSuNs_flv" role="1B3o_S" />
       <node concept="17QB3L" id="6SkxsMz$UX9" role="3clF45" />
       <node concept="3clFbS" id="5JQSuNs_fl$" role="3clF47">
-        <node concept="3SKdUt" id="6r6omRld5Xs" role="3cqZAp">
-          <node concept="1PaTwC" id="589APehYy1Z" role="3ndbpf">
-            <node concept="3oM_SD" id="589APehYy20" role="1PaTwD">
-              <property role="3oM_SC" value="TODO:" />
-            </node>
-            <node concept="3oM_SD" id="589APehYy21" role="1PaTwD">
-              <property role="3oM_SC" value="make" />
-            </node>
-            <node concept="3oM_SD" id="589APehYy22" role="1PaTwD">
-              <property role="3oM_SC" value="sure" />
-            </node>
-            <node concept="3oM_SD" id="589APehYy23" role="1PaTwD">
-              <property role="3oM_SC" value="recursion" />
-            </node>
-            <node concept="3oM_SD" id="589APehYy24" role="1PaTwD">
-              <property role="3oM_SC" value="is" />
-            </node>
-            <node concept="3oM_SD" id="589APehYy25" role="1PaTwD">
-              <property role="3oM_SC" value="impossible" />
-            </node>
-            <node concept="3oM_SD" id="589APehYy26" role="1PaTwD">
-              <property role="3oM_SC" value="here" />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="6r6omRld5y7" role="3cqZAp">
-          <node concept="2YIFZM" id="6r6omRld5IX" role="3clFbG">
-            <ref role="37wK5l" node="4peSo3CLatr" resolve="print" />
-            <ref role="1Pybhc" node="4peSo3CLajR" resolve="PrintDelegate" />
-            <node concept="Xjq3P" id="6r6omRld5Of" role="37wK5m" />
+        <node concept="3clFbF" id="58JqeLv1Yda" role="3cqZAp">
+          <node concept="2YIFZM" id="58JqeLv1Ydc" role="3clFbG">
+            <ref role="37wK5l" node="1G9MbtSGvMe" resolve="print" />
+            <ref role="1Pybhc" node="1G9MbtSGvLs" resolve="DataFormPrinter" />
+            <node concept="Xjq3P" id="58JqeLv1YnD" role="37wK5m" />
           </node>
         </node>
       </node>
@@ -10906,280 +10873,6 @@
     </node>
     <node concept="3Tm1VV" id="2q_78a95hAP" role="1B3o_S" />
   </node>
-  <node concept="312cEu" id="4peSo3CLajR">
-    <property role="TrG5h" value="PrintDelegate" />
-    <property role="1sVAO0" value="true" />
-    <node concept="2tJIrI" id="4peSo3CLatc" role="jymVt" />
-    <node concept="Wx3nA" id="4peSo3CLXMD" role="jymVt">
-      <property role="TrG5h" value="DELEGATE" />
-      <node concept="3Tm6S6" id="4peSo3CLXMF" role="1B3o_S" />
-      <node concept="3uibUv" id="4peSo3CLXS_" role="1tU5fm">
-        <ref role="3uigEE" to="wyt6:~ThreadLocal" resolve="ThreadLocal" />
-        <node concept="3uibUv" id="4peSo3CLXTs" role="11_B2D">
-          <ref role="3uigEE" node="4peSo3CLajR" resolve="PrintDelegate" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="4peSo3CLXX8" role="33vP2m">
-        <node concept="YeOm9" id="4peSo3CLXZq" role="2ShVmc">
-          <node concept="1Y3b0j" id="4peSo3CLXZt" role="YeSDq">
-            <property role="2bfB8j" value="true" />
-            <ref role="37wK5l" to="wyt6:~ThreadLocal.&lt;init&gt;()" resolve="ThreadLocal" />
-            <ref role="1Y3XeK" to="wyt6:~ThreadLocal" resolve="ThreadLocal" />
-            <node concept="3Tm1VV" id="4peSo3CLXZu" role="1B3o_S" />
-            <node concept="3uibUv" id="4peSo3CLXX7" role="2Ghqu4">
-              <ref role="3uigEE" node="4peSo3CLajR" resolve="PrintDelegate" />
-            </node>
-            <node concept="3clFb_" id="4peSo3CLY2o" role="jymVt">
-              <property role="1EzhhJ" value="false" />
-              <property role="TrG5h" value="initialValue" />
-              <property role="DiZV1" value="false" />
-              <node concept="3Tmbuc" id="4peSo3CLY2p" role="1B3o_S" />
-              <node concept="3uibUv" id="4peSo3CLY2u" role="3clF45">
-                <ref role="3uigEE" node="4peSo3CLajR" resolve="PrintDelegate" />
-              </node>
-              <node concept="3clFbS" id="4peSo3CLY2v" role="3clF47">
-                <node concept="3clFbF" id="4peSo3CLYi0" role="3cqZAp">
-                  <node concept="2ShNRf" id="4peSo3CLYi2" role="3clFbG">
-                    <node concept="YeOm9" id="4peSo3CLYi3" role="2ShVmc">
-                      <node concept="1Y3b0j" id="4peSo3CLYi4" role="YeSDq">
-                        <property role="2bfB8j" value="true" />
-                        <ref role="1Y3XeK" node="4peSo3CLajR" resolve="PrintDelegate" />
-                        <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                        <node concept="3Tm1VV" id="4peSo3CLYi5" role="1B3o_S" />
-                        <node concept="3clFb_" id="6r6omRlcrc6" role="jymVt">
-                          <property role="TrG5h" value="doPrint" />
-                          <property role="1EzhhJ" value="false" />
-                          <node concept="37vLTG" id="6r6omRlcrc7" role="3clF46">
-                            <property role="TrG5h" value="df" />
-                            <node concept="3uibUv" id="6r6omRlcrc8" role="1tU5fm">
-                              <ref role="3uigEE" node="1bm7a6EXvsP" resolve="DataForm" />
-                            </node>
-                          </node>
-                          <node concept="17QB3L" id="6r6omRlcrc9" role="3clF45" />
-                          <node concept="3Tm1VV" id="6r6omRlcrca" role="1B3o_S" />
-                          <node concept="3clFbS" id="6r6omRlcrcd" role="3clF47">
-                            <node concept="3clFbF" id="3KN3A4uvMhA" role="3cqZAp">
-                              <node concept="2YIFZM" id="3KN3A4uvMkg" role="3clFbG">
-                                <ref role="37wK5l" node="1G9MbtSGvMe" resolve="print" />
-                                <ref role="1Pybhc" node="1G9MbtSGvLs" resolve="DataFormPrinter" />
-                                <node concept="37vLTw" id="3KN3A4uvM_Q" role="37wK5m">
-                                  <ref role="3cqZAo" node="6r6omRlcrc7" resolve="df" />
-                                </node>
-                              </node>
-                            </node>
-                          </node>
-                          <node concept="2AHcQZ" id="6r6omRlcrI8" role="2AJF6D">
-                            <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                  </node>
-                </node>
-              </node>
-              <node concept="2AHcQZ" id="4peSo3CLY2w" role="2AJF6D">
-                <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4peSo3CM25V" role="jymVt" />
-    <node concept="Wx3nA" id="4peSo3CM3Qf" role="jymVt">
-      <property role="TrG5h" value="STACK" />
-      <node concept="3Tm6S6" id="4peSo3CM3Qh" role="1B3o_S" />
-      <node concept="3uibUv" id="4peSo3CM3WU" role="1tU5fm">
-        <ref role="3uigEE" to="33ny:~LinkedList" resolve="LinkedList" />
-        <node concept="3uibUv" id="4peSo3CM3YT" role="11_B2D">
-          <ref role="3uigEE" node="4peSo3CLajR" resolve="PrintDelegate" />
-        </node>
-      </node>
-      <node concept="2ShNRf" id="4peSo3CM4e2" role="33vP2m">
-        <node concept="1pGfFk" id="4peSo3CM4du" role="2ShVmc">
-          <ref role="37wK5l" to="33ny:~LinkedList.&lt;init&gt;()" resolve="LinkedList" />
-          <node concept="3uibUv" id="4peSo3CM4dv" role="1pMfVU">
-            <ref role="3uigEE" node="4peSo3CLajR" resolve="PrintDelegate" />
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4peSo3CM41r" role="jymVt" />
-    <node concept="2YIFZL" id="3sb6Qlvetq2" role="jymVt">
-      <property role="TrG5h" value="withDelegate" />
-      <node concept="37vLTG" id="3sb6QlvetJI" role="3clF46">
-        <property role="TrG5h" value="delegate" />
-        <node concept="3uibUv" id="3sb6QlvetMy" role="1tU5fm">
-          <ref role="3uigEE" node="4peSo3CLajR" resolve="PrintDelegate" />
-        </node>
-      </node>
-      <node concept="37vLTG" id="3sb6QlvetR9" role="3clF46">
-        <property role="TrG5h" value="run" />
-        <node concept="3uibUv" id="3sb6QlvetU1" role="1tU5fm">
-          <ref role="3uigEE" to="wyt6:~Runnable" resolve="Runnable" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="3sb6Qlvetq4" role="3clF45" />
-      <node concept="3Tm1VV" id="3sb6Qlvetq5" role="1B3o_S" />
-      <node concept="3clFbS" id="3sb6Qlvetq6" role="3clF47">
-        <node concept="2GUZhq" id="3sb6QlvetWb" role="3cqZAp">
-          <node concept="3clFbS" id="3sb6QlvetWc" role="2GV8ay">
-            <node concept="3clFbF" id="3sb6QlvetWY" role="3cqZAp">
-              <node concept="1rXfSq" id="3sb6QlvetWX" role="3clFbG">
-                <ref role="37wK5l" node="4peSo3CM2Ms" resolve="pushDelegate" />
-                <node concept="37vLTw" id="3sb6QlvetZo" role="37wK5m">
-                  <ref role="3cqZAo" node="3sb6QlvetJI" resolve="delegate" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="3sb6Qlveu0w" role="3cqZAp">
-              <node concept="2OqwBi" id="3sb6Qlveu2H" role="3clFbG">
-                <node concept="37vLTw" id="3sb6Qlveu0u" role="2Oq$k0">
-                  <ref role="3cqZAo" node="3sb6QlvetR9" resolve="run" />
-                </node>
-                <node concept="liA8E" id="3sb6Qlveu50" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~Runnable.run()" resolve="run" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbH" id="3sb6Qlveunm" role="3cqZAp" />
-          </node>
-          <node concept="3clFbS" id="3sb6QlvetWd" role="2GVbov">
-            <node concept="3clFbF" id="3sb6Qlveu6n" role="3cqZAp">
-              <node concept="1rXfSq" id="3sb6Qlveu6m" role="3clFbG">
-                <ref role="37wK5l" node="4peSo3CMbfh" resolve="popDelegate" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="3sb6QlvetcL" role="jymVt" />
-    <node concept="2YIFZL" id="4peSo3CM2Ms" role="jymVt">
-      <property role="TrG5h" value="pushDelegate" />
-      <node concept="37vLTG" id="4peSo3CM30y" role="3clF46">
-        <property role="TrG5h" value="factory" />
-        <node concept="3uibUv" id="4peSo3CM31B" role="1tU5fm">
-          <ref role="3uigEE" node="4peSo3CLajR" resolve="PrintDelegate" />
-        </node>
-      </node>
-      <node concept="3cqZAl" id="4peSo3CM2Mu" role="3clF45" />
-      <node concept="3Tm1VV" id="4peSo3CM2Mv" role="1B3o_S" />
-      <node concept="3clFbS" id="4peSo3CM2Mw" role="3clF47">
-        <node concept="3clFbF" id="4peSo3CM4s9" role="3cqZAp">
-          <node concept="2OqwBi" id="4peSo3CM4SX" role="3clFbG">
-            <node concept="10M0yZ" id="6r6omRlcouE" role="2Oq$k0">
-              <ref role="3cqZAo" node="4peSo3CM3Qf" resolve="STACK" />
-              <ref role="1PxDUh" node="4peSo3CLajR" resolve="PrintDelegate" />
-            </node>
-            <node concept="liA8E" id="4peSo3CM95m" role="2OqNvi">
-              <ref role="37wK5l" to="33ny:~LinkedList.push(java.lang.Object)" resolve="push" />
-              <node concept="2OqwBi" id="4peSo3CM9sr" role="37wK5m">
-                <node concept="10M0yZ" id="6r6omRlcouF" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4peSo3CLXMD" resolve="DELEGATE" />
-                  <ref role="1PxDUh" node="4peSo3CLajR" resolve="PrintDelegate" />
-                </node>
-                <node concept="liA8E" id="4peSo3CM9WK" role="2OqNvi">
-                  <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="4peSo3CMahd" role="3cqZAp">
-          <node concept="2OqwBi" id="4peSo3CManT" role="3clFbG">
-            <node concept="10M0yZ" id="6r6omRlcouG" role="2Oq$k0">
-              <ref role="3cqZAo" node="4peSo3CLXMD" resolve="DELEGATE" />
-              <ref role="1PxDUh" node="4peSo3CLajR" resolve="PrintDelegate" />
-            </node>
-            <node concept="liA8E" id="4peSo3CMaA0" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object)" resolve="set" />
-              <node concept="37vLTw" id="4peSo3CMaCS" role="37wK5m">
-                <ref role="3cqZAo" node="4peSo3CM30y" resolve="factory" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4peSo3CMaOq" role="jymVt" />
-    <node concept="2YIFZL" id="4peSo3CMbfh" role="jymVt">
-      <property role="TrG5h" value="popDelegate" />
-      <node concept="3cqZAl" id="4peSo3CMbfj" role="3clF45" />
-      <node concept="3Tm1VV" id="4peSo3CMbfk" role="1B3o_S" />
-      <node concept="3clFbS" id="4peSo3CMbfl" role="3clF47">
-        <node concept="3clFbF" id="4peSo3CMbws" role="3cqZAp">
-          <node concept="2OqwBi" id="4peSo3CMbxr" role="3clFbG">
-            <node concept="10M0yZ" id="6r6omRlcouH" role="2Oq$k0">
-              <ref role="1PxDUh" node="4peSo3CLajR" resolve="PrintDelegate" />
-              <ref role="3cqZAo" node="4peSo3CLXMD" resolve="DELEGATE" />
-            </node>
-            <node concept="liA8E" id="4peSo3CMbHc" role="2OqNvi">
-              <ref role="37wK5l" to="wyt6:~ThreadLocal.set(java.lang.Object)" resolve="set" />
-              <node concept="2OqwBi" id="4peSo3CMce0" role="37wK5m">
-                <node concept="10M0yZ" id="6r6omRlcouI" role="2Oq$k0">
-                  <ref role="1PxDUh" node="4peSo3CLajR" resolve="PrintDelegate" />
-                  <ref role="3cqZAo" node="4peSo3CM3Qf" resolve="STACK" />
-                </node>
-                <node concept="liA8E" id="4peSo3CMefU" role="2OqNvi">
-                  <ref role="37wK5l" to="33ny:~LinkedList.pop()" resolve="pop" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4peSo3CM2GG" role="jymVt" />
-    <node concept="2YIFZL" id="4peSo3CLatr" role="jymVt">
-      <property role="TrG5h" value="print" />
-      <node concept="37vLTG" id="6r6omRlcouK" role="3clF46">
-        <property role="TrG5h" value="root" />
-        <node concept="3uibUv" id="6r6omRlcouL" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="DataForm" />
-        </node>
-      </node>
-      <node concept="17QB3L" id="6r6omRlcpy3" role="3clF45" />
-      <node concept="3Tm1VV" id="4peSo3CLatu" role="1B3o_S" />
-      <node concept="3clFbS" id="4peSo3CLatv" role="3clF47">
-        <node concept="3clFbF" id="4peSo3CLY$E" role="3cqZAp">
-          <node concept="2OqwBi" id="4peSo3CLY$G" role="3clFbG">
-            <node concept="2OqwBi" id="4peSo3CM0Qv" role="2Oq$k0">
-              <node concept="10M0yZ" id="6r6omRlcouJ" role="2Oq$k0">
-                <ref role="1PxDUh" node="4peSo3CLajR" resolve="PrintDelegate" />
-                <ref role="3cqZAo" node="4peSo3CLXMD" resolve="DELEGATE" />
-              </node>
-              <node concept="liA8E" id="4peSo3CM1_m" role="2OqNvi">
-                <ref role="37wK5l" to="wyt6:~ThreadLocal.get()" resolve="get" />
-              </node>
-            </node>
-            <node concept="liA8E" id="4peSo3CLY$I" role="2OqNvi">
-              <ref role="37wK5l" node="4peSo3CLb4X" resolve="doPrint" />
-              <node concept="37vLTw" id="4peSo3CLY$J" role="37wK5m">
-                <ref role="3cqZAo" node="6r6omRlcouK" resolve="root" />
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node concept="2tJIrI" id="4peSo3CLVZn" role="jymVt" />
-    <node concept="3clFb_" id="4peSo3CLb4X" role="jymVt">
-      <property role="TrG5h" value="doPrint" />
-      <property role="1EzhhJ" value="true" />
-      <node concept="37vLTG" id="4peSo3CLb7u" role="3clF46">
-        <property role="TrG5h" value="root" />
-        <node concept="3uibUv" id="4peSo3CLb7v" role="1tU5fm">
-          <ref role="3uigEE" node="1bm7a6EXvsP" resolve="DataForm" />
-        </node>
-      </node>
-      <node concept="17QB3L" id="6r6omRlcoY5" role="3clF45" />
-      <node concept="3Tm1VV" id="4peSo3CLb50" role="1B3o_S" />
-      <node concept="3clFbS" id="4peSo3CLb51" role="3clF47" />
-    </node>
-    <node concept="2tJIrI" id="4peSo3CLath" role="jymVt" />
-    <node concept="3Tm1VV" id="4peSo3CLajS" role="1B3o_S" />
-  </node>
   <node concept="312cEu" id="3OPtF02T8yx">
     <property role="TrG5h" value="Mappers" />
     <node concept="2tJIrI" id="3OPtF02Tc41" role="jymVt" />
diff --git a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
index f2d2e6e0..8423f9d1 100644
--- a/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
+++ b/coderules/solutions/jetbrains.mps.coderules.ui/models/plugin.mps
@@ -462,9 +462,11 @@
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1235746970280" name="jetbrains.mps.baseLanguage.closures.structure.CompactInvokeFunctionExpression" flags="nn" index="2Sg_IR">
         <child id="1235746996653" name="function" index="2SgG2M" />
+        <child id="1235747002942" name="parameter" index="2SgHGx" />
       </concept>
       <concept id="1199542442495" name="jetbrains.mps.baseLanguage.closures.structure.FunctionType" flags="in" index="1ajhzC">
         <child id="1199542457201" name="resultType" index="1ajl9A" />
+        <child id="1199542501692" name="parameterType" index="1ajw0F" />
       </concept>
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
         <child id="1199569906740" name="parameter" index="1bW2Oz" />
@@ -8653,71 +8655,6 @@
           </node>
         </node>
         <node concept="3clFbH" id="6bBjpI8jH7b" role="3cqZAp" />
-        <node concept="3SKdUt" id="6nJA6bpCfES" role="3cqZAp">
-          <node concept="1PaTwC" id="589APehYypb" role="3ndbpf">
-            <node concept="3oM_SD" id="589APehYypc" role="1PaTwD">
-              <property role="3oM_SC" value="FIXME:" />
-            </node>
-            <node concept="3oM_SD" id="589APehYypd" role="1PaTwD">
-              <property role="3oM_SC" value="this" />
-            </node>
-            <node concept="3oM_SD" id="589APehYype" role="1PaTwD">
-              <property role="3oM_SC" value="delegate" />
-            </node>
-            <node concept="3oM_SD" id="589APehYypf" role="1PaTwD">
-              <property role="3oM_SC" value="is" />
-            </node>
-            <node concept="3oM_SD" id="589APehYypg" role="1PaTwD">
-              <property role="3oM_SC" value="never" />
-            </node>
-            <node concept="3oM_SD" id="589APehYyph" role="1PaTwD">
-              <property role="3oM_SC" value="popped." />
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbF" id="7nPD14Nhk6D" role="3cqZAp">
-          <node concept="2YIFZM" id="7nPD14Nhk6E" role="3clFbG">
-            <ref role="37wK5l" to="6exd:4peSo3CM2Ms" resolve="pushDelegate" />
-            <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-            <node concept="2ShNRf" id="7nPD14Nhk6F" role="37wK5m">
-              <node concept="YeOm9" id="7nPD14Nhk6G" role="2ShVmc">
-                <node concept="1Y3b0j" id="7nPD14Nhk6H" role="YeSDq">
-                  <property role="2bfB8j" value="true" />
-                  <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                  <ref role="1Y3XeK" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-                  <node concept="3Tm1VV" id="7nPD14Nhk6I" role="1B3o_S" />
-                  <node concept="3clFb_" id="7nPD14Nhk6J" role="jymVt">
-                    <property role="TrG5h" value="doPrint" />
-                    <property role="1EzhhJ" value="false" />
-                    <node concept="37vLTG" id="7nPD14Nhk6K" role="3clF46">
-                      <property role="TrG5h" value="tf" />
-                      <node concept="3uibUv" id="7nPD14Nhk6L" role="1tU5fm">
-                        <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                      </node>
-                    </node>
-                    <node concept="17QB3L" id="7nPD14Nhk6M" role="3clF45" />
-                    <node concept="3Tm1VV" id="7nPD14Nhk6N" role="1B3o_S" />
-                    <node concept="3clFbS" id="7nPD14Nhk6O" role="3clF47">
-                      <node concept="3clFbF" id="7nPD14Nhk6P" role="3cqZAp">
-                        <node concept="2YIFZM" id="7nPD14Nhk6T" role="3clFbG">
-                          <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
-                          <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
-                          <node concept="37vLTw" id="7nPD14Nhk6U" role="37wK5m">
-                            <ref role="3cqZAo" node="7nPD14Nhk6K" resolve="tf" />
-                          </node>
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="2AHcQZ" id="7nPD14Nhk6W" role="2AJF6D">
-                      <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="7nPD14Nhk2_" role="3cqZAp" />
         <node concept="3clFbF" id="7nPD14NbBrv" role="3cqZAp">
           <node concept="2OqwBi" id="7nPD14NbBsH" role="3clFbG">
             <node concept="37vLTw" id="7nPD14NbBrt" role="2Oq$k0">
@@ -8744,19 +8681,6 @@
                     </node>
                   </node>
                   <node concept="3clFbS" id="7nPD14NhlXS" role="1bW5cS">
-                    <node concept="3SKdUt" id="1EFtv_B_PT0" role="3cqZAp">
-                      <node concept="1PaTwC" id="589APehYypi" role="3ndbpf">
-                        <node concept="3oM_SD" id="589APehYypj" role="1PaTwD">
-                          <property role="3oM_SC" value="FIXME" />
-                        </node>
-                      </node>
-                    </node>
-                    <node concept="3clFbF" id="7nPD14NhmlP" role="3cqZAp">
-                      <node concept="2YIFZM" id="7nPD14NhmlQ" role="3clFbG">
-                        <ref role="37wK5l" to="6exd:4peSo3CMbfh" resolve="popDelegate" />
-                        <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-                      </node>
-                    </node>
                     <node concept="3clFbF" id="1EFtv_B_xBX" role="3cqZAp">
                       <node concept="2OqwBi" id="1EFtv_B_xBY" role="3clFbG">
                         <node concept="37vLTw" id="1EFtv_B_xBZ" role="2Oq$k0">
@@ -17845,99 +17769,102 @@
       <property role="2bfB8j" value="false" />
       <property role="TrG5h" value="Factory" />
       <node concept="2tJIrI" id="6kEuCh$Qqzx" role="jymVt" />
+      <node concept="312cEg" id="58JqeLv2Q9M" role="jymVt">
+        <property role="TrG5h" value="DEFAULT" />
+        <property role="3TUv4t" value="false" />
+        <node concept="1ajhzC" id="58JqeLv3A1f" role="1tU5fm">
+          <node concept="3uibUv" id="58JqeLv3D72" role="1ajw0F">
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          </node>
+          <node concept="17QB3L" id="58JqeLv40ZC" role="1ajl9A" />
+        </node>
+        <node concept="3Tm6S6" id="58JqeLv2Q9O" role="1B3o_S" />
+        <node concept="1bVj0M" id="58JqeLv3GyM" role="33vP2m">
+          <node concept="3clFbS" id="58JqeLv3GyY" role="1bW5cS">
+            <node concept="3clFbF" id="58JqeLv2Q9Z" role="3cqZAp">
+              <node concept="2YIFZM" id="58JqeLv2Uhf" role="3clFbG">
+                <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                <ref role="37wK5l" to="6exd:1G9MbtSGvMe" resolve="print" />
+                <node concept="37vLTw" id="58JqeLv3Nhr" role="37wK5m">
+                  <ref role="3cqZAo" node="58JqeLv3I1U" resolve="df" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="37vLTG" id="58JqeLv3I1U" role="1bW2Oz">
+            <property role="TrG5h" value="df" />
+            <node concept="3uibUv" id="58JqeLv3Jvw" role="1tU5fm">
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2tJIrI" id="58JqeLv2Q9L" role="jymVt" />
       <node concept="312cEg" id="428_4iY$2vJ" role="jymVt">
         <property role="TrG5h" value="CONDENSED" />
         <property role="3TUv4t" value="false" />
-        <node concept="3uibUv" id="6kEuCh$Qhwd" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-        </node>
         <node concept="3Tm6S6" id="6kEuCh$Qhwc" role="1B3o_S" />
-        <node concept="2ShNRf" id="6kEuCh$Qhwe" role="33vP2m">
-          <node concept="YeOm9" id="6kEuCh$Qhwf" role="2ShVmc">
-            <node concept="1Y3b0j" id="6kEuCh$Qhwg" role="YeSDq">
-              <property role="2bfB8j" value="true" />
-              <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-              <ref role="1Y3XeK" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-              <node concept="3Tm1VV" id="6kEuCh$Qhwh" role="1B3o_S" />
-              <node concept="3clFb_" id="6kEuCh$Qhwi" role="jymVt">
-                <property role="TrG5h" value="doPrint" />
-                <property role="1EzhhJ" value="false" />
-                <node concept="37vLTG" id="6kEuCh$Qhwj" role="3clF46">
-                  <property role="TrG5h" value="tf" />
-                  <node concept="3uibUv" id="6kEuCh$Qhwk" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                  </node>
+        <node concept="1ajhzC" id="58JqeLv3Ovf" role="1tU5fm">
+          <node concept="3uibUv" id="58JqeLv3Ovg" role="1ajw0F">
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          </node>
+          <node concept="17QB3L" id="58JqeLv42BT" role="1ajl9A" />
+        </node>
+        <node concept="1bVj0M" id="58JqeLv3QSV" role="33vP2m">
+          <node concept="3clFbS" id="58JqeLv3QSW" role="1bW5cS">
+            <node concept="3clFbF" id="58JqeLv3OQO" role="3cqZAp">
+              <node concept="2YIFZM" id="58JqeLv3OQP" role="3clFbG">
+                <ref role="37wK5l" to="6exd:6kEuCh$O_vn" resolve="printCondensed" />
+                <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                <node concept="37vLTw" id="58JqeLv3S8a" role="37wK5m">
+                  <ref role="3cqZAo" node="58JqeLv3QT0" resolve="df" />
                 </node>
-                <node concept="17QB3L" id="6kEuCh$Qhwl" role="3clF45" />
-                <node concept="3Tm1VV" id="6kEuCh$Qhwm" role="1B3o_S" />
-                <node concept="3clFbS" id="6kEuCh$Qhwn" role="3clF47">
-                  <node concept="3clFbF" id="3KN3A4uCUhO" role="3cqZAp">
-                    <node concept="2YIFZM" id="3KN3A4uCUnC" role="3clFbG">
-                      <ref role="37wK5l" to="6exd:6kEuCh$O_vn" resolve="printCondensed" />
-                      <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
-                      <node concept="37vLTw" id="6kEuCh$Qhwq" role="37wK5m">
-                        <ref role="3cqZAo" node="6kEuCh$Qhwj" resolve="tf" />
-                      </node>
-                      <node concept="37vLTw" id="428_4iY$54x" role="37wK5m">
-                        <ref role="3cqZAo" node="428_4iYzhr2" resolve="nodePresentation" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2AHcQZ" id="6kEuCh$Qhwr" role="2AJF6D">
-                  <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                <node concept="37vLTw" id="58JqeLv3OQR" role="37wK5m">
+                  <ref role="3cqZAo" node="428_4iYzhr2" resolve="nodePresentation" />
                 </node>
               </node>
             </node>
           </node>
+          <node concept="37vLTG" id="58JqeLv3QT0" role="1bW2Oz">
+            <property role="TrG5h" value="df" />
+            <node concept="3uibUv" id="58JqeLv3QT1" role="1tU5fm">
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="428_4iYBOQI" role="jymVt" />
       <node concept="312cEg" id="428_4iYA1gr" role="jymVt">
         <property role="TrG5h" value="FULL" />
         <property role="3TUv4t" value="false" />
-        <node concept="3uibUv" id="428_4iYA1gs" role="1tU5fm">
-          <ref role="3uigEE" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-        </node>
         <node concept="3Tm6S6" id="428_4iYA1gt" role="1B3o_S" />
-        <node concept="2ShNRf" id="428_4iYA1gu" role="33vP2m">
-          <node concept="YeOm9" id="428_4iYA1gv" role="2ShVmc">
-            <node concept="1Y3b0j" id="428_4iYA1gw" role="YeSDq">
-              <property role="2bfB8j" value="true" />
-              <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-              <ref role="1Y3XeK" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-              <node concept="3Tm1VV" id="428_4iYA1gx" role="1B3o_S" />
-              <node concept="3clFb_" id="428_4iYA1gy" role="jymVt">
-                <property role="TrG5h" value="doPrint" />
-                <property role="1EzhhJ" value="false" />
-                <node concept="37vLTG" id="428_4iYA1gz" role="3clF46">
-                  <property role="TrG5h" value="tf" />
-                  <node concept="3uibUv" id="428_4iYA1g$" role="1tU5fm">
-                    <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
-                  </node>
+        <node concept="1ajhzC" id="58JqeLv3VRh" role="1tU5fm">
+          <node concept="3uibUv" id="58JqeLv3VRi" role="1ajw0F">
+            <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+          </node>
+          <node concept="17QB3L" id="58JqeLv42Sw" role="1ajl9A" />
+        </node>
+        <node concept="1bVj0M" id="58JqeLv3W6R" role="33vP2m">
+          <node concept="3clFbS" id="58JqeLv3W6S" role="1bW5cS">
+            <node concept="3clFbF" id="58JqeLv3TQP" role="3cqZAp">
+              <node concept="2YIFZM" id="58JqeLv3TQQ" role="3clFbG">
+                <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
+                <ref role="37wK5l" to="6exd:428_4iYAWU5" resolve="print" />
+                <node concept="37vLTw" id="58JqeLv3Xpl" role="37wK5m">
+                  <ref role="3cqZAo" node="58JqeLv3W6X" resolve="df" />
                 </node>
-                <node concept="17QB3L" id="428_4iYA1g_" role="3clF45" />
-                <node concept="3Tm1VV" id="428_4iYA1gA" role="1B3o_S" />
-                <node concept="3clFbS" id="428_4iYA1gB" role="3clF47">
-                  <node concept="3clFbF" id="428_4iYA1gC" role="3cqZAp">
-                    <node concept="2YIFZM" id="3KN3A4uCVRi" role="3clFbG">
-                      <ref role="1Pybhc" to="6exd:1G9MbtSGvLs" resolve="DataFormPrinter" />
-                      <ref role="37wK5l" to="6exd:428_4iYAWU5" resolve="print" />
-                      <node concept="37vLTw" id="3KN3A4uCVRj" role="37wK5m">
-                        <ref role="3cqZAo" node="428_4iYA1gz" resolve="tf" />
-                      </node>
-                      <node concept="37vLTw" id="3KN3A4uCVRk" role="37wK5m">
-                        <ref role="3cqZAo" node="428_4iYzhr2" resolve="nodePresentation" />
-                      </node>
-                    </node>
-                  </node>
-                </node>
-                <node concept="2AHcQZ" id="428_4iYA1gG" role="2AJF6D">
-                  <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                <node concept="37vLTw" id="58JqeLv3TQS" role="37wK5m">
+                  <ref role="3cqZAo" node="428_4iYzhr2" resolve="nodePresentation" />
                 </node>
               </node>
             </node>
           </node>
+          <node concept="37vLTG" id="58JqeLv3W6X" role="1bW2Oz">
+            <property role="TrG5h" value="df" />
+            <node concept="3uibUv" id="58JqeLv3W6Y" role="1tU5fm">
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            </node>
+          </node>
         </node>
       </node>
       <node concept="2tJIrI" id="6kEuCh$QoV0" role="jymVt" />
@@ -18801,76 +18728,58 @@
                             <node concept="17QB3L" id="7pxta7vksdH" role="1tU5fm" />
                           </node>
                         </node>
-                        <node concept="3clFbF" id="7pxta7vksdI" role="3cqZAp">
-                          <node concept="2YIFZM" id="7pxta7vksdJ" role="3clFbG">
-                            <ref role="37wK5l" to="6exd:3sb6Qlvetq2" resolve="withDelegate" />
-                            <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-                            <node concept="37vLTw" id="7pxta7vksdK" role="37wK5m">
-                              <ref role="3cqZAo" node="428_4iY$2vJ" resolve="CONDENSED" />
-                            </node>
-                            <node concept="1bVj0M" id="7pxta7vksdL" role="37wK5m">
-                              <node concept="3clFbS" id="7pxta7vksdM" role="1bW5cS">
-                                <node concept="3clFbF" id="7pxta7vksdN" role="3cqZAp">
-                                  <node concept="37vLTI" id="7pxta7vksdO" role="3clFbG">
-                                    <node concept="1rXfSq" id="7pxta7vksdP" role="37vLTx">
-                                      <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
-                                      <node concept="37vLTw" id="7pxta7vksdQ" role="37wK5m">
-                                        <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
-                                      </node>
-                                    </node>
-                                    <node concept="37vLTw" id="7pxta7vksdR" role="37vLTJ">
-                                      <ref role="3cqZAo" node="7pxta7vksdG" resolve="condensed" />
-                                    </node>
-                                  </node>
-                                </node>
+                        <node concept="3clFbH" id="58JqeLv24Z8" role="3cqZAp" />
+                        <node concept="3clFbF" id="7pxta7vksdN" role="3cqZAp">
+                          <node concept="37vLTI" id="7pxta7vksdO" role="3clFbG">
+                            <node concept="1rXfSq" id="7pxta7vksdP" role="37vLTx">
+                              <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
+                              <node concept="37vLTw" id="7pxta7vksdQ" role="37wK5m">
+                                <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
                               </node>
+                              <node concept="37vLTw" id="58JqeLv2C_R" role="37wK5m">
+                                <ref role="3cqZAo" node="428_4iY$2vJ" resolve="CONDENSED" />
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="7pxta7vksdR" role="37vLTJ">
+                              <ref role="3cqZAo" node="7pxta7vksdG" resolve="condensed" />
                             </node>
                           </node>
                         </node>
+                        <node concept="3clFbH" id="58JqeLv2$AT" role="3cqZAp" />
                         <node concept="3cpWs8" id="7pxta7vksdS" role="3cqZAp">
                           <node concept="3cpWsn" id="7pxta7vksdT" role="3cpWs9">
                             <property role="TrG5h" value="toolTip" />
                             <node concept="17QB3L" id="7pxta7vksdU" role="1tU5fm" />
                           </node>
                         </node>
-                        <node concept="3clFbF" id="7pxta7vksdV" role="3cqZAp">
-                          <node concept="2YIFZM" id="7pxta7vksdW" role="3clFbG">
-                            <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-                            <ref role="37wK5l" to="6exd:3sb6Qlvetq2" resolve="withDelegate" />
-                            <node concept="37vLTw" id="7pxta7vksdX" role="37wK5m">
-                              <ref role="3cqZAo" node="428_4iYA1gr" resolve="FULL" />
-                            </node>
-                            <node concept="1bVj0M" id="7pxta7vksdY" role="37wK5m">
-                              <node concept="3clFbS" id="7pxta7vksdZ" role="1bW5cS">
-                                <node concept="3clFbF" id="7pxta7vkse0" role="3cqZAp">
-                                  <node concept="37vLTI" id="7pxta7vkse1" role="3clFbG">
-                                    <node concept="3cpWs3" id="7pxta7vkse2" role="37vLTx">
-                                      <node concept="1rXfSq" id="7pxta7vkse3" role="3uHU7w">
-                                        <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
-                                        <node concept="37vLTw" id="7pxta7vkse4" role="37wK5m">
-                                          <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
-                                        </node>
-                                      </node>
-                                      <node concept="3cpWs3" id="7pxta7vkse5" role="3uHU7B">
-                                        <node concept="2OqwBi" id="7pxta7vkse6" role="3uHU7B">
-                                          <node concept="37vLTw" id="7pxta7vkse7" role="2Oq$k0">
-                                            <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
-                                          </node>
-                                          <node concept="liA8E" id="7pxta7vkse8" role="2OqNvi">
-                                            <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                                          </node>
-                                        </node>
-                                        <node concept="Xl_RD" id="7pxta7vkse9" role="3uHU7w">
-                                          <property role="Xl_RC" value="=" />
-                                        </node>
-                                      </node>
-                                    </node>
-                                    <node concept="37vLTw" id="7pxta7vksea" role="37vLTJ">
-                                      <ref role="3cqZAo" node="7pxta7vksdT" resolve="toolTip" />
-                                    </node>
-                                  </node>
+                        <node concept="3clFbF" id="7pxta7vkse0" role="3cqZAp">
+                          <node concept="37vLTI" id="7pxta7vkse1" role="3clFbG">
+                            <node concept="3cpWs3" id="7pxta7vkse2" role="37vLTx">
+                              <node concept="1rXfSq" id="7pxta7vkse3" role="3uHU7w">
+                                <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
+                                <node concept="37vLTw" id="7pxta7vkse4" role="37wK5m">
+                                  <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
+                                </node>
+                                <node concept="37vLTw" id="58JqeLv2G9A" role="37wK5m">
+                                  <ref role="3cqZAo" node="428_4iYA1gr" resolve="FULL" />
                                 </node>
                               </node>
+                              <node concept="3cpWs3" id="7pxta7vkse5" role="3uHU7B">
+                                <node concept="2OqwBi" id="7pxta7vkse6" role="3uHU7B">
+                                  <node concept="37vLTw" id="7pxta7vkse7" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
+                                  </node>
+                                  <node concept="liA8E" id="7pxta7vkse8" role="2OqNvi">
+                                    <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                  </node>
+                                </node>
+                                <node concept="Xl_RD" id="7pxta7vkse9" role="3uHU7w">
+                                  <property role="Xl_RC" value="=" />
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="37vLTw" id="7pxta7vksea" role="37vLTJ">
+                              <ref role="3cqZAo" node="7pxta7vksdT" resolve="toolTip" />
                             </node>
                           </node>
                         </node>
@@ -18958,29 +18867,19 @@
                               <node concept="17QB3L" id="7pxta7vkseI" role="1tU5fm" />
                             </node>
                           </node>
-                          <node concept="3clFbF" id="7pxta7vkseJ" role="3cqZAp">
-                            <node concept="2YIFZM" id="7pxta7vkseK" role="3clFbG">
-                              <ref role="37wK5l" to="6exd:3sb6Qlvetq2" resolve="withDelegate" />
-                              <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-                              <node concept="37vLTw" id="7pxta7vkseL" role="37wK5m">
-                                <ref role="3cqZAo" node="428_4iY$2vJ" resolve="CONDENSED" />
-                              </node>
-                              <node concept="1bVj0M" id="7pxta7vkseM" role="37wK5m">
-                                <node concept="3clFbS" id="7pxta7vkseN" role="1bW5cS">
-                                  <node concept="3clFbF" id="7pxta7vkseO" role="3cqZAp">
-                                    <node concept="37vLTI" id="7pxta7vkseP" role="3clFbG">
-                                      <node concept="1rXfSq" id="7pxta7vkseQ" role="37vLTx">
-                                        <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
-                                        <node concept="37vLTw" id="7pxta7vkseR" role="37wK5m">
-                                          <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
-                                        </node>
-                                      </node>
-                                      <node concept="37vLTw" id="7pxta7vkseS" role="37vLTJ">
-                                        <ref role="3cqZAo" node="7pxta7vkseH" resolve="condensed" />
-                                      </node>
-                                    </node>
-                                  </node>
+                          <node concept="3clFbF" id="7pxta7vkseO" role="3cqZAp">
+                            <node concept="37vLTI" id="7pxta7vkseP" role="3clFbG">
+                              <node concept="1rXfSq" id="7pxta7vkseQ" role="37vLTx">
+                                <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
+                                <node concept="37vLTw" id="7pxta7vkseR" role="37wK5m">
+                                  <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
                                 </node>
+                                <node concept="37vLTw" id="58JqeLv2JyL" role="37wK5m">
+                                  <ref role="3cqZAo" node="428_4iY$2vJ" resolve="CONDENSED" />
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="7pxta7vkseS" role="37vLTJ">
+                                <ref role="3cqZAo" node="7pxta7vkseH" resolve="condensed" />
                               </node>
                             </node>
                           </node>
@@ -18990,44 +18889,34 @@
                               <node concept="17QB3L" id="7pxta7vkseV" role="1tU5fm" />
                             </node>
                           </node>
-                          <node concept="3clFbF" id="7pxta7vkseW" role="3cqZAp">
-                            <node concept="2YIFZM" id="7pxta7vkseX" role="3clFbG">
-                              <ref role="37wK5l" to="6exd:3sb6Qlvetq2" resolve="withDelegate" />
-                              <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-                              <node concept="37vLTw" id="7pxta7vkseY" role="37wK5m">
-                                <ref role="3cqZAo" node="428_4iYA1gr" resolve="FULL" />
-                              </node>
-                              <node concept="1bVj0M" id="7pxta7vkseZ" role="37wK5m">
-                                <node concept="3clFbS" id="7pxta7vksf0" role="1bW5cS">
-                                  <node concept="3clFbF" id="7pxta7vksf1" role="3cqZAp">
-                                    <node concept="37vLTI" id="7pxta7vksf2" role="3clFbG">
-                                      <node concept="3cpWs3" id="7pxta7vksf3" role="37vLTx">
-                                        <node concept="1rXfSq" id="7pxta7vksf4" role="3uHU7w">
-                                          <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
-                                          <node concept="37vLTw" id="7pxta7vksf5" role="37wK5m">
-                                            <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
-                                          </node>
-                                        </node>
-                                        <node concept="3cpWs3" id="7pxta7vksf6" role="3uHU7B">
-                                          <node concept="2OqwBi" id="7pxta7vksf7" role="3uHU7B">
-                                            <node concept="37vLTw" id="7pxta7vksf8" role="2Oq$k0">
-                                              <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
-                                            </node>
-                                            <node concept="liA8E" id="7pxta7vksf9" role="2OqNvi">
-                                              <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
-                                            </node>
-                                          </node>
-                                          <node concept="Xl_RD" id="7pxta7vksfa" role="3uHU7w">
-                                            <property role="Xl_RC" value="=" />
-                                          </node>
-                                        </node>
-                                      </node>
-                                      <node concept="37vLTw" id="7pxta7vksfb" role="37vLTJ">
-                                        <ref role="3cqZAo" node="7pxta7vkseU" resolve="toolTip" />
-                                      </node>
-                                    </node>
+                          <node concept="3clFbF" id="7pxta7vksf1" role="3cqZAp">
+                            <node concept="37vLTI" id="7pxta7vksf2" role="3clFbG">
+                              <node concept="3cpWs3" id="7pxta7vksf3" role="37vLTx">
+                                <node concept="1rXfSq" id="7pxta7vksf4" role="3uHU7w">
+                                  <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
+                                  <node concept="37vLTw" id="7pxta7vksf5" role="37wK5m">
+                                    <ref role="3cqZAo" node="7pxta7vksdr" resolve="val" />
+                                  </node>
+                                  <node concept="37vLTw" id="58JqeLv2MKv" role="37wK5m">
+                                    <ref role="3cqZAo" node="428_4iYA1gr" resolve="FULL" />
                                   </node>
                                 </node>
+                                <node concept="3cpWs3" id="7pxta7vksf6" role="3uHU7B">
+                                  <node concept="2OqwBi" id="7pxta7vksf7" role="3uHU7B">
+                                    <node concept="37vLTw" id="7pxta7vksf8" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="3sb6Qlve15O" resolve="logical" />
+                                    </node>
+                                    <node concept="liA8E" id="7pxta7vksf9" role="2OqNvi">
+                                      <ref role="37wK5l" to="wyt6:~Object.toString()" resolve="toString" />
+                                    </node>
+                                  </node>
+                                  <node concept="Xl_RD" id="7pxta7vksfa" role="3uHU7w">
+                                    <property role="Xl_RC" value="=" />
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="37vLTw" id="7pxta7vksfb" role="37vLTJ">
+                                <ref role="3cqZAo" node="7pxta7vkseU" resolve="toolTip" />
                               </node>
                             </node>
                           </node>
@@ -19075,6 +18964,9 @@
                           <node concept="37vLTw" id="7pxta7vkvEf" role="37wK5m">
                             <ref role="3cqZAo" node="7pxta7vkvE6" resolve="value" />
                           </node>
+                          <node concept="37vLTw" id="58JqeLv2UQg" role="37wK5m">
+                            <ref role="3cqZAo" node="58JqeLv2Q9M" resolve="DEFAULT" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -19179,6 +19071,9 @@
                           <node concept="37vLTw" id="3sb6Qlve178" role="37wK5m">
                             <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
                           </node>
+                          <node concept="37vLTw" id="58JqeLv2XYh" role="37wK5m">
+                            <ref role="3cqZAo" node="58JqeLv2Q9M" resolve="DEFAULT" />
+                          </node>
                         </node>
                       </node>
                     </node>
@@ -19267,28 +19162,18 @@
                           <node concept="17QB3L" id="3sb6Qlve17I" role="1tU5fm" />
                         </node>
                       </node>
-                      <node concept="3clFbF" id="3sb6QlveS7w" role="3cqZAp">
-                        <node concept="2YIFZM" id="3sb6QlveS7x" role="3clFbG">
-                          <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-                          <ref role="37wK5l" to="6exd:3sb6Qlvetq2" resolve="withDelegate" />
-                          <node concept="37vLTw" id="3sb6QlveS7Q" role="37wK5m">
-                            <ref role="3cqZAo" node="428_4iY$2vJ" resolve="CONDENSED" />
+                      <node concept="3clFbF" id="3sb6Qlve17L" role="3cqZAp">
+                        <node concept="37vLTI" id="3sb6Qlve17M" role="3clFbG">
+                          <node concept="37vLTw" id="3sb6Qlve17N" role="37vLTJ">
+                            <ref role="3cqZAo" node="3sb6Qlve17H" resolve="label" />
                           </node>
-                          <node concept="1bVj0M" id="3sb6QlveS7y" role="37wK5m">
-                            <node concept="3clFbS" id="3sb6QlveS7z" role="1bW5cS">
-                              <node concept="3clFbF" id="3sb6Qlve17L" role="3cqZAp">
-                                <node concept="37vLTI" id="3sb6Qlve17M" role="3clFbG">
-                                  <node concept="37vLTw" id="3sb6Qlve17N" role="37vLTJ">
-                                    <ref role="3cqZAo" node="3sb6Qlve17H" resolve="label" />
-                                  </node>
-                                  <node concept="1rXfSq" id="428_4iYCHDR" role="37vLTx">
-                                    <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
-                                    <node concept="37vLTw" id="428_4iYCHW5" role="37wK5m">
-                                      <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
+                          <node concept="1rXfSq" id="428_4iYCHDR" role="37vLTx">
+                            <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
+                            <node concept="37vLTw" id="428_4iYCHW5" role="37wK5m">
+                              <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
+                            </node>
+                            <node concept="37vLTw" id="58JqeLv31hA" role="37wK5m">
+                              <ref role="3cqZAo" node="428_4iY$2vJ" resolve="CONDENSED" />
                             </node>
                           </node>
                         </node>
@@ -19299,28 +19184,18 @@
                           <node concept="17QB3L" id="428_4iYAp$r" role="1tU5fm" />
                         </node>
                       </node>
-                      <node concept="3clFbF" id="428_4iYAmg9" role="3cqZAp">
-                        <node concept="2YIFZM" id="428_4iYAnmr" role="3clFbG">
-                          <ref role="37wK5l" to="6exd:3sb6Qlvetq2" resolve="withDelegate" />
-                          <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-                          <node concept="37vLTw" id="428_4iYAnDJ" role="37wK5m">
-                            <ref role="3cqZAo" node="428_4iYA1gr" resolve="FULL" />
+                      <node concept="3clFbF" id="428_4iYAj5z" role="3cqZAp">
+                        <node concept="37vLTI" id="428_4iYAj5_" role="3clFbG">
+                          <node concept="37vLTw" id="428_4iYAj5D" role="37vLTJ">
+                            <ref role="3cqZAo" node="428_4iYAbpl" resolve="toolTip" />
                           </node>
-                          <node concept="1bVj0M" id="428_4iYAocY" role="37wK5m">
-                            <node concept="3clFbS" id="428_4iYAod0" role="1bW5cS">
-                              <node concept="3clFbF" id="428_4iYAj5z" role="3cqZAp">
-                                <node concept="37vLTI" id="428_4iYAj5_" role="3clFbG">
-                                  <node concept="37vLTw" id="428_4iYAj5D" role="37vLTJ">
-                                    <ref role="3cqZAo" node="428_4iYAbpl" resolve="toolTip" />
-                                  </node>
-                                  <node concept="1rXfSq" id="428_4iYCI_B" role="37vLTx">
-                                    <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
-                                    <node concept="37vLTw" id="428_4iYCIRX" role="37wK5m">
-                                      <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
-                                    </node>
-                                  </node>
-                                </node>
-                              </node>
+                          <node concept="1rXfSq" id="428_4iYCI_B" role="37vLTx">
+                            <ref role="37wK5l" node="2tI9bOlatsa" resolve="presentation" />
+                            <node concept="37vLTw" id="428_4iYCIRX" role="37wK5m">
+                              <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
+                            </node>
+                            <node concept="37vLTw" id="58JqeLv3570" role="37wK5m">
+                              <ref role="3cqZAo" node="428_4iYA1gr" resolve="FULL" />
                             </node>
                           </node>
                         </node>
@@ -19368,6 +19243,9 @@
                       <node concept="37vLTw" id="3sb6Qlve18c" role="37wK5m">
                         <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
                       </node>
+                      <node concept="37vLTw" id="58JqeLv38x0" role="37wK5m">
+                        <ref role="3cqZAo" node="58JqeLv2Q9M" resolve="DEFAULT" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -19404,6 +19282,9 @@
                       <node concept="37vLTw" id="3sb6Qlve18p" role="37wK5m">
                         <ref role="3cqZAo" node="3sb6Qlve15D" resolve="arg" />
                       </node>
+                      <node concept="37vLTw" id="58JqeLv3brb" role="37wK5m">
+                        <ref role="3cqZAo" node="58JqeLv2Q9M" resolve="DEFAULT" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -19468,6 +19349,15 @@
             <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
           </node>
         </node>
+        <node concept="37vLTG" id="58JqeLv26z9" role="3clF46">
+          <property role="TrG5h" value="printDelegate" />
+          <node concept="1ajhzC" id="58JqeLv3lVT" role="1tU5fm">
+            <node concept="3uibUv" id="58JqeLv3oW8" role="1ajw0F">
+              <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
+            </node>
+            <node concept="17QB3L" id="58JqeLv3ZB2" role="1ajl9A" />
+          </node>
+        </node>
         <node concept="17QB3L" id="2tI9bOlavJq" role="3clF45" />
         <node concept="3Tm6S6" id="2tI9bOlauAp" role="1B3o_S" />
         <node concept="3clFbS" id="2tI9bOlatse" role="3clF47">
@@ -19533,17 +19423,18 @@
                 <node concept="9aQIb" id="2tI9bOlaB3r" role="9aQIa">
                   <node concept="3clFbS" id="2tI9bOlaB3s" role="9aQI4">
                     <node concept="3cpWs6" id="6kEuCh$RQy9" role="3cqZAp">
-                      <node concept="2YIFZM" id="6kEuCh$RV$l" role="3cqZAk">
-                        <ref role="37wK5l" to="6exd:4peSo3CLatr" resolve="print" />
-                        <ref role="1Pybhc" to="6exd:4peSo3CLajR" resolve="PrintDelegate" />
-                        <node concept="10QFUN" id="6kEuCh$RX1D" role="37wK5m">
-                          <node concept="3uibUv" id="6kEuCh$RX1E" role="10QFUM">
+                      <node concept="2Sg_IR" id="58JqeLv3s3M" role="3cqZAk">
+                        <node concept="10QFUN" id="58JqeLv3yEM" role="2SgHGx">
+                          <node concept="3uibUv" id="58JqeLv3yEN" role="10QFUM">
                             <ref role="3uigEE" to="6exd:1bm7a6EXvsP" resolve="DataForm" />
                           </node>
-                          <node concept="37vLTw" id="6kEuCh$RX1F" role="10QFUP">
+                          <node concept="37vLTw" id="58JqeLv3yEO" role="10QFUP">
                             <ref role="3cqZAo" node="2tI9bOlayJK" resolve="value" />
                           </node>
                         </node>
+                        <node concept="37vLTw" id="58JqeLv3s3N" role="2SgG2M">
+                          <ref role="3cqZAo" node="58JqeLv26z9" resolve="printDelegate" />
+                        </node>
                       </node>
                     </node>
                   </node>
@@ -19657,6 +19548,9 @@
                                     <node concept="37vLTw" id="6kREIVl5BSD" role="37wK5m">
                                       <ref role="3cqZAo" node="6kREIVl5BSE" resolve="it" />
                                     </node>
+                                    <node concept="37vLTw" id="58JqeLv2cNQ" role="37wK5m">
+                                      <ref role="3cqZAo" node="58JqeLv26z9" resolve="printDelegate" />
+                                    </node>
                                   </node>
                                 </node>
                               </node>