From 0e431b4fe62fbe48bd02f7b3b59b40c6998cb056 Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Thu, 7 Jan 2016 10:21:11 +0100
Subject: [PATCH 01/15] Diagram: Selection handling after dropping a new box
 from the palette

---
 .../de/itemis/mps/editor/diagram/runtime.mps  | 140 ++++++++++++++
 .../mps/editor/diagram/runtime/model.mps      | 172 ++++++++++++++++++
 2 files changed, 312 insertions(+)

diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps
index e82fe6aafea..9647b95839f 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps
@@ -36,6 +36,7 @@
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="q7tw" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:org.apache.log4j(MPS.Core/)" />
     <import index="ycmz" ref="r:af3e1a90-527b-4262-8066-857208a4f4fb(de.slisson.mps.reflection.runtime)" />
+    <import index="22ra" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.openapi.editor.update(MPS.Editor/)" />
   </imports>
   <registry>
     <language id="654422bf-e75f-44dc-936d-188890a746ce" name="de.slisson.mps.reflection">
@@ -105,6 +106,9 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
+      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
+        <child id="1182160096073" name="cls" index="YeSDq" />
+      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
@@ -242,6 +246,7 @@
       <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
         <child id="1144230900587" name="variable" index="1Duv9x" />
       </concept>
+      <concept id="1107796713796" name="jetbrains.mps.baseLanguage.structure.Interface" flags="ig" index="3HP615" />
       <concept id="1170075670744" name="jetbrains.mps.baseLanguage.structure.SynchronizedStatement" flags="nn" index="1HWtB8">
         <child id="1170075728144" name="expression" index="1HWFw0" />
         <child id="1170075736412" name="block" index="1HWHxc" />
@@ -253,6 +258,9 @@
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
+      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
+        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
+      </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -3219,5 +3227,137 @@
     <node concept="2tJIrI" id="5RIhRmzuaaO" role="jymVt" />
     <node concept="3Tm1VV" id="5RIhRmzu9Is" role="1B3o_S" />
   </node>
+  <node concept="312cEu" id="7LOkw6sezXk">
+    <property role="TrG5h" value="EditorSelectionQueue" />
+    <node concept="2tJIrI" id="7LOkw6sezXI" role="jymVt" />
+    <node concept="2YIFZL" id="7LOkw6seGnM" role="jymVt">
+      <property role="TrG5h" value="queueSelectionHandler" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="7LOkw6sezZY" role="3clF47">
+        <node concept="3clFbF" id="7LOkw6se_ay" role="3cqZAp">
+          <node concept="2OqwBi" id="7LOkw6se_od" role="3clFbG">
+            <node concept="2OqwBi" id="7LOkw6se_jR" role="2Oq$k0">
+              <node concept="37vLTw" id="7LOkw6se_ax" role="2Oq$k0">
+                <ref role="3cqZAo" node="7LOkw6se$Ph" resolve="editorComponent" />
+              </node>
+              <node concept="liA8E" id="7LOkw6se_nl" role="2OqNvi">
+                <ref role="37wK5l" to="cj4x:~EditorComponent.getUpdater():jetbrains.mps.openapi.editor.update.Updater" resolve="getUpdater" />
+              </node>
+            </node>
+            <node concept="liA8E" id="7LOkw6se_sd" role="2OqNvi">
+              <ref role="37wK5l" to="22ra:~Updater.addListener(jetbrains.mps.openapi.editor.update.UpdaterListener):void" resolve="addListener" />
+              <node concept="2ShNRf" id="7LOkw6se_y5" role="37wK5m">
+                <node concept="YeOm9" id="7LOkw6seCka" role="2ShVmc">
+                  <node concept="1Y3b0j" id="7LOkw6seCkd" role="YeSDq">
+                    <property role="2bfB8j" value="true" />
+                    <ref role="1Y3XeK" to="22ra:~UpdaterListener" resolve="UpdaterListener" />
+                    <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                    <node concept="3Tm1VV" id="7LOkw6seCke" role="1B3o_S" />
+                    <node concept="3clFb_" id="7LOkw6seCkf" role="jymVt">
+                      <property role="1EzhhJ" value="false" />
+                      <property role="TrG5h" value="cellSynchronizedWithModel" />
+                      <property role="DiZV1" value="false" />
+                      <property role="od$2w" value="false" />
+                      <node concept="3Tm1VV" id="7LOkw6seCkg" role="1B3o_S" />
+                      <node concept="3cqZAl" id="7LOkw6seCki" role="3clF45" />
+                      <node concept="37vLTG" id="7LOkw6seCkj" role="3clF46">
+                        <property role="TrG5h" value="cell" />
+                        <node concept="3uibUv" id="7LOkw6seCkk" role="1tU5fm">
+                          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="7LOkw6seCkl" role="3clF47" />
+                    </node>
+                    <node concept="3clFb_" id="7LOkw6seCkn" role="jymVt">
+                      <property role="1EzhhJ" value="false" />
+                      <property role="TrG5h" value="editorUpdated" />
+                      <property role="DiZV1" value="false" />
+                      <property role="od$2w" value="false" />
+                      <node concept="3Tm1VV" id="7LOkw6seCko" role="1B3o_S" />
+                      <node concept="3cqZAl" id="7LOkw6seCkq" role="3clF45" />
+                      <node concept="37vLTG" id="7LOkw6seCkr" role="3clF46">
+                        <property role="TrG5h" value="editorComponent" />
+                        <node concept="3uibUv" id="7LOkw6seCks" role="1tU5fm">
+                          <ref role="3uigEE" to="cj4x:~EditorComponent" resolve="EditorComponent" />
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="7LOkw6seCkt" role="3clF47">
+                        <node concept="3clFbF" id="7LOkw6seEwX" role="3cqZAp">
+                          <node concept="2OqwBi" id="7LOkw6seEOW" role="3clFbG">
+                            <node concept="2OqwBi" id="7LOkw6seEKd" role="2Oq$k0">
+                              <node concept="37vLTw" id="7LOkw6seEwV" role="2Oq$k0">
+                                <ref role="3cqZAo" node="7LOkw6seCkr" resolve="editorComponent" />
+                              </node>
+                              <node concept="liA8E" id="7LOkw6seEOe" role="2OqNvi">
+                                <ref role="37wK5l" to="cj4x:~EditorComponent.getUpdater():jetbrains.mps.openapi.editor.update.Updater" resolve="getUpdater" />
+                              </node>
+                            </node>
+                            <node concept="liA8E" id="7LOkw6seETy" role="2OqNvi">
+                              <ref role="37wK5l" to="22ra:~Updater.removeListener(jetbrains.mps.openapi.editor.update.UpdaterListener):void" resolve="removeListener" />
+                              <node concept="Xjq3P" id="7LOkw6seF7N" role="37wK5m" />
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="7LOkw6seCKT" role="3cqZAp">
+                          <node concept="2OqwBi" id="7LOkw6seCZd" role="3clFbG">
+                            <node concept="37vLTw" id="7LOkw6seCKS" role="2Oq$k0">
+                              <ref role="3cqZAo" node="7LOkw6se$fa" resolve="handler" />
+                            </node>
+                            <node concept="liA8E" id="7LOkw6seD1i" role="2OqNvi">
+                              <ref role="37wK5l" node="7LOkw6seFuR" resolve="handle" />
+                              <node concept="37vLTw" id="7LOkw6seDt9" role="37wK5m">
+                                <ref role="3cqZAo" node="7LOkw6seCkr" resolve="editorComponent" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7LOkw6se$Ph" role="3clF46">
+        <property role="TrG5h" value="editorComponent" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="7LOkw6sgoSz" role="1tU5fm">
+          <ref role="3uigEE" to="cj4x:~EditorComponent" resolve="EditorComponent" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7LOkw6se$fa" role="3clF46">
+        <property role="TrG5h" value="handler" />
+        <property role="3TUv4t" value="true" />
+        <node concept="3uibUv" id="7LOkw6se$iM" role="1tU5fm">
+          <ref role="3uigEE" node="7LOkw6seFoF" resolve="EditorSelectionQueue.Handler" />
+        </node>
+      </node>
+      <node concept="3cqZAl" id="7LOkw6sezZW" role="3clF45" />
+      <node concept="3Tm1VV" id="7LOkw6sezZX" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7LOkw6sezXW" role="jymVt" />
+    <node concept="3HP615" id="7LOkw6seFoF" role="jymVt">
+      <property role="2bfB8j" value="false" />
+      <property role="TrG5h" value="Handler" />
+      <node concept="3clFb_" id="7LOkw6seFuR" role="jymVt">
+        <property role="TrG5h" value="handle" />
+        <property role="1EzhhJ" value="true" />
+        <node concept="37vLTG" id="7LOkw6seFuS" role="3clF46">
+          <property role="TrG5h" value="editorComponent" />
+          <node concept="3uibUv" id="7LOkw6sf9_5" role="1tU5fm">
+            <ref role="3uigEE" to="cj4x:~EditorComponent" resolve="EditorComponent" />
+          </node>
+        </node>
+        <node concept="3cqZAl" id="7LOkw6seFuU" role="3clF45" />
+        <node concept="3Tm1VV" id="7LOkw6seFuV" role="1B3o_S" />
+        <node concept="3clFbS" id="7LOkw6seFuW" role="3clF47" />
+      </node>
+      <node concept="3Tm1VV" id="7LOkw6seFoG" role="1B3o_S" />
+    </node>
+    <node concept="3Tm1VV" id="7LOkw6sezXl" role="1B3o_S" />
+  </node>
 </model>
 
diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
index 2c13a9cbf7e..8445087ff44 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/model.mps
@@ -46,6 +46,7 @@
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
     <import index="r3rm" ref="r:7fc96130-6279-4a55-aeeb-422a6879539d(de.itemis.mps.editor.diagram.runtime.jgraph)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
+    <import index="exr9" ref="1ed103c3-3aa6-49b7-9c21-6765ee11f224/java:jetbrains.mps.nodeEditor(MPS.Editor/)" />
     <import index="z8iw" ref="r:dfdf3542-dbcf-43df-870a-3c3504b3c840(jetbrains.mps.baseLanguage.collections.custom)" implicit="true" />
     <import index="lui2" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.module(MPS.OpenAPI/)" implicit="true" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
@@ -17472,6 +17473,14 @@
         </node>
       </node>
     </node>
+    <node concept="312cEg" id="7LOkw6sgRri" role="jymVt">
+      <property role="TrG5h" value="myNewestElement" />
+      <node concept="3Tm6S6" id="7LOkw6sgRrj" role="1B3o_S" />
+      <node concept="3uibUv" id="7LOkw6sgVEV" role="1tU5fm">
+        <ref role="3uigEE" node="27djZ8_YaV_" resolve="IDiagramElement" />
+      </node>
+      <node concept="10Nm6u" id="7LOkw6sgVUT" role="33vP2m" />
+    </node>
     <node concept="312cEg" id="ywgKCS6sv8" role="jymVt">
       <property role="TrG5h" value="myWritesAfterRead" />
       <node concept="3Tm6S6" id="ywgKCS6sv9" role="1B3o_S" />
@@ -17910,6 +17919,159 @@
                         </node>
                       </node>
                     </node>
+                    <node concept="3clFbH" id="7LOkw6sgnPf" role="3cqZAp" />
+                    <node concept="3clFbF" id="7LOkw6seUIc" role="3cqZAp">
+                      <node concept="2YIFZM" id="7LOkw6seUUh" role="3clFbG">
+                        <ref role="37wK5l" to="2o4v:7LOkw6seGnM" resolve="queueSelectionHandler" />
+                        <ref role="1Pybhc" to="2o4v:7LOkw6sezXk" resolve="EditorSelectionQueue" />
+                        <node concept="37vLTw" id="7LOkw6seVdR" role="37wK5m">
+                          <ref role="3cqZAo" node="7jhYr4hveB5" resolve="myEditorComponent" />
+                        </node>
+                        <node concept="2ShNRf" id="7LOkw6seW6h" role="37wK5m">
+                          <node concept="YeOm9" id="7LOkw6seYhL" role="2ShVmc">
+                            <node concept="1Y3b0j" id="7LOkw6seYhO" role="YeSDq">
+                              <property role="2bfB8j" value="true" />
+                              <ref role="1Y3XeK" to="2o4v:7LOkw6seFoF" resolve="EditorSelectionQueue.Handler" />
+                              <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
+                              <node concept="3Tm1VV" id="7LOkw6seYhP" role="1B3o_S" />
+                              <node concept="3clFb_" id="7LOkw6seYhQ" role="jymVt">
+                                <property role="TrG5h" value="handle" />
+                                <property role="1EzhhJ" value="false" />
+                                <node concept="37vLTG" id="7LOkw6seYhR" role="3clF46">
+                                  <property role="TrG5h" value="editorComponent_" />
+                                  <node concept="3uibUv" id="7LOkw6sfa3U" role="1tU5fm">
+                                    <ref role="3uigEE" to="cj4x:~EditorComponent" resolve="EditorComponent" />
+                                  </node>
+                                </node>
+                                <node concept="3cqZAl" id="7LOkw6seYhT" role="3clF45" />
+                                <node concept="3Tm1VV" id="7LOkw6seYhU" role="1B3o_S" />
+                                <node concept="3clFbS" id="7LOkw6seYhW" role="3clF47">
+                                  <node concept="3cpWs8" id="7LOkw6sgkaz" role="3cqZAp">
+                                    <node concept="3cpWsn" id="7LOkw6sgka$" role="3cpWs9">
+                                      <property role="TrG5h" value="newBox" />
+                                      <node concept="3uibUv" id="7LOkw6sgka_" role="1tU5fm">
+                                        <ref role="3uigEE" node="27djZ8_YaUo" resolve="Box" />
+                                      </node>
+                                      <node concept="0kSF2" id="7LOkw6sgYy9" role="33vP2m">
+                                        <node concept="3uibUv" id="7LOkw6sgYIy" role="0kSFW">
+                                          <ref role="3uigEE" node="27djZ8_YaUo" resolve="Box" />
+                                        </node>
+                                        <node concept="37vLTw" id="7LOkw6sgYhF" role="0kSFX">
+                                          <ref role="3cqZAo" node="7LOkw6sgRri" resolve="myNewestElement" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3cpWs8" id="7LOkw6sf2Jo" role="3cqZAp">
+                                    <node concept="3cpWsn" id="7LOkw6sf2Jp" role="3cpWs9">
+                                      <property role="TrG5h" value="editorComponent" />
+                                      <node concept="3uibUv" id="7LOkw6sf474" role="1tU5fm">
+                                        <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+                                      </node>
+                                      <node concept="1eOMI4" id="7LOkw6sf48e" role="33vP2m">
+                                        <node concept="10QFUN" id="7LOkw6sf48f" role="1eOMHV">
+                                          <node concept="37vLTw" id="7LOkw6sf48c" role="10QFUP">
+                                            <ref role="3cqZAo" node="7LOkw6seYhR" resolve="editorComponent_" />
+                                          </node>
+                                          <node concept="3uibUv" id="7LOkw6sf48a" role="10QFUM">
+                                            <ref role="3uigEE" to="exr9:~EditorComponent" resolve="EditorComponent" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3cpWs8" id="7LOkw6sfc9u" role="3cqZAp">
+                                    <node concept="3cpWsn" id="7LOkw6sfc9v" role="3cpWs9">
+                                      <property role="TrG5h" value="rootCell" />
+                                      <node concept="3uibUv" id="7LOkw6sfc9c" role="1tU5fm">
+                                        <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                                      </node>
+                                      <node concept="2OqwBi" id="7LOkw6sfc9w" role="33vP2m">
+                                        <node concept="37vLTw" id="7LOkw6sfc9x" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="7LOkw6sgka$" resolve="newBox" />
+                                        </node>
+                                        <node concept="liA8E" id="7LOkw6sfc9y" role="2OqNvi">
+                                          <ref role="37wK5l" node="1Lwguv8cvZM" resolve="getRootCell" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                  <node concept="3clFbJ" id="7LOkw6sfcC4" role="3cqZAp">
+                                    <node concept="3clFbS" id="7LOkw6sfcC6" role="3clFbx">
+                                      <node concept="3cpWs8" id="7LOkw6shr2f" role="3cqZAp">
+                                        <node concept="3cpWsn" id="7LOkw6shr2g" role="3cpWs9">
+                                          <property role="TrG5h" value="cellToSelect" />
+                                          <node concept="3uibUv" id="7LOkw6shr2h" role="1tU5fm">
+                                            <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                                          </node>
+                                          <node concept="2YIFZM" id="7LOkw6shrxM" role="33vP2m">
+                                            <ref role="1Pybhc" to="g51k:~CellFinderUtil" resolve="CellFinderUtil" />
+                                            <ref role="37wK5l" to="g51k:~CellFinderUtil.findFirstError(jetbrains.mps.openapi.editor.cells.EditorCell,boolean):jetbrains.mps.nodeEditor.cells.EditorCell_Label" resolve="findFirstError" />
+                                            <node concept="37vLTw" id="7LOkw6shrKX" role="37wK5m">
+                                              <ref role="3cqZAo" node="7LOkw6sfc9v" resolve="rootCell" />
+                                            </node>
+                                            <node concept="3clFbT" id="7LOkw6shs0K" role="37wK5m">
+                                              <property role="3clFbU" value="true" />
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="3clFbJ" id="7LOkw6shst5" role="3cqZAp">
+                                        <node concept="3clFbS" id="7LOkw6shst7" role="3clFbx">
+                                          <node concept="3clFbF" id="7LOkw6shue8" role="3cqZAp">
+                                            <node concept="2OqwBi" id="7LOkw6shuwm" role="3clFbG">
+                                              <node concept="37vLTw" id="7LOkw6shue6" role="2Oq$k0">
+                                                <ref role="3cqZAo" node="7LOkw6sf2Jp" resolve="editorComponent" />
+                                              </node>
+                                              <node concept="liA8E" id="7LOkw6shwrs" role="2OqNvi">
+                                                <ref role="37wK5l" to="exr9:~EditorComponent.changeSelection(jetbrains.mps.openapi.editor.cells.EditorCell):void" resolve="changeSelection" />
+                                                <node concept="37vLTw" id="7LOkw6shwT9" role="37wK5m">
+                                                  <ref role="3cqZAo" node="7LOkw6shr2g" resolve="cellToSelect" />
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                        <node concept="3y3z36" id="7LOkw6shtc5" role="3clFbw">
+                                          <node concept="10Nm6u" id="7LOkw6shtr8" role="3uHU7w" />
+                                          <node concept="37vLTw" id="7LOkw6shsWI" role="3uHU7B">
+                                            <ref role="3cqZAo" node="7LOkw6shr2g" resolve="cellToSelect" />
+                                          </node>
+                                        </node>
+                                        <node concept="9aQIb" id="7LOkw6shwU4" role="9aQIa">
+                                          <node concept="3clFbS" id="7LOkw6shwU5" role="9aQI4">
+                                            <node concept="3clFbF" id="7LOkw6sf1iO" role="3cqZAp">
+                                              <node concept="2OqwBi" id="7LOkw6sf1C2" role="3clFbG">
+                                                <node concept="37vLTw" id="7LOkw6sf2Jt" role="2Oq$k0">
+                                                  <ref role="3cqZAo" node="7LOkw6sf2Jp" resolve="editorComponent" />
+                                                </node>
+                                                <node concept="liA8E" id="7LOkw6sf2Ua" role="2OqNvi">
+                                                  <ref role="37wK5l" to="exr9:~EditorComponent.changeSelectionWRTFocusPolicy(jetbrains.mps.openapi.editor.cells.EditorCell):jetbrains.mps.openapi.editor.cells.EditorCell" resolve="changeSelectionWRTFocusPolicy" />
+                                                  <node concept="37vLTw" id="7LOkw6sfc9z" role="37wK5m">
+                                                    <ref role="3cqZAo" node="7LOkw6sfc9v" resolve="rootCell" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="3y3z36" id="7LOkw6sfdnC" role="3clFbw">
+                                      <node concept="10Nm6u" id="7LOkw6sfdAX" role="3uHU7w" />
+                                      <node concept="37vLTw" id="7LOkw6sfd7X" role="3uHU7B">
+                                        <ref role="3cqZAo" node="7LOkw6sfc9v" resolve="rootCell" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbH" id="7LOkw6sgolD" role="3cqZAp" />
                     <node concept="3clFbF" id="ywgKCS6Ufp" role="3cqZAp">
                       <node concept="2OqwBi" id="ywgKCS6Vx1" role="3clFbG">
                         <node concept="37vLTw" id="ywgKCS6Ufn" role="2Oq$k0">
@@ -18996,6 +19158,16 @@
                     </node>
                   </node>
                 </node>
+                <node concept="3clFbF" id="7LOkw6sgWPM" role="3cqZAp">
+                  <node concept="37vLTI" id="7LOkw6sgXAX" role="3clFbG">
+                    <node concept="37vLTw" id="7LOkw6sgXMz" role="37vLTx">
+                      <ref role="3cqZAo" node="63AkbuP71rG" resolve="element" />
+                    </node>
+                    <node concept="37vLTw" id="7LOkw6sgXwL" role="37vLTJ">
+                      <ref role="3cqZAo" node="7LOkw6sgRri" resolve="myNewestElement" />
+                    </node>
+                  </node>
+                </node>
               </node>
               <node concept="3clFbC" id="3jNLn3IfgI" role="3clFbw">
                 <node concept="10Nm6u" id="3jNLn3IgBF" role="3uHU7w" />

From d4fc15feabfd0cb0fec31292acb2982f8d039ec7 Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Thu, 7 Jan 2016 11:39:44 +0100
Subject: [PATCH 02/15] Diagram: Fix caret blinking

---
 .../de/itemis/mps/editor/diagram/runtime.mps  | 312 +++++++++++-------
 .../mps/editor/diagram/runtime/jgraph.mps     | 150 +++++++++
 2 files changed, 336 insertions(+), 126 deletions(-)

diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps
index 9647b95839f..3cfa128b964 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps
@@ -45,6 +45,10 @@
       </concept>
     </language>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
+      <concept id="1224071154655" name="jetbrains.mps.baseLanguage.structure.AsExpression" flags="nn" index="0kSF2">
+        <child id="1224071154657" name="classifierType" index="0kSFW" />
+        <child id="1224071154656" name="expression" index="0kSFX" />
+      </concept>
       <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1082485599095" name="jetbrains.mps.baseLanguage.structure.BlockStatement" flags="nn" index="9aQIb">
         <child id="1082485599096" name="statements" index="9aQI4" />
@@ -53,6 +57,7 @@
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="1153417849900" name="jetbrains.mps.baseLanguage.structure.GreaterThanOrEqualsExpression" flags="nn" index="2d3UOw" />
       <concept id="1153422305557" name="jetbrains.mps.baseLanguage.structure.LessThanOrEqualsExpression" flags="nn" index="2dkUwp" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="ng" index="2tJIrI" />
@@ -258,6 +263,7 @@
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
+      <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" />
       </concept>
@@ -271,19 +277,9 @@
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2" />
     </language>
     <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
-      </concept>
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ng" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="linkRole" index="3V$3am" />
-      </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
-      </concept>
     </language>
     <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
       <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
@@ -661,7 +657,7 @@
               <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
               <node concept="17qRlL" id="3XIm0LXe2Vl" role="37wK5m">
                 <node concept="3b6qkQ" id="3XIm0LXejH6" role="3uHU7w">
-                  <property role="$nhwW" value="0.3" />
+                  <property role="$nhwW" value="0.1" />
                 </node>
                 <node concept="2OqwBi" id="3XIm0LX8SpD" role="3uHU7B">
                   <node concept="2YIFZM" id="3XIm0LX8Shk" role="2Oq$k0">
@@ -995,6 +991,23 @@
         <node concept="3Tm6S6" id="3XIm0LXbchI" role="1B3o_S" />
         <node concept="10P_77" id="3XIm0LXbcDA" role="1tU5fm" />
       </node>
+      <node concept="2tJIrI" id="2cyQj2NFk2F" role="jymVt" />
+      <node concept="312cEg" id="2cyQj2NFlF5" role="jymVt">
+        <property role="TrG5h" value="lastValue" />
+        <node concept="3Tm6S6" id="2cyQj2NFlF6" role="1B3o_S" />
+        <node concept="10P_77" id="2cyQj2NFm0H" role="1tU5fm" />
+        <node concept="3clFbT" id="2cyQj2NFmWs" role="33vP2m">
+          <property role="3clFbU" value="false" />
+        </node>
+      </node>
+      <node concept="312cEg" id="2cyQj2NFmnD" role="jymVt">
+        <property role="TrG5h" value="lastChange" />
+        <node concept="3Tm6S6" id="2cyQj2NFmnE" role="1B3o_S" />
+        <node concept="10Oyi0" id="2cyQj2NFnaW" role="1tU5fm" />
+        <node concept="3cmrfG" id="2cyQj2NFn5W" role="33vP2m">
+          <property role="3cmrfH" value="0" />
+        </node>
+      </node>
       <node concept="2tJIrI" id="3XIm0LXbbTY" role="jymVt" />
       <node concept="3Tm6S6" id="3XIm0LX6lW4" role="1B3o_S" />
       <node concept="3clFb_" id="3XIm0LX6lW6" role="jymVt">
@@ -1036,15 +1049,20 @@
                         <node concept="3cpWsn" id="3XIm0LX6lWq" role="3cpWs9">
                           <property role="3TUv4t" value="false" />
                           <property role="TrG5h" value="selectedCell" />
-                          <node concept="3uibUv" id="3XIm0LX97rR" role="1tU5fm">
-                            <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                          <node concept="3uibUv" id="2cyQj2NFqUK" role="1tU5fm">
+                            <ref role="3uigEE" to="g51k:~EditorCell_Label" resolve="EditorCell_Label" />
                           </node>
-                          <node concept="2OqwBi" id="3XIm0LX6sgS" role="33vP2m">
-                            <node concept="37vLTw" id="3XIm0LX6sgR" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3XIm0LX6lWQ" resolve="editor" />
+                          <node concept="0kSF2" id="2cyQj2NFqDZ" role="33vP2m">
+                            <node concept="3uibUv" id="2cyQj2NFqMC" role="0kSFW">
+                              <ref role="3uigEE" to="g51k:~EditorCell_Label" resolve="EditorCell_Label" />
                             </node>
-                            <node concept="liA8E" id="3XIm0LX6sgT" role="2OqNvi">
-                              <ref role="37wK5l" to="exr9:~EditorComponent.getDeepestSelectedCell():jetbrains.mps.openapi.editor.cells.EditorCell" resolve="getDeepestSelectedCell" />
+                            <node concept="2OqwBi" id="3XIm0LX6sgS" role="0kSFX">
+                              <node concept="37vLTw" id="3XIm0LX6sgR" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3XIm0LX6lWQ" resolve="editor" />
+                              </node>
+                              <node concept="liA8E" id="3XIm0LX6sgT" role="2OqNvi">
+                                <ref role="37wK5l" to="exr9:~EditorComponent.getDeepestSelectedCell():jetbrains.mps.openapi.editor.cells.EditorCell" resolve="getDeepestSelectedCell" />
+                              </node>
                             </node>
                           </node>
                         </node>
@@ -1060,144 +1078,186 @@
                           <node concept="3N13vt" id="3XIm0LX6lWy" role="3cqZAp" />
                         </node>
                       </node>
-                      <node concept="3clFbF" id="3XIm0LX6lW$" role="3cqZAp">
-                        <node concept="2OqwBi" id="3XIm0LX6lW_" role="3clFbG">
-                          <node concept="1eOMI4" id="3XIm0LX6lWD" role="2Oq$k0">
-                            <node concept="10QFUN" id="3XIm0LX6lWA" role="1eOMHV">
-                              <node concept="37vLTw" id="3XIm0LX6lWB" role="10QFUP">
-                                <ref role="3cqZAo" node="3XIm0LX6lWq" resolve="selectedCell" />
-                              </node>
-                              <node concept="3uibUv" id="3XIm0LX6lWC" role="10QFUM">
-                                <ref role="3uigEE" to="g51k:~EditorCell" resolve="EditorCell" />
-                              </node>
-                            </node>
+                      <node concept="3clFbH" id="2cyQj2NFpLn" role="3cqZAp" />
+                      <node concept="3cpWs8" id="2cyQj2NF_zc" role="3cqZAp">
+                        <node concept="3cpWsn" id="2cyQj2NF_zd" role="3cpWs9">
+                          <property role="TrG5h" value="focusOwner" />
+                          <node concept="3uibUv" id="2cyQj2NF_zb" role="1tU5fm">
+                            <ref role="3uigEE" to="z60i:~Component" resolve="Component" />
                           </node>
-                          <node concept="liA8E" id="3XIm0LX6lWE" role="2OqNvi">
-                            <ref role="37wK5l" to="g51k:~EditorCell.switchCaretVisible():void" resolve="switchCaretVisible" />
+                          <node concept="2OqwBi" id="2cyQj2NF_ze" role="33vP2m">
+                            <node concept="2YIFZM" id="2cyQj2NF_zf" role="2Oq$k0">
+                              <ref role="37wK5l" to="z60i:~KeyboardFocusManager.getCurrentKeyboardFocusManager():java.awt.KeyboardFocusManager" resolve="getCurrentKeyboardFocusManager" />
+                              <ref role="1Pybhc" to="z60i:~KeyboardFocusManager" resolve="KeyboardFocusManager" />
+                            </node>
+                            <node concept="liA8E" id="2cyQj2NF_zg" role="2OqNvi">
+                              <ref role="37wK5l" to="z60i:~KeyboardFocusManager.getFocusOwner():java.awt.Component" resolve="getFocusOwner" />
+                            </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="1X3_iC" id="5GwePVE4w7P" role="lGtFl">
-                        <property role="3V$3am" value="statement" />
-                        <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-                        <node concept="3clFbF" id="3XIm0LX6lWF" role="8Wnug">
-                          <node concept="2OqwBi" id="3XIm0LX6sfu" role="3clFbG">
-                            <node concept="37vLTw" id="3XIm0LX6sft" role="2Oq$k0">
+                      <node concept="3clFbJ" id="2cyQj2NFFxX" role="3cqZAp">
+                        <node concept="3clFbS" id="2cyQj2NFFxZ" role="3clFbx">
+                          <node concept="3N13vt" id="2cyQj2NFI$f" role="3cqZAp" />
+                        </node>
+                        <node concept="1Wc70l" id="2cyQj2NFGEX" role="3clFbw">
+                          <node concept="3y3z36" id="2cyQj2NFHUp" role="3uHU7w">
+                            <node concept="37vLTw" id="2cyQj2NFI4x" role="3uHU7w">
                               <ref role="3cqZAo" node="3XIm0LX6lWQ" resolve="editor" />
                             </node>
-                            <node concept="liA8E" id="3XIm0LX6sfv" role="2OqNvi">
-                              <ref role="37wK5l" to="z60i:~Component.repaint(int,int,int,int):void" resolve="repaint" />
-                              <node concept="2OqwBi" id="3XIm0LX6uch" role="37wK5m">
-                                <node concept="37vLTw" id="3XIm0LX6ucg" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3XIm0LX6lWq" resolve="selectedCell" />
-                                </node>
-                                <node concept="liA8E" id="3XIm0LX6uci" role="2OqNvi">
-                                  <ref role="37wK5l" to="f4zo:~EditorCell.getX():int" resolve="getX" />
-                                </node>
-                              </node>
-                              <node concept="2OqwBi" id="3XIm0LX6sfx" role="37wK5m">
-                                <node concept="37vLTw" id="3XIm0LX6sfy" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="3XIm0LX6lWq" resolve="selectedCell" />
-                                </node>
-                                <node concept="liA8E" id="3XIm0LX6sfz" role="2OqNvi">
-                                  <ref role="37wK5l" to="f4zo:~EditorCell.getY():int" resolve="getY" />
-                                </node>
+                            <node concept="2YIFZM" id="2cyQj2NFHg0" role="3uHU7B">
+                              <ref role="37wK5l" to="dxuu:~SwingUtilities.getAncestorOfClass(java.lang.Class,java.awt.Component):java.awt.Container" resolve="getAncestorOfClass" />
+                              <ref role="1Pybhc" to="dxuu:~SwingUtilities" resolve="SwingUtilities" />
+                              <node concept="3VsKOn" id="2cyQj2NFHzz" role="37wK5m">
+                                <ref role="3VsUkX" to="cj4x:~EditorComponent" resolve="EditorComponent" />
                               </node>
-                              <node concept="3cpWs3" id="3XIm0LX6sfG" role="37wK5m">
-                                <node concept="2OqwBi" id="3XIm0LX6sfH" role="3uHU7B">
-                                  <node concept="37vLTw" id="3XIm0LX6sfI" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3XIm0LX6lWq" resolve="selectedCell" />
-                                  </node>
-                                  <node concept="liA8E" id="3XIm0LX6sfJ" role="2OqNvi">
-                                    <ref role="37wK5l" to="f4zo:~EditorCell.getWidth():int" resolve="getWidth" />
-                                  </node>
-                                </node>
-                                <node concept="3cmrfG" id="3XIm0LX6sfK" role="3uHU7w">
-                                  <property role="3cmrfH" value="1" />
-                                </node>
-                              </node>
-                              <node concept="3cpWs3" id="3XIm0LX6sfT" role="37wK5m">
-                                <node concept="2OqwBi" id="3XIm0LX6u7x" role="3uHU7B">
-                                  <node concept="37vLTw" id="3XIm0LX6u7w" role="2Oq$k0">
-                                    <ref role="3cqZAo" node="3XIm0LX6lWq" resolve="selectedCell" />
-                                  </node>
-                                  <node concept="liA8E" id="3XIm0LX6u7y" role="2OqNvi">
-                                    <ref role="37wK5l" to="f4zo:~EditorCell.getHeight():int" resolve="getHeight" />
-                                  </node>
-                                </node>
-                                <node concept="3cmrfG" id="3XIm0LX6sfV" role="3uHU7w">
-                                  <property role="3cmrfH" value="1" />
-                                </node>
+                              <node concept="37vLTw" id="2cyQj2NFHRm" role="37wK5m">
+                                <ref role="3cqZAo" node="2cyQj2NF_zd" resolve="focusOwner" />
                               </node>
                             </node>
                           </node>
+                          <node concept="3y3z36" id="2cyQj2NFGlm" role="3uHU7B">
+                            <node concept="37vLTw" id="2cyQj2NFGaL" role="3uHU7B">
+                              <ref role="3cqZAo" node="2cyQj2NF_zd" resolve="focusOwner" />
+                            </node>
+                            <node concept="37vLTw" id="2cyQj2NFGuu" role="3uHU7w">
+                              <ref role="3cqZAo" node="3XIm0LX6lWQ" resolve="editor" />
+                            </node>
+                          </node>
                         </node>
                       </node>
-                      <node concept="3clFbJ" id="3XIm0LXdJay" role="3cqZAp">
-                        <node concept="3clFbS" id="3XIm0LXdJa_" role="3clFbx" />
-                        <node concept="3fqX7Q" id="3XIm0LXdMqA" role="3clFbw">
-                          <node concept="2OqwBi" id="3XIm0LXdMqC" role="3fr31v">
-                            <node concept="37vLTw" id="3XIm0LXdMqD" role="2Oq$k0">
-                              <ref role="3cqZAo" node="3XIm0LX6lWQ" resolve="editor" />
+                      <node concept="3clFbH" id="2cyQj2NFF5p" role="3cqZAp" />
+                      <node concept="3cpWs8" id="2cyQj2NFriH" role="3cqZAp">
+                        <node concept="3cpWsn" id="2cyQj2NFriI" role="3cpWs9">
+                          <property role="TrG5h" value="value" />
+                          <node concept="10P_77" id="2cyQj2NFriE" role="1tU5fm" />
+                          <node concept="2OqwBi" id="2cyQj2NFriJ" role="33vP2m">
+                            <node concept="37vLTw" id="2cyQj2NFriK" role="2Oq$k0">
+                              <ref role="3cqZAo" node="3XIm0LX6lWq" resolve="selectedCell" />
                             </node>
-                            <node concept="liA8E" id="3XIm0LXdMqE" role="2OqNvi">
-                              <ref role="37wK5l" to="z60i:~Component.hasFocus():boolean" resolve="hasFocus" />
+                            <node concept="1PnCL0" id="2cyQj2NFseH" role="2OqNvi">
+                              <ref role="2Oxat5" to="g51k:~EditorCell_Label.myCaretIsVisible" resolve="myCaretIsVisible" />
                             </node>
                           </node>
                         </node>
                       </node>
-                      <node concept="3clFbF" id="3XIm0LXdziE" role="3cqZAp">
-                        <node concept="2OqwBi" id="3XIm0LXdzWr" role="3clFbG">
-                          <node concept="37vLTw" id="3XIm0LXdziC" role="2Oq$k0">
-                            <ref role="3cqZAo" node="3XIm0LX6lWQ" resolve="editor" />
-                          </node>
-                          <node concept="liA8E" id="3XIm0LXdBfk" role="2OqNvi">
-                            <ref role="37wK5l" to="z60i:~Component.repaint():void" resolve="repaint" />
+                      <node concept="3clFbJ" id="2cyQj2NFrFi" role="3cqZAp">
+                        <node concept="3clFbS" id="2cyQj2NFrFk" role="3clFbx">
+                          <node concept="3clFbF" id="2cyQj2NFtaq" role="3cqZAp">
+                            <node concept="3uNrnE" id="2cyQj2NFtqo" role="3clFbG">
+                              <node concept="37vLTw" id="2cyQj2NFtqq" role="2$L3a6">
+                                <ref role="3cqZAo" node="2cyQj2NFmnD" resolve="lastChange" />
+                              </node>
+                            </node>
                           </node>
                         </node>
-                      </node>
-                      <node concept="3clFbH" id="3XIm0LXeriK" role="3cqZAp" />
-                      <node concept="2Gpval" id="3XIm0LXesft" role="3cqZAp">
-                        <node concept="2GrKxI" id="3XIm0LXesfv" role="2Gsz3X">
-                          <property role="TrG5h" value="cell" />
+                        <node concept="3clFbC" id="2cyQj2NFsps" role="3clFbw">
+                          <node concept="37vLTw" id="2cyQj2NFsF6" role="3uHU7w">
+                            <ref role="3cqZAo" node="2cyQj2NFlF5" resolve="lastValue" />
+                          </node>
+                          <node concept="37vLTw" id="2cyQj2NFrSd" role="3uHU7B">
+                            <ref role="3cqZAo" node="2cyQj2NFriI" resolve="value" />
+                          </node>
                         </node>
-                        <node concept="37vLTw" id="3XIm0LXesIJ" role="2GsD0m">
-                          <ref role="3cqZAo" node="3XIm0LX9pAs" resolve="myEditorCells" />
+                        <node concept="9aQIb" id="2cyQj2NFvX$" role="9aQIa">
+                          <node concept="3clFbS" id="2cyQj2NFvX_" role="9aQI4">
+                            <node concept="3clFbF" id="2cyQj2NFwu9" role="3cqZAp">
+                              <node concept="37vLTI" id="2cyQj2NFwGS" role="3clFbG">
+                                <node concept="3cmrfG" id="2cyQj2NFwQg" role="37vLTx">
+                                  <property role="3cmrfH" value="0" />
+                                </node>
+                                <node concept="37vLTw" id="2cyQj2NFwu8" role="37vLTJ">
+                                  <ref role="3cqZAo" node="2cyQj2NFmnD" resolve="lastChange" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
                         </node>
-                        <node concept="3clFbS" id="3XIm0LXesfz" role="2LFqv$">
-                          <node concept="3clFbJ" id="3XIm0LXetdC" role="3cqZAp">
-                            <node concept="3clFbS" id="3XIm0LXetdD" role="3clFbx">
-                              <node concept="3clFbF" id="3XIm0LXeyCT" role="3cqZAp">
-                                <node concept="2OqwBi" id="3XIm0LXezwt" role="3clFbG">
-                                  <node concept="2OqwBi" id="3XIm0LXeyHq" role="2Oq$k0">
-                                    <node concept="1eOMI4" id="3XIm0LXeyCP" role="2Oq$k0">
-                                      <node concept="10QFUN" id="3XIm0LXeyCM" role="1eOMHV">
-                                        <node concept="3uibUv" id="3XIm0LXeyCR" role="10QFUM">
-                                          <ref role="3uigEE" to="exr9:~EditorCell_WithComponent" resolve="EditorCell_WithComponent" />
+                      </node>
+                      <node concept="3clFbJ" id="2cyQj2NFtLB" role="3cqZAp">
+                        <node concept="3clFbS" id="2cyQj2NFtLD" role="3clFbx">
+                          <node concept="3clFbF" id="2cyQj2NFya1" role="3cqZAp">
+                            <node concept="2OqwBi" id="2cyQj2NFyk4" role="3clFbG">
+                              <node concept="37vLTw" id="2cyQj2NFy9Z" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3XIm0LX6lWq" resolve="selectedCell" />
+                              </node>
+                              <node concept="liA8E" id="2cyQj2NFyEy" role="2OqNvi">
+                                <ref role="37wK5l" to="g51k:~EditorCell_Label.switchCaretVisible():void" resolve="switchCaretVisible" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbF" id="3XIm0LXdziE" role="3cqZAp">
+                            <node concept="2OqwBi" id="3XIm0LXdzWr" role="3clFbG">
+                              <node concept="37vLTw" id="3XIm0LXdziC" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3XIm0LX6lWQ" resolve="editor" />
+                              </node>
+                              <node concept="liA8E" id="3XIm0LXdBfk" role="2OqNvi">
+                                <ref role="37wK5l" to="z60i:~Component.repaint():void" resolve="repaint" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="3clFbH" id="2cyQj2NFzqC" role="3cqZAp" />
+                          <node concept="2Gpval" id="3XIm0LXesft" role="3cqZAp">
+                            <node concept="2GrKxI" id="3XIm0LXesfv" role="2Gsz3X">
+                              <property role="TrG5h" value="cell" />
+                            </node>
+                            <node concept="37vLTw" id="3XIm0LXesIJ" role="2GsD0m">
+                              <ref role="3cqZAo" node="3XIm0LX9pAs" resolve="myEditorCells" />
+                            </node>
+                            <node concept="3clFbS" id="3XIm0LXesfz" role="2LFqv$">
+                              <node concept="3clFbJ" id="3XIm0LXetdC" role="3cqZAp">
+                                <node concept="3clFbS" id="3XIm0LXetdD" role="3clFbx">
+                                  <node concept="3clFbF" id="3XIm0LXeyCT" role="3cqZAp">
+                                    <node concept="2OqwBi" id="3XIm0LXezwt" role="3clFbG">
+                                      <node concept="2OqwBi" id="3XIm0LXeyHq" role="2Oq$k0">
+                                        <node concept="1eOMI4" id="3XIm0LXeyCP" role="2Oq$k0">
+                                          <node concept="10QFUN" id="3XIm0LXeyCM" role="1eOMHV">
+                                            <node concept="3uibUv" id="3XIm0LXeyCR" role="10QFUM">
+                                              <ref role="3uigEE" to="exr9:~EditorCell_WithComponent" resolve="EditorCell_WithComponent" />
+                                            </node>
+                                            <node concept="2GrUjf" id="3XIm0LXeyCS" role="10QFUP">
+                                              <ref role="2Gs0qQ" node="3XIm0LXesfv" resolve="cell" />
+                                            </node>
+                                          </node>
                                         </node>
-                                        <node concept="2GrUjf" id="3XIm0LXeyCS" role="10QFUP">
-                                          <ref role="2Gs0qQ" node="3XIm0LXesfv" resolve="cell" />
+                                        <node concept="liA8E" id="3XIm0LXezlX" role="2OqNvi">
+                                          <ref role="37wK5l" to="exr9:~EditorCell_WithComponent.getComponent():javax.swing.JComponent" resolve="getComponent" />
                                         </node>
                                       </node>
+                                      <node concept="liA8E" id="3XIm0LXe_OC" role="2OqNvi">
+                                        <ref role="37wK5l" to="z60i:~Component.repaint():void" resolve="repaint" />
+                                      </node>
                                     </node>
-                                    <node concept="liA8E" id="3XIm0LXezlX" role="2OqNvi">
-                                      <ref role="37wK5l" to="exr9:~EditorCell_WithComponent.getComponent():javax.swing.JComponent" resolve="getComponent" />
-                                    </node>
                                   </node>
-                                  <node concept="liA8E" id="3XIm0LXe_OC" role="2OqNvi">
-                                    <ref role="37wK5l" to="z60i:~Component.repaint():void" resolve="repaint" />
+                                </node>
+                                <node concept="2ZW3vV" id="3XIm0LXetf9" role="3clFbw">
+                                  <node concept="3uibUv" id="3XIm0LXeyrq" role="2ZW6by">
+                                    <ref role="3uigEE" to="exr9:~EditorCell_WithComponent" resolve="EditorCell_WithComponent" />
+                                  </node>
+                                  <node concept="2GrUjf" id="3XIm0LXete6" role="2ZW6bz">
+                                    <ref role="2Gs0qQ" node="3XIm0LXesfv" resolve="cell" />
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="2ZW3vV" id="3XIm0LXetf9" role="3clFbw">
-                              <node concept="3uibUv" id="3XIm0LXeyrq" role="2ZW6by">
-                                <ref role="3uigEE" to="exr9:~EditorCell_WithComponent" resolve="EditorCell_WithComponent" />
-                              </node>
-                              <node concept="2GrUjf" id="3XIm0LXete6" role="2ZW6bz">
-                                <ref role="2Gs0qQ" node="3XIm0LXesfv" resolve="cell" />
-                              </node>
-                            </node>
+                          </node>
+                        </node>
+                        <node concept="2d3UOw" id="2cyQj2NFupo" role="3clFbw">
+                          <node concept="3cmrfG" id="2cyQj2NFuzo" role="3uHU7w">
+                            <property role="3cmrfH" value="12" />
+                          </node>
+                          <node concept="37vLTw" id="2cyQj2NFu9m" role="3uHU7B">
+                            <ref role="3cqZAo" node="2cyQj2NFmnD" resolve="lastChange" />
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="3clFbF" id="2cyQj2NFvi_" role="3cqZAp">
+                        <node concept="37vLTI" id="2cyQj2NFv$b" role="3clFbG">
+                          <node concept="37vLTw" id="2cyQj2NFvHq" role="37vLTx">
+                            <ref role="3cqZAo" node="2cyQj2NFriI" resolve="value" />
+                          </node>
+                          <node concept="37vLTw" id="2cyQj2NFviz" role="37vLTJ">
+                            <ref role="3cqZAo" node="2cyQj2NFlF5" resolve="lastValue" />
                           </node>
                         </node>
                       </node>
diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 971a660269c..177dd8c9e1b 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -3310,6 +3310,18 @@
           </node>
         </node>
         <node concept="3clFbH" id="7iWEE4EDwLm" role="3cqZAp" />
+        <node concept="3clFbF" id="7LOkw6sjzbi" role="3cqZAp">
+          <node concept="2OqwBi" id="7LOkw6sjzvW" role="3clFbG">
+            <node concept="2YIFZM" id="7LOkw6sjzq3" role="2Oq$k0">
+              <ref role="37wK5l" to="2o4v:3XIm0LX6Tf$" resolve="getInstance" />
+              <ref role="1Pybhc" to="2o4v:3XIm0LX6jhT" resolve="DiagramCaretBlinker" />
+            </node>
+            <node concept="liA8E" id="7LOkw6sjzDo" role="2OqNvi">
+              <ref role="37wK5l" to="2o4v:3XIm0LX9vEQ" resolve="registerEditorCell" />
+              <node concept="Xjq3P" id="7LOkw6sj$24" role="37wK5m" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="3Tm1VV" id="4KKQOHIOe9N" role="1B3o_S" />
       <node concept="3cqZAl" id="4KKQOHIOe9O" role="3clF45" />
@@ -3323,6 +3335,19 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
       <node concept="3clFbS" id="4KKQOHIOe9S" role="3clF47">
+        <node concept="3clFbF" id="7LOkw6sj$ge" role="3cqZAp">
+          <node concept="2OqwBi" id="7LOkw6sj$gf" role="3clFbG">
+            <node concept="2YIFZM" id="7LOkw6sj$gg" role="2Oq$k0">
+              <ref role="1Pybhc" to="2o4v:3XIm0LX6jhT" resolve="DiagramCaretBlinker" />
+              <ref role="37wK5l" to="2o4v:3XIm0LX6Tf$" resolve="getInstance" />
+            </node>
+            <node concept="liA8E" id="7LOkw6sj$gh" role="2OqNvi">
+              <ref role="37wK5l" to="2o4v:3XIm0LX9vF5" resolve="unregisterEditorCell" />
+              <node concept="Xjq3P" id="7LOkw6sj$gi" role="37wK5m" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="7LOkw6sj$6O" role="3cqZAp" />
         <node concept="3clFbF" id="2l7cIJcYXm3" role="3cqZAp">
           <node concept="2OqwBi" id="2l7cIJcYY18" role="3clFbG">
             <node concept="37vLTw" id="2l7cIJcYXm1" role="2Oq$k0">
@@ -50305,6 +50330,131 @@
                             </node>
                           </node>
                         </node>
+                        <node concept="3clFbH" id="7LOkw6sks$6" role="3cqZAp" />
+                        <node concept="3SKdUt" id="7LOkw6sktqa" role="3cqZAp">
+                          <node concept="3SKdUq" id="7LOkw6sktqc" role="3SKWNk">
+                            <property role="3SKdUp" value="force caret drawing" />
+                          </node>
+                        </node>
+                        <node concept="3cpWs8" id="7LOkw6skyGl" role="3cqZAp">
+                          <node concept="3cpWsn" id="7LOkw6skyGm" role="3cpWs9">
+                            <property role="TrG5h" value="deepestSelectedCell" />
+                            <node concept="3uibUv" id="7LOkw6skyGh" role="1tU5fm">
+                              <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+                            </node>
+                            <node concept="2OqwBi" id="7LOkw6skyGn" role="33vP2m">
+                              <node concept="2OqwBi" id="7LOkw6skyGo" role="2Oq$k0">
+                                <node concept="37vLTw" id="7LOkw6skyGp" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="1uCOQFNaBo$" resolve="myCell" />
+                                </node>
+                                <node concept="liA8E" id="7LOkw6skyGq" role="2OqNvi">
+                                  <ref role="37wK5l" to="f4zo:~EditorCell.getEditorComponent():jetbrains.mps.openapi.editor.EditorComponent" resolve="getEditorComponent" />
+                                </node>
+                              </node>
+                              <node concept="liA8E" id="7LOkw6skyGr" role="2OqNvi">
+                                <ref role="37wK5l" to="cj4x:~EditorComponent.getDeepestSelectedCell():jetbrains.mps.openapi.editor.cells.EditorCell" resolve="getDeepestSelectedCell" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbJ" id="7LOkw6skzBo" role="3cqZAp">
+                          <node concept="3clFbS" id="7LOkw6skzBq" role="3clFbx">
+                            <node concept="3cpWs8" id="7LOkw6skCsi" role="3cqZAp">
+                              <node concept="3cpWsn" id="7LOkw6skCsj" role="3cpWs9">
+                                <property role="TrG5h" value="label" />
+                                <node concept="3uibUv" id="7LOkw6skCsb" role="1tU5fm">
+                                  <ref role="3uigEE" to="g51k:~EditorCell_Label" resolve="EditorCell_Label" />
+                                </node>
+                                <node concept="1eOMI4" id="7LOkw6skCsk" role="33vP2m">
+                                  <node concept="10QFUN" id="7LOkw6skCsl" role="1eOMHV">
+                                    <node concept="3uibUv" id="7LOkw6skCsm" role="10QFUM">
+                                      <ref role="3uigEE" to="g51k:~EditorCell_Label" resolve="EditorCell_Label" />
+                                    </node>
+                                    <node concept="37vLTw" id="7LOkw6skCsn" role="10QFUP">
+                                      <ref role="3cqZAo" node="7LOkw6skyGm" resolve="deepestSelectedCell" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                            <node concept="3clFbJ" id="7LOkw6skDkm" role="3cqZAp">
+                              <node concept="3clFbS" id="7LOkw6skDko" role="3clFbx">
+                                <node concept="3clFbF" id="7LOkw6skHgB" role="3cqZAp">
+                                  <node concept="2OqwBi" id="7LOkw6skIr0" role="3clFbG">
+                                    <node concept="2OqwBi" id="7LOkw6skHHi" role="2Oq$k0">
+                                      <node concept="37vLTw" id="7LOkw6skHg_" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="7LOkw6skCsj" resolve="label" />
+                                      </node>
+                                      <node concept="1PvZjq" id="7LOkw6skIm8" role="2OqNvi">
+                                        <ref role="37wK5l" to="g51k:~EditorCell_Label.getTextLine():jetbrains.mps.nodeEditor.cells.TextLine" resolve="getTextLine" />
+                                      </node>
+                                    </node>
+                                    <node concept="1PvZjq" id="7LOkw6skI$C" role="2OqNvi">
+                                      <ref role="37wK5l" to="g51k:~TextLine.drawCaret(java.awt.Graphics,int,int):void" resolve="drawCaret" />
+                                      <node concept="37vLTw" id="7LOkw6skJUK" role="37wK5m">
+                                        <ref role="3cqZAo" node="7YAWia_FS4A" resolve="g" />
+                                      </node>
+                                      <node concept="3cpWs3" id="7LOkw6skLiS" role="37wK5m">
+                                        <node concept="2OqwBi" id="7LOkw6skMf6" role="3uHU7w">
+                                          <node concept="37vLTw" id="7LOkw6skLJk" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="7LOkw6skCsj" resolve="label" />
+                                          </node>
+                                          <node concept="1PnCL0" id="7LOkw6skMSu" role="2OqNvi">
+                                            <ref role="2Oxat5" to="g51k:~EditorCell_Basic.myGapLeft" resolve="myGapLeft" />
+                                          </node>
+                                        </node>
+                                        <node concept="2OqwBi" id="7LOkw6skKvl" role="3uHU7B">
+                                          <node concept="37vLTw" id="7LOkw6skK1Q" role="2Oq$k0">
+                                            <ref role="3cqZAo" node="7LOkw6skCsj" resolve="label" />
+                                          </node>
+                                          <node concept="1PnCL0" id="7LOkw6skKQE" role="2OqNvi">
+                                            <ref role="2Oxat5" to="g51k:~EditorCell_Basic.myX" resolve="myX" />
+                                          </node>
+                                        </node>
+                                      </node>
+                                      <node concept="2OqwBi" id="7LOkw6skNYu" role="37wK5m">
+                                        <node concept="37vLTw" id="7LOkw6skNum" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="7LOkw6skCsj" resolve="label" />
+                                        </node>
+                                        <node concept="1PnCL0" id="7LOkw6skOom" role="2OqNvi">
+                                          <ref role="2Oxat5" to="g51k:~EditorCell_Basic.myY" resolve="myY" />
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                              <node concept="1Wc70l" id="7LOkw6smcMd" role="3clFbw">
+                                <node concept="3fqX7Q" id="7LOkw6smcF2" role="3uHU7w">
+                                  <node concept="2OqwBi" id="7LOkw6smcF4" role="3fr31v">
+                                    <node concept="37vLTw" id="7LOkw6smcF5" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="7LOkw6skCsj" resolve="label" />
+                                    </node>
+                                    <node concept="1PvZjq" id="7LOkw6smcF6" role="2OqNvi">
+                                      <ref role="37wK5l" to="g51k:~EditorCell_Label.toShowCaret():boolean" resolve="toShowCaret" />
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="2OqwBi" id="7LOkw6skFOH" role="3uHU7B">
+                                  <node concept="37vLTw" id="7LOkw6skFnv" role="2Oq$k0">
+                                    <ref role="3cqZAo" node="7LOkw6skCsj" resolve="label" />
+                                  </node>
+                                  <node concept="1PnCL0" id="7LOkw6skGtt" role="2OqNvi">
+                                    <ref role="2Oxat5" to="g51k:~EditorCell_Label.myCaretIsVisible" resolve="myCaretIsVisible" />
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="2ZW3vV" id="7LOkw6sk$QE" role="3clFbw">
+                            <node concept="3uibUv" id="7LOkw6sk_lk" role="2ZW6by">
+                              <ref role="3uigEE" to="g51k:~EditorCell_Label" resolve="EditorCell_Label" />
+                            </node>
+                            <node concept="37vLTw" id="7LOkw6sk$r6" role="2ZW6bz">
+                              <ref role="3cqZAo" node="7LOkw6skyGm" resolve="deepestSelectedCell" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
                   </node>

From 5390e6f67fa635252b8a84ab2a1a4a5d8a8ba158 Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Thu, 7 Jan 2016 11:45:38 +0100
Subject: [PATCH 03/15] Diagram: Changed the context button size from 15 to 16

Originally, it was 10 and some icons look different with an odd number
of pixels.
---
 .../models/de/itemis/mps/editor/diagram/runtime/jgraph.mps      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 177dd8c9e1b..4cc3abf84cf 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -68376,7 +68376,7 @@
       <node concept="10P55v" id="17I5kyiXMqd" role="1tU5fm" />
       <node concept="3Tm1VV" id="17I5kyiXMqe" role="1B3o_S" />
       <node concept="3b6qkQ" id="17I5kyiXMqf" role="33vP2m">
-        <property role="$nhwW" value="15.0" />
+        <property role="$nhwW" value="16.0" />
       </node>
     </node>
     <node concept="2tJIrI" id="6OhZPz7mv75" role="jymVt" />

From 2e430a2cdeaeb34c28a87c661cfbd987af93ee27 Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Thu, 7 Jan 2016 12:19:02 +0100
Subject: [PATCH 04/15] Diagram: Caret was drawn dashed sometimes

---
 .../languageModels/editor.mps                 |   2 +-
 .../mps/editor/diagram/runtime/jgraph.mps     | 104 ++++++++++++------
 2 files changed, 74 insertions(+), 32 deletions(-)

diff --git a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram.styles/languageModels/editor.mps b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram.styles/languageModels/editor.mps
index b6eee90700e..1c5b4200611 100644
--- a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram.styles/languageModels/editor.mps
+++ b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram.styles/languageModels/editor.mps
@@ -446,7 +446,7 @@
             <node concept="3clFbS" id="4opyGmeg9OX" role="3Kbo56">
               <node concept="3cpWs6" id="4opyGmegbb6" role="3cqZAp">
                 <node concept="2ShNRf" id="4opyGmeg9P2" role="3cqZAk">
-                  <node concept="1pGfFk" id="4opyGmeg9P3" role="2ShVmc">
+                  <node concept="1pGfFk" id="2cyQj2NJ3fK" role="2ShVmc">
                     <ref role="37wK5l" to="z60i:~BasicStroke.&lt;init&gt;(float,int,int,float,float[],float)" resolve="BasicStroke" />
                     <node concept="37vLTw" id="4opyGmeg9P4" role="37wK5m">
                       <ref role="3cqZAo" node="4opyGmeg9K1" resolve="lineWidth" />
diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 4cc3abf84cf..56caf4b10a0 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -26975,33 +26975,56 @@
                   </node>
                 </node>
               </node>
-              <node concept="3clFbF" id="1C_14CRkMcM" role="3cqZAp">
-                <node concept="2OqwBi" id="1C_14CRkMeO" role="3clFbG">
-                  <node concept="1eOMI4" id="1C_14CRkMcI" role="2Oq$k0">
-                    <node concept="10QFUN" id="1C_14CRkMcF" role="1eOMHV">
-                      <node concept="3uibUv" id="1C_14CRkMcK" role="10QFUM">
-                        <ref role="3uigEE" node="f4v_NgOwfo" resolve="ISelfPaintingCell" />
-                      </node>
-                      <node concept="37vLTw" id="1C_14CRkMcL" role="10QFUP">
-                        <ref role="3cqZAo" node="1C_14CRkFyX" resolve="parentCell" />
-                      </node>
+              <node concept="3clFbF" id="2cyQj2NI8CM" role="3cqZAp">
+                <node concept="2YIFZM" id="2cyQj2NI9ay" role="3clFbG">
+                  <ref role="1Pybhc" node="f4v_NgOALU" resolve="DrawUtil" />
+                  <ref role="37wK5l" node="f4v_NgYyLg" resolve="executeWithGraphicsCopy" />
+                  <node concept="2OqwBi" id="2cyQj2NI9bl" role="37wK5m">
+                    <node concept="37vLTw" id="2cyQj2NI9bm" role="2Oq$k0">
+                      <ref role="3cqZAo" to="p8va:~mxGraphComponent.canvas" resolve="canvas" />
+                    </node>
+                    <node concept="liA8E" id="2cyQj2NI9bn" role="2OqNvi">
+                      <ref role="37wK5l" to="kchc:~mxGraphics2DCanvas.getGraphics():java.awt.Graphics2D" resolve="getGraphics" />
                     </node>
                   </node>
-                  <node concept="liA8E" id="1C_14CRkMAe" role="2OqNvi">
-                    <ref role="37wK5l" node="f4v_NgOTlk" resolve="paintTop" />
-                    <node concept="2OqwBi" id="1C_14CRkQaP" role="37wK5m">
-                      <node concept="37vLTw" id="1C_14CRkQ0N" role="2Oq$k0">
-                        <ref role="3cqZAo" to="p8va:~mxGraphComponent.canvas" resolve="canvas" />
-                      </node>
-                      <node concept="liA8E" id="1C_14CRkR3l" role="2OqNvi">
-                        <ref role="37wK5l" to="kchc:~mxGraphics2DCanvas.getGraphics():java.awt.Graphics2D" resolve="getGraphics" />
+                  <node concept="37vLTw" id="2cyQj2NIewh" role="37wK5m">
+                    <ref role="3cqZAo" to="p8va:~mxGraphComponent.canvas" resolve="canvas" />
+                  </node>
+                  <node concept="1bVj0M" id="2cyQj2NIaJU" role="37wK5m">
+                    <property role="3yWfEV" value="true" />
+                    <node concept="3clFbS" id="2cyQj2NIaJW" role="1bW5cS">
+                      <node concept="3clFbF" id="1C_14CRkMcM" role="3cqZAp">
+                        <node concept="2OqwBi" id="1C_14CRkMeO" role="3clFbG">
+                          <node concept="1eOMI4" id="1C_14CRkMcI" role="2Oq$k0">
+                            <node concept="10QFUN" id="1C_14CRkMcF" role="1eOMHV">
+                              <node concept="3uibUv" id="1C_14CRkMcK" role="10QFUM">
+                                <ref role="3uigEE" node="f4v_NgOwfo" resolve="ISelfPaintingCell" />
+                              </node>
+                              <node concept="37vLTw" id="1C_14CRkMcL" role="10QFUP">
+                                <ref role="3cqZAo" node="1C_14CRkFyX" resolve="parentCell" />
+                              </node>
+                            </node>
+                          </node>
+                          <node concept="liA8E" id="1C_14CRkMAe" role="2OqNvi">
+                            <ref role="37wK5l" node="f4v_NgOTlk" resolve="paintTop" />
+                            <node concept="37vLTw" id="2cyQj2NIcPw" role="37wK5m">
+                              <ref role="3cqZAo" node="2cyQj2NIbzq" resolve="g" />
+                            </node>
+                            <node concept="37vLTw" id="1C_14CRkPMu" role="37wK5m">
+                              <ref role="3cqZAo" to="p8va:~mxGraphComponent.canvas" resolve="canvas" />
+                            </node>
+                            <node concept="37vLTw" id="2WyuZykknOd" role="37wK5m">
+                              <ref role="3cqZAo" node="2WyuZykknO6" resolve="state" />
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
-                    <node concept="37vLTw" id="1C_14CRkPMu" role="37wK5m">
-                      <ref role="3cqZAo" to="p8va:~mxGraphComponent.canvas" resolve="canvas" />
-                    </node>
-                    <node concept="37vLTw" id="2WyuZykknOd" role="37wK5m">
-                      <ref role="3cqZAo" node="2WyuZykknO6" resolve="state" />
+                    <node concept="37vLTG" id="2cyQj2NIbzq" role="1bW2Oz">
+                      <property role="TrG5h" value="g" />
+                      <node concept="3uibUv" id="2cyQj2NIbzp" role="1tU5fm">
+                        <ref role="3uigEE" to="z60i:~Graphics2D" resolve="Graphics2D" />
+                      </node>
                     </node>
                   </node>
                 </node>
@@ -50317,15 +50340,34 @@
                             </node>
                           </node>
                         </node>
-                        <node concept="3clFbF" id="1uCOQFNaOAe" role="3cqZAp">
-                          <node concept="2OqwBi" id="1uCOQFNaOGQ" role="3clFbG">
-                            <node concept="37vLTw" id="1uCOQFNaOAc" role="2Oq$k0">
-                              <ref role="3cqZAo" node="1uCOQFNaBo$" resolve="myCell" />
+                        <node concept="3clFbF" id="2cyQj2NH6pa" role="3cqZAp">
+                          <node concept="2YIFZM" id="2cyQj2NH6_t" role="3clFbG">
+                            <ref role="37wK5l" node="f4v_NgPELp" resolve="executeWithGraphicsCopy" />
+                            <ref role="1Pybhc" node="f4v_NgOALU" resolve="DrawUtil" />
+                            <node concept="37vLTw" id="2cyQj2NH73B" role="37wK5m">
+                              <ref role="3cqZAo" node="7YAWia_FS4A" resolve="g" />
                             </node>
-                            <node concept="liA8E" id="1uCOQFNaR4w" role="2OqNvi">
-                              <ref role="37wK5l" to="g51k:~EditorCell.paint(java.awt.Graphics):void" resolve="paint" />
-                              <node concept="37vLTw" id="1uCOQFNaR6w" role="37wK5m">
-                                <ref role="3cqZAo" node="7YAWia_FS4A" resolve="g" />
+                            <node concept="1bVj0M" id="2cyQj2NH80K" role="37wK5m">
+                              <node concept="37vLTG" id="2cyQj2NH8mD" role="1bW2Oz">
+                                <property role="TrG5h" value="g" />
+                                <node concept="3uibUv" id="2cyQj2NH8mE" role="1tU5fm">
+                                  <ref role="3uigEE" to="z60i:~Graphics2D" resolve="Graphics2D" />
+                                </node>
+                              </node>
+                              <node concept="3clFbS" id="2cyQj2NH80M" role="1bW5cS">
+                                <node concept="3clFbF" id="1uCOQFNaOAe" role="3cqZAp">
+                                  <node concept="2OqwBi" id="1uCOQFNaOGQ" role="3clFbG">
+                                    <node concept="37vLTw" id="1uCOQFNaOAc" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="1uCOQFNaBo$" resolve="myCell" />
+                                    </node>
+                                    <node concept="liA8E" id="1uCOQFNaR4w" role="2OqNvi">
+                                      <ref role="37wK5l" to="g51k:~EditorCell.paint(java.awt.Graphics):void" resolve="paint" />
+                                      <node concept="37vLTw" id="1uCOQFNaR6w" role="37wK5m">
+                                        <ref role="3cqZAo" node="2cyQj2NH8mD" resolve="g" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                               </node>
                             </node>
                           </node>

From 1f6231a808841193a8f97899594b9735b3e2e6c7 Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Thu, 7 Jan 2016 13:19:30 +0100
Subject: [PATCH 05/15] Diagram: Fix: Drag preview image was still visible
 after the drop

---
 .../mps/editor/diagram/runtime/jgraph.mps     | 124 ++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 56caf4b10a0..3c555482ce3 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -25604,6 +25604,130 @@
       </node>
     </node>
     <node concept="2tJIrI" id="5biqYZYDByU" role="jymVt" />
+    <node concept="3clFb_" id="2cyQj2NJZKX" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="importCells" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="2cyQj2NJZKY" role="1B3o_S" />
+      <node concept="10Q1$e" id="2cyQj2NJZL0" role="3clF45">
+        <node concept="3uibUv" id="2cyQj2NJZL1" role="10Q1$1">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2cyQj2NJZL2" role="3clF46">
+        <property role="TrG5h" value="cells" />
+        <node concept="10Q1$e" id="2cyQj2NJZL3" role="1tU5fm">
+          <node concept="3uibUv" id="2cyQj2NJZL4" role="10Q1$1">
+            <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="2cyQj2NJZL5" role="3clF46">
+        <property role="TrG5h" value="dx" />
+        <node concept="10P55v" id="2cyQj2NJZL6" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2cyQj2NJZL7" role="3clF46">
+        <property role="TrG5h" value="dy" />
+        <node concept="10P55v" id="2cyQj2NJZL8" role="1tU5fm" />
+      </node>
+      <node concept="37vLTG" id="2cyQj2NJZL9" role="3clF46">
+        <property role="TrG5h" value="target" />
+        <node concept="3uibUv" id="2cyQj2NJZLa" role="1tU5fm">
+          <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="2cyQj2NJZLb" role="3clF46">
+        <property role="TrG5h" value="location" />
+        <node concept="3uibUv" id="2cyQj2NJZLc" role="1tU5fm">
+          <ref role="3uigEE" to="z60i:~Point" resolve="Point" />
+        </node>
+      </node>
+      <node concept="3clFbS" id="2cyQj2NJZLd" role="3clF47">
+        <node concept="3cpWs8" id="2cyQj2NKnfk" role="3cqZAp">
+          <node concept="3cpWsn" id="2cyQj2NKnfl" role="3cpWs9">
+            <property role="TrG5h" value="result" />
+            <node concept="10Q1$e" id="2cyQj2NKneW" role="1tU5fm">
+              <node concept="3uibUv" id="2cyQj2NKneZ" role="10Q1$1">
+                <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+              </node>
+            </node>
+            <node concept="3nyPlj" id="2cyQj2NKnfm" role="33vP2m">
+              <ref role="37wK5l" to="p8va:~mxGraphComponent.importCells(java.lang.Object[],double,double,java.lang.Object,java.awt.Point):java.lang.Object[]" resolve="importCells" />
+              <node concept="37vLTw" id="2cyQj2NKnfn" role="37wK5m">
+                <ref role="3cqZAo" node="2cyQj2NJZL2" resolve="cells" />
+              </node>
+              <node concept="37vLTw" id="2cyQj2NKnfo" role="37wK5m">
+                <ref role="3cqZAo" node="2cyQj2NJZL5" resolve="dx" />
+              </node>
+              <node concept="37vLTw" id="2cyQj2NKnfp" role="37wK5m">
+                <ref role="3cqZAo" node="2cyQj2NJZL7" resolve="dy" />
+              </node>
+              <node concept="37vLTw" id="2cyQj2NKnfq" role="37wK5m">
+                <ref role="3cqZAo" node="2cyQj2NJZL9" resolve="target" />
+              </node>
+              <node concept="37vLTw" id="2cyQj2NKnfr" role="37wK5m">
+                <ref role="3cqZAo" node="2cyQj2NJZLb" resolve="location" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2cyQj2NKv94" role="3cqZAp" />
+        <node concept="3SKdUt" id="2cyQj2NK$2W" role="3cqZAp">
+          <node concept="3SKdUq" id="2cyQj2NK$2Y" role="3SKWNk">
+            <property role="3SKdUp" value="For some reason, the drag preview is still visible after the drop is processed" />
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2cyQj2NKevj" role="3cqZAp">
+          <node concept="3cpWsn" id="2cyQj2NKevk" role="3cpWs9">
+            <property role="TrG5h" value="movePreview" />
+            <node concept="3uibUv" id="2cyQj2NKevg" role="1tU5fm">
+              <ref role="3uigEE" to="qveq:~mxMovePreview" resolve="mxMovePreview" />
+            </node>
+            <node concept="2OqwBi" id="2cyQj2NKevl" role="33vP2m">
+              <node concept="1rXfSq" id="2cyQj2NKevm" role="2Oq$k0">
+                <ref role="37wK5l" to="p8va:~mxGraphComponent.getGraphHandler():com.mxgraph.swing.handler.mxGraphHandler" resolve="getGraphHandler" />
+              </node>
+              <node concept="liA8E" id="2cyQj2NKevn" role="2OqNvi">
+                <ref role="37wK5l" to="qveq:~mxGraphHandler.getMovePreview():com.mxgraph.swing.handler.mxMovePreview" resolve="getMovePreview" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2cyQj2NKasv" role="3cqZAp">
+          <node concept="3clFbS" id="2cyQj2NKasx" role="3clFbx">
+            <node concept="3clFbF" id="2cyQj2NKm0F" role="3cqZAp">
+              <node concept="2OqwBi" id="2cyQj2NKm8V" role="3clFbG">
+                <node concept="1rXfSq" id="2cyQj2NKm0E" role="2Oq$k0">
+                  <ref role="37wK5l" to="p8va:~mxGraphComponent.getGraphHandler():com.mxgraph.swing.handler.mxGraphHandler" resolve="getGraphHandler" />
+                </node>
+                <node concept="liA8E" id="2cyQj2NKndC" role="2OqNvi">
+                  <ref role="37wK5l" to="qveq:~mxGraphHandler.reset():void" resolve="reset" />
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="2cyQj2NKdSs" role="3clFbw">
+            <node concept="liA8E" id="2cyQj2NKeua" role="2OqNvi">
+              <ref role="37wK5l" to="qveq:~mxGraphHandler.isVisible():boolean" resolve="isVisible" />
+            </node>
+            <node concept="1rXfSq" id="2cyQj2NKjrL" role="2Oq$k0">
+              <ref role="37wK5l" to="p8va:~mxGraphComponent.getGraphHandler():com.mxgraph.swing.handler.mxGraphHandler" resolve="getGraphHandler" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbH" id="2cyQj2NKn$9" role="3cqZAp" />
+        <node concept="3cpWs6" id="2cyQj2NKoLE" role="3cqZAp">
+          <node concept="37vLTw" id="2cyQj2NKreP" role="3cqZAk">
+            <ref role="3cqZAo" node="2cyQj2NKnfl" resolve="result" />
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2cyQj2NJZLe" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2cyQj2NK4ft" role="jymVt" />
     <node concept="312cEu" id="6zxgcXkFWmL" role="jymVt">
       <property role="2bfB8j" value="true" />
       <property role="TrG5h" value="MyGraphControl" />

From 641bb0caac8b2b2b6923f6f54a691f851276ed6c Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Thu, 7 Jan 2016 14:35:09 +0100
Subject: [PATCH 06/15] Diagram: Default translation to prevent overlapping
 with the buttons

Fixes #1257 (By default, the layouter moves stuff into the top left
             corner, where it is overshadowed by the diagram buttons)
---
 .../mps/editor/diagram/runtime/jgraph.mps     | 249 ++++++++++++------
 1 file changed, 169 insertions(+), 80 deletions(-)

diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 3c555482ce3..34a56242a6c 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -18918,6 +18918,11 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2cyQj2NU2no" role="3cqZAp">
+          <node concept="1rXfSq" id="2cyQj2NU2nm" role="3clFbG">
+            <ref role="37wK5l" node="2cyQj2NTSAM" resolve="resetScaleAndTranslation" />
+          </node>
+        </node>
       </node>
       <node concept="37vLTG" id="190K99Kl2lw" role="3clF46">
         <property role="TrG5h" value="elementMapper" />
@@ -18936,6 +18941,113 @@
         <node concept="10P_77" id="6yUTIuncpdg" role="1tU5fm" />
       </node>
     </node>
+    <node concept="2tJIrI" id="2cyQj2NTZQq" role="jymVt" />
+    <node concept="3clFb_" id="2cyQj2NTSAM" role="jymVt">
+      <property role="TrG5h" value="resetScaleAndTranslation" />
+      <node concept="3cqZAl" id="2cyQj2NTSAO" role="3clF45" />
+      <node concept="3Tm1VV" id="2cyQj2NTSAP" role="1B3o_S" />
+      <node concept="3clFbS" id="2cyQj2NTSAQ" role="3clF47">
+        <node concept="3cpWs8" id="2cyQj2NTVJb" role="3cqZAp">
+          <node concept="3cpWsn" id="2cyQj2NTVJc" role="3cpWs9">
+            <property role="TrG5h" value="defaultTranslation" />
+            <node concept="3uibUv" id="2cyQj2NTVJd" role="1tU5fm">
+              <ref role="3uigEE" to="18t6:~mxPoint" resolve="mxPoint" />
+            </node>
+            <node concept="2OqwBi" id="2cyQj2NTVJe" role="33vP2m">
+              <node concept="1rXfSq" id="2cyQj2NU1P6" role="2Oq$k0">
+                <ref role="37wK5l" node="5YRJpe$ygQu" resolve="getView" />
+              </node>
+              <node concept="liA8E" id="2cyQj2NTVJi" role="2OqNvi">
+                <ref role="37wK5l" node="2cyQj2NT2az" resolve="getDefaultTranslation" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs8" id="2cyQj2NVwkn" role="3cqZAp">
+          <node concept="3cpWsn" id="2cyQj2NVwko" role="3cpWs9">
+            <property role="TrG5h" value="graphComponent" />
+            <node concept="3uibUv" id="2cyQj2NVwkm" role="1tU5fm">
+              <ref role="3uigEE" node="190K99KyNov" resolve="MyGraphComponent" />
+            </node>
+            <node concept="1rXfSq" id="2cyQj2NVwkp" role="33vP2m">
+              <ref role="37wK5l" node="eyrvBdlDbJ" resolve="getGraphComponent" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbJ" id="2cyQj2NVwOe" role="3cqZAp">
+          <node concept="3clFbS" id="2cyQj2NVwOg" role="3clFbx">
+            <node concept="3clFbF" id="2cyQj2NVsvS" role="3cqZAp">
+              <node concept="2OqwBi" id="2cyQj2NVsEX" role="3clFbG">
+                <node concept="1rXfSq" id="2cyQj2NVsvQ" role="2Oq$k0">
+                  <ref role="37wK5l" node="5YRJpe$ygQu" resolve="getView" />
+                </node>
+                <node concept="liA8E" id="2cyQj2NVsTd" role="2OqNvi">
+                  <ref role="37wK5l" to="1njx:~mxGraphView.scaleAndTranslate(double,double,double):void" resolve="scaleAndTranslate" />
+                  <node concept="3b6qkQ" id="2cyQj2NVsVd" role="37wK5m">
+                    <property role="$nhwW" value="1.0" />
+                  </node>
+                  <node concept="2OqwBi" id="2cyQj2NVsWi" role="37wK5m">
+                    <node concept="37vLTw" id="2cyQj2NVsWj" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2cyQj2NTVJc" resolve="defaultTranslation" />
+                    </node>
+                    <node concept="liA8E" id="2cyQj2NVsWk" role="2OqNvi">
+                      <ref role="37wK5l" to="18t6:~mxPoint.getX():double" resolve="getX" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="2cyQj2NVsWl" role="37wK5m">
+                    <node concept="37vLTw" id="2cyQj2NVsWm" role="2Oq$k0">
+                      <ref role="3cqZAo" node="2cyQj2NTVJc" resolve="defaultTranslation" />
+                    </node>
+                    <node concept="liA8E" id="2cyQj2NVsWn" role="2OqNvi">
+                      <ref role="37wK5l" to="18t6:~mxPoint.getY():double" resolve="getY" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbC" id="2cyQj2NVwZT" role="3clFbw">
+            <node concept="10Nm6u" id="2cyQj2NVx2v" role="3uHU7w" />
+            <node concept="37vLTw" id="2cyQj2NVwTi" role="3uHU7B">
+              <ref role="3cqZAo" node="2cyQj2NVwko" resolve="graphComponent" />
+            </node>
+          </node>
+          <node concept="9aQIb" id="2cyQj2NVxkM" role="9aQIa">
+            <node concept="3clFbS" id="2cyQj2NVxkN" role="9aQI4">
+              <node concept="3clFbF" id="2cyQj2NTVJj" role="3cqZAp">
+                <node concept="2OqwBi" id="2cyQj2NTVJk" role="3clFbG">
+                  <node concept="liA8E" id="2cyQj2NTVJl" role="2OqNvi">
+                    <ref role="37wK5l" node="7MH10IUu0gc" resolve="scaleAndTranslate" />
+                    <node concept="3b6qkQ" id="2cyQj2NTVJm" role="37wK5m">
+                      <property role="$nhwW" value="1.0" />
+                    </node>
+                    <node concept="2OqwBi" id="2cyQj2NTVJn" role="37wK5m">
+                      <node concept="37vLTw" id="2cyQj2NTVJo" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2cyQj2NTVJc" resolve="defaultTranslation" />
+                      </node>
+                      <node concept="liA8E" id="2cyQj2NTVJp" role="2OqNvi">
+                        <ref role="37wK5l" to="18t6:~mxPoint.getX():double" resolve="getX" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="2cyQj2NTVJq" role="37wK5m">
+                      <node concept="37vLTw" id="2cyQj2NTVJr" role="2Oq$k0">
+                        <ref role="3cqZAo" node="2cyQj2NTVJc" resolve="defaultTranslation" />
+                      </node>
+                      <node concept="liA8E" id="2cyQj2NTVJs" role="2OqNvi">
+                        <ref role="37wK5l" to="18t6:~mxPoint.getY():double" resolve="getY" />
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="2cyQj2NVwkq" role="2Oq$k0">
+                    <ref role="3cqZAo" node="2cyQj2NVwko" resolve="graphComponent" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="6yUTIuncpfO" role="jymVt" />
     <node concept="3clFb_" id="3w6aby53KWE" role="jymVt">
       <property role="TrG5h" value="getConnectionTypeChooser" />
@@ -57808,6 +57920,36 @@
         <property role="3clFbU" value="false" />
       </node>
     </node>
+    <node concept="312cEg" id="2cyQj2NSYJo" role="jymVt">
+      <property role="TrG5h" value="myDefaultTranslation" />
+      <node concept="3Tm6S6" id="2cyQj2NSYJp" role="1B3o_S" />
+      <node concept="3uibUv" id="2cyQj2NSZg4" role="1tU5fm">
+        <ref role="3uigEE" to="18t6:~mxPoint" resolve="mxPoint" />
+      </node>
+      <node concept="2ShNRf" id="2cyQj2NSZnT" role="33vP2m">
+        <node concept="1pGfFk" id="2cyQj2NSZnU" role="2ShVmc">
+          <ref role="37wK5l" to="18t6:~mxPoint.&lt;init&gt;(double,double)" resolve="mxPoint" />
+          <node concept="3b6qkQ" id="2cyQj2NSZnV" role="37wK5m">
+            <property role="$nhwW" value="0.0" />
+          </node>
+          <node concept="3cpWs3" id="2cyQj2NWeE5" role="37wK5m">
+            <node concept="17qRlL" id="2cyQj2NWePb" role="3uHU7w">
+              <node concept="3cmrfG" id="2cyQj2NWePi" role="3uHU7w">
+                <property role="3cmrfH" value="2" />
+              </node>
+              <node concept="10M0yZ" id="2cyQj2NWeGG" role="3uHU7B">
+                <ref role="1PxDUh" node="2KWY$Um6wZH" resolve="ContextButton" />
+                <ref role="3cqZAo" node="6OhZPz7muk9" resolve="DEFAULT_BUTTON_SPACING" />
+              </node>
+            </node>
+            <node concept="10M0yZ" id="2cyQj2NWezw" role="3uHU7B">
+              <ref role="1PxDUh" node="2KWY$Um6wZH" resolve="ContextButton" />
+              <ref role="3cqZAo" node="17I5kyiXMqc" resolve="DEFAULT_BUTTON_SIZE" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="5YRJpe$yqLS" role="jymVt" />
     <node concept="3clFbW" id="lG49Fjpp8O" role="jymVt">
       <node concept="3cqZAl" id="lG49Fjpp8P" role="3clF45" />
@@ -57830,16 +57972,8 @@
         <node concept="3clFbF" id="1jNpGJnzYj_" role="3cqZAp">
           <node concept="1rXfSq" id="1jNpGJnzYjz" role="3clFbG">
             <ref role="37wK5l" to="1njx:~mxGraphView.setTranslate(com.mxgraph.util.mxPoint):void" resolve="setTranslate" />
-            <node concept="2ShNRf" id="1jNpGJnzYkE" role="37wK5m">
-              <node concept="1pGfFk" id="1jNpGJn$mjF" role="2ShVmc">
-                <ref role="37wK5l" to="18t6:~mxPoint.&lt;init&gt;(double,double)" resolve="mxPoint" />
-                <node concept="3b6qkQ" id="1jNpGJn$mOZ" role="37wK5m">
-                  <property role="$nhwW" value="0.0" />
-                </node>
-                <node concept="3b6qkQ" id="1jNpGJn$n87" role="37wK5m">
-                  <property role="$nhwW" value="0.0" />
-                </node>
-              </node>
+            <node concept="1rXfSq" id="2cyQj2NT4ZA" role="37wK5m">
+              <ref role="37wK5l" node="2cyQj2NT2az" resolve="getDefaultTranslation" />
             </node>
           </node>
         </node>
@@ -57852,6 +57986,26 @@
       </node>
     </node>
     <node concept="2tJIrI" id="lG49Fjtv47" role="jymVt" />
+    <node concept="3clFb_" id="2cyQj2NT2az" role="jymVt">
+      <property role="TrG5h" value="getDefaultTranslation" />
+      <node concept="3uibUv" id="2cyQj2NT4M0" role="3clF45">
+        <ref role="3uigEE" to="18t6:~mxPoint" resolve="mxPoint" />
+      </node>
+      <node concept="3Tm1VV" id="2cyQj2NT2aA" role="1B3o_S" />
+      <node concept="3clFbS" id="2cyQj2NT2aB" role="3clF47">
+        <node concept="3clFbF" id="2cyQj2NT4GD" role="3cqZAp">
+          <node concept="2ShNRf" id="2cyQj2NT4GF" role="3clFbG">
+            <node concept="1pGfFk" id="2cyQj2NT4GG" role="2ShVmc">
+              <ref role="37wK5l" to="18t6:~mxPoint.&lt;init&gt;(com.mxgraph.util.mxPoint)" resolve="mxPoint" />
+              <node concept="37vLTw" id="2cyQj2NT4GH" role="37wK5m">
+                <ref role="3cqZAo" node="2cyQj2NSYJo" resolve="myDefaultTranslation" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2cyQj2NT1DA" role="jymVt" />
     <node concept="3clFb_" id="6yUTIunc4pG" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="getGraph" />
@@ -79631,26 +79785,12 @@
       <node concept="3Tmbuc" id="45TnPEvAGOR" role="1B3o_S" />
       <node concept="3clFbS" id="45TnPEvAGP0" role="3clF47">
         <node concept="3clFbF" id="45TnPEvAHvt" role="3cqZAp">
-          <node concept="2OqwBi" id="45TnPEvAIsg" role="3clFbG">
-            <node concept="liA8E" id="45TnPEvAJb8" role="2OqNvi">
-              <ref role="37wK5l" node="7MH10IUu0gc" resolve="scaleAndTranslate" />
-              <node concept="3b6qkQ" id="45TnPEvAJeB" role="37wK5m">
-                <property role="$nhwW" value="1.0" />
-              </node>
-              <node concept="3b6qkQ" id="45TnPEvAJhv" role="37wK5m">
-                <property role="$nhwW" value="0.0" />
-              </node>
-              <node concept="3b6qkQ" id="45TnPEvAJke" role="37wK5m">
-                <property role="$nhwW" value="0.0" />
-              </node>
+          <node concept="2OqwBi" id="7MH10IUuupX" role="3clFbG">
+            <node concept="1rXfSq" id="7MH10IUuupY" role="2Oq$k0">
+              <ref role="37wK5l" node="2QokVxCJzqt" resolve="getGraph" />
             </node>
-            <node concept="2OqwBi" id="7MH10IUuupX" role="2Oq$k0">
-              <node concept="1rXfSq" id="7MH10IUuupY" role="2Oq$k0">
-                <ref role="37wK5l" node="2QokVxCJzqt" resolve="getGraph" />
-              </node>
-              <node concept="liA8E" id="7MH10IUuupZ" role="2OqNvi">
-                <ref role="37wK5l" node="eyrvBdlDbJ" resolve="getGraphComponent" />
-              </node>
+            <node concept="liA8E" id="7MH10IUuupZ" role="2OqNvi">
+              <ref role="37wK5l" node="2cyQj2NTSAM" resolve="resetScaleAndTranslation" />
             </node>
           </node>
         </node>
@@ -88357,57 +88497,6 @@
               </node>
             </node>
             <node concept="3clFbH" id="6vSjNpcXUvC" role="3cqZAp" />
-            <node concept="3cpWs8" id="6vSjNpcXUvD" role="3cqZAp">
-              <node concept="3cpWsn" id="6vSjNpcXUvE" role="3cpWs9">
-                <property role="TrG5h" value="origin" />
-                <node concept="3uibUv" id="6vSjNpcXUvF" role="1tU5fm">
-                  <ref role="3uigEE" to="18t6:~mxPoint" resolve="mxPoint" />
-                </node>
-                <node concept="2OqwBi" id="6vSjNpcXUvG" role="33vP2m">
-                  <node concept="2OqwBi" id="6vSjNpcXUvH" role="2Oq$k0">
-                    <node concept="37vLTw" id="6vSjNpcXUvI" role="2Oq$k0">
-                      <ref role="3cqZAo" node="6vSjNpcXUsc" resolve="view" />
-                    </node>
-                    <node concept="liA8E" id="6vSjNpcXUvJ" role="2OqNvi">
-                      <ref role="37wK5l" to="1njx:~mxGraphView.getGraph():com.mxgraph.view.mxGraph" resolve="getGraph" />
-                    </node>
-                  </node>
-                  <node concept="liA8E" id="6vSjNpcXUvK" role="2OqNvi">
-                    <ref role="37wK5l" to="1njx:~mxGraph.getOrigin():com.mxgraph.util.mxPoint" resolve="getOrigin" />
-                  </node>
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="6vSjNpcXUvL" role="3cqZAp">
-              <node concept="d5anL" id="6vSjNpcXUvM" role="3clFbG">
-                <node concept="2OqwBi" id="6vSjNpcXUvN" role="37vLTx">
-                  <node concept="37vLTw" id="6vSjNpcXUvO" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6vSjNpcXUvE" resolve="origin" />
-                  </node>
-                  <node concept="liA8E" id="6vSjNpcXUvP" role="2OqNvi">
-                    <ref role="37wK5l" to="18t6:~mxPoint.getX():double" resolve="getX" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="6vSjNpcXUvQ" role="37vLTJ">
-                  <ref role="3cqZAo" node="6vSjNpcXUsX" resolve="x" />
-                </node>
-              </node>
-            </node>
-            <node concept="3clFbF" id="6vSjNpcXUvR" role="3cqZAp">
-              <node concept="d5anL" id="6vSjNpcXUvS" role="3clFbG">
-                <node concept="2OqwBi" id="6vSjNpcXUvT" role="37vLTx">
-                  <node concept="37vLTw" id="6vSjNpcXUvU" role="2Oq$k0">
-                    <ref role="3cqZAo" node="6vSjNpcXUvE" resolve="origin" />
-                  </node>
-                  <node concept="liA8E" id="6vSjNpcXUvV" role="2OqNvi">
-                    <ref role="37wK5l" to="18t6:~mxPoint.getY():double" resolve="getY" />
-                  </node>
-                </node>
-                <node concept="37vLTw" id="6vSjNpcXUvW" role="37vLTJ">
-                  <ref role="3cqZAo" node="6vSjNpcXUt3" resolve="y" />
-                </node>
-              </node>
-            </node>
             <node concept="3clFbF" id="6vSjNpcXUvX" role="3cqZAp">
               <node concept="2OqwBi" id="6vSjNpcXUvY" role="3clFbG">
                 <node concept="2GrUjf" id="6vSjNpcXUvZ" role="2Oq$k0">

From 723147a42fbb68b11b9d9a0c335f9e344ae30fd9 Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Thu, 7 Jan 2016 15:12:42 +0100
Subject: [PATCH 07/15] Diagram: Size of a shape cell can be specified in the
 inspector

Fixes #1254
---
 .../generator/template/main@generator.mps     |  88 ++++++++++++
 .../languageModels/editor.mps                 |  38 ++++++
 .../languageModels/structure.mps              |  10 ++
 .../mps/editor/diagram/runtime/shape.mps      | 129 ++++++++++++++++--
 4 files changed, 253 insertions(+), 12 deletions(-)

diff --git a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
index 19e4ee431b8..a54ec2c8a11 100644
--- a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
+++ b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
@@ -10560,6 +10560,94 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="2cyQj2NX2so" role="3cqZAp">
+            <node concept="2OqwBi" id="2cyQj2NX2$K" role="3clFbG">
+              <node concept="37vLTw" id="2cyQj2NX2sm" role="2Oq$k0">
+                <ref role="3cqZAo" node="rKHxOEqZbH" resolve="editorCell" />
+              </node>
+              <node concept="liA8E" id="2cyQj2NX2Nq" role="2OqNvi">
+                <ref role="37wK5l" to="7ou7:2cyQj2NWYj0" resolve="setDefaultWidth" />
+                <node concept="3cmrfG" id="2cyQj2NX2PH" role="37wK5m">
+                  <property role="3cmrfH" value="10" />
+                  <node concept="29HgVG" id="2cyQj2NX2Rc" role="lGtFl">
+                    <node concept="3NFfHV" id="2cyQj2NX2RU" role="3NFExx">
+                      <node concept="3clFbS" id="2cyQj2NX2RV" role="2VODD2">
+                        <node concept="3clFbF" id="2cyQj2NX2Yt" role="3cqZAp">
+                          <node concept="2OqwBi" id="2cyQj2NX31C" role="3clFbG">
+                            <node concept="30H73N" id="2cyQj2NX2Ys" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="2cyQj2NX38N" role="2OqNvi">
+                              <ref role="3Tt5mk" to="2qld:2cyQj2NWVYi" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1W57fq" id="2cyQj2NX3jd" role="lGtFl">
+              <node concept="3IZrLx" id="2cyQj2NX3jf" role="3IZSJc">
+                <node concept="3clFbS" id="2cyQj2NX3jh" role="2VODD2">
+                  <node concept="3clFbF" id="2cyQj2NX3t8" role="3cqZAp">
+                    <node concept="2OqwBi" id="2cyQj2NX3S8" role="3clFbG">
+                      <node concept="2OqwBi" id="2cyQj2NX3wS" role="2Oq$k0">
+                        <node concept="30H73N" id="2cyQj2NX3t7" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="2cyQj2NX3IB" role="2OqNvi">
+                          <ref role="3Tt5mk" to="2qld:2cyQj2NWVYi" />
+                        </node>
+                      </node>
+                      <node concept="3x8VRR" id="2cyQj2NX3Zr" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="3clFbF" id="2cyQj2NX45c" role="3cqZAp">
+            <node concept="2OqwBi" id="2cyQj2NX45d" role="3clFbG">
+              <node concept="37vLTw" id="2cyQj2NX45e" role="2Oq$k0">
+                <ref role="3cqZAo" node="rKHxOEqZbH" resolve="editorCell" />
+              </node>
+              <node concept="liA8E" id="2cyQj2NX45f" role="2OqNvi">
+                <ref role="37wK5l" to="7ou7:2cyQj2NX0kw" resolve="setDefaultHeight" />
+                <node concept="3cmrfG" id="2cyQj2NX45g" role="37wK5m">
+                  <property role="3cmrfH" value="10" />
+                  <node concept="29HgVG" id="2cyQj2NX45h" role="lGtFl">
+                    <node concept="3NFfHV" id="2cyQj2NX45i" role="3NFExx">
+                      <node concept="3clFbS" id="2cyQj2NX45j" role="2VODD2">
+                        <node concept="3clFbF" id="2cyQj2NX45k" role="3cqZAp">
+                          <node concept="2OqwBi" id="2cyQj2NX45l" role="3clFbG">
+                            <node concept="30H73N" id="2cyQj2NX45m" role="2Oq$k0" />
+                            <node concept="3TrEf2" id="2cyQj2NX4PK" role="2OqNvi">
+                              <ref role="3Tt5mk" to="2qld:2cyQj2NWVYr" />
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="1W57fq" id="2cyQj2NX45o" role="lGtFl">
+              <node concept="3IZrLx" id="2cyQj2NX45p" role="3IZSJc">
+                <node concept="3clFbS" id="2cyQj2NX45q" role="2VODD2">
+                  <node concept="3clFbF" id="2cyQj2NX45r" role="3cqZAp">
+                    <node concept="2OqwBi" id="2cyQj2NX45s" role="3clFbG">
+                      <node concept="2OqwBi" id="2cyQj2NX45t" role="2Oq$k0">
+                        <node concept="30H73N" id="2cyQj2NX45u" role="2Oq$k0" />
+                        <node concept="3TrEf2" id="2cyQj2NX4$p" role="2OqNvi">
+                          <ref role="3Tt5mk" to="2qld:2cyQj2NWVYr" />
+                        </node>
+                      </node>
+                      <node concept="3x8VRR" id="2cyQj2NX45w" role="2OqNvi" />
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
           <node concept="3clFbH" id="rKHxOEqZbO" role="3cqZAp">
             <node concept="xERo3" id="rKHxOEqZbP" role="lGtFl">
               <ref role="xH3mL" to="tpc3:4v1iCryNDHi" resolve="template_cellSetupBlock" />
diff --git a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps
index 37e87168d83..fd5827be813 100644
--- a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps
+++ b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/languageModels/editor.mps
@@ -3658,6 +3658,44 @@
           <property role="VOm3f" value="true" />
         </node>
         <node concept="2EHx9g" id="rKHxOEr9G2" role="2iSdaV" />
+        <node concept="3EZMnI" id="2cyQj2NWVWY" role="3EZMnx">
+          <node concept="2iRfu4" id="2cyQj2NWVWZ" role="2iSdaV" />
+          <node concept="VPM3Z" id="2cyQj2NWVX0" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPXOz" id="2cyQj2NXwMx" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="3F0ifn" id="2cyQj2NWVXd" role="3EZMnx">
+            <property role="3F0ifm" value="width:" />
+          </node>
+          <node concept="3F1sOY" id="2cyQj2NWVYP" role="3EZMnx">
+            <property role="1$x2rV" value="50" />
+            <ref role="1NtTu8" to="2qld:2cyQj2NWVYi" />
+            <node concept="VPXOz" id="2cyQj2NXwIY" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
+        </node>
+        <node concept="3EZMnI" id="2cyQj2NWVX_" role="3EZMnx">
+          <node concept="2iRfu4" id="2cyQj2NWVXA" role="2iSdaV" />
+          <node concept="VPM3Z" id="2cyQj2NWVXB" role="3F10Kt">
+            <property role="VOm3f" value="false" />
+          </node>
+          <node concept="VPXOz" id="2cyQj2NXwOs" role="3F10Kt">
+            <property role="VOm3f" value="true" />
+          </node>
+          <node concept="3F0ifn" id="2cyQj2NWVXC" role="3EZMnx">
+            <property role="3F0ifm" value="height:" />
+          </node>
+          <node concept="3F1sOY" id="2cyQj2NWVZm" role="3EZMnx">
+            <property role="1$x2rV" value="50" />
+            <ref role="1NtTu8" to="2qld:2cyQj2NWVYr" />
+            <node concept="VPXOz" id="2cyQj2NXwKF" role="3F10Kt">
+              <property role="VOm3f" value="true" />
+            </node>
+          </node>
+        </node>
       </node>
       <node concept="VPM3Z" id="rKHxOEr9G3" role="3F10Kt">
         <property role="VOm3f" value="false" />
diff --git a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps
index 0d1d31761a8..5224cb02aaa 100644
--- a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps
+++ b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/languageModels/structure.mps
@@ -1311,6 +1311,16 @@
       <property role="20lbJX" value="1" />
       <ref role="20lvS9" node="6uo2fN6gOXK" resolve="IShape" />
     </node>
+    <node concept="1TJgyj" id="2cyQj2NWVYi" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="width" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
+    <node concept="1TJgyj" id="2cyQj2NWVYr" role="1TKVEi">
+      <property role="20lmBu" value="aggregation" />
+      <property role="20kJfa" value="height" />
+      <ref role="20lvS9" to="tpee:fz3vP1J" resolve="Expression" />
+    </node>
   </node>
   <node concept="1TIwiD" id="gKFhvEzf3v">
     <property role="TrG5h" value="CellModel_DiagramContent" />
diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/shape.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/shape.mps
index a476efd9795..deabea2ea75 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/shape.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/shape.mps
@@ -2724,6 +2724,22 @@
         <ref role="3uigEE" node="6uo2fN6kjTa" resolve="IShape" />
       </node>
     </node>
+    <node concept="312cEg" id="2cyQj2NXVF2" role="jymVt">
+      <property role="TrG5h" value="myDefaultWidth" />
+      <node concept="3Tm6S6" id="2cyQj2NXVF3" role="1B3o_S" />
+      <node concept="10Oyi0" id="2cyQj2NXVZF" role="1tU5fm" />
+      <node concept="3cmrfG" id="2cyQj2NXWQQ" role="33vP2m">
+        <property role="3cmrfH" value="50" />
+      </node>
+    </node>
+    <node concept="312cEg" id="2cyQj2NXWnz" role="jymVt">
+      <property role="TrG5h" value="myDefaultHeight" />
+      <node concept="3Tm6S6" id="2cyQj2NXWn$" role="1B3o_S" />
+      <node concept="10Oyi0" id="2cyQj2NXWn_" role="1tU5fm" />
+      <node concept="3cmrfG" id="2cyQj2NXWZ1" role="33vP2m">
+        <property role="3cmrfH" value="50" />
+      </node>
+    </node>
     <node concept="2tJIrI" id="rKHxOEkCxK" role="jymVt" />
     <node concept="3clFbW" id="rKHxOEkCF4" role="jymVt">
       <node concept="3cqZAl" id="rKHxOEkCF5" role="3clF45" />
@@ -2776,7 +2792,76 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="2cyQj2NWXWO" role="jymVt" />
+    <node concept="3clFb_" id="2cyQj2NWYj0" role="jymVt">
+      <property role="TrG5h" value="setDefaultWidth" />
+      <node concept="37vLTG" id="2cyQj2NWYZq" role="3clF46">
+        <property role="TrG5h" value="width" />
+        <node concept="10Oyi0" id="2cyQj2NWZcg" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="2cyQj2NWYj2" role="3clF45" />
+      <node concept="3Tm1VV" id="2cyQj2NWYj3" role="1B3o_S" />
+      <node concept="3clFbS" id="2cyQj2NWYj4" role="3clF47">
+        <node concept="3clFbF" id="2cyQj2NWZ_n" role="3cqZAp">
+          <node concept="37vLTI" id="2cyQj2NWZOB" role="3clFbG">
+            <node concept="37vLTw" id="2cyQj2NWZTz" role="37vLTx">
+              <ref role="3cqZAo" node="2cyQj2NWYZq" resolve="width" />
+            </node>
+            <node concept="37vLTw" id="2cyQj2NXX_4" role="37vLTJ">
+              <ref role="3cqZAo" node="2cyQj2NXVF2" resolve="myDefaultWidth" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="2cyQj2NX1eY" role="jymVt" />
+    <node concept="3clFb_" id="2cyQj2NX0kw" role="jymVt">
+      <property role="TrG5h" value="setDefaultHeight" />
+      <node concept="37vLTG" id="2cyQj2NX0kx" role="3clF46">
+        <property role="TrG5h" value="height" />
+        <node concept="10Oyi0" id="2cyQj2NX0ky" role="1tU5fm" />
+      </node>
+      <node concept="3cqZAl" id="2cyQj2NX0kz" role="3clF45" />
+      <node concept="3Tm1VV" id="2cyQj2NX0k$" role="1B3o_S" />
+      <node concept="3clFbS" id="2cyQj2NX0k_" role="3clF47">
+        <node concept="3clFbF" id="2cyQj2NX0kA" role="3cqZAp">
+          <node concept="37vLTI" id="2cyQj2NX0kB" role="3clFbG">
+            <node concept="37vLTw" id="2cyQj2NX0kC" role="37vLTx">
+              <ref role="3cqZAo" node="2cyQj2NX0kx" resolve="height" />
+            </node>
+            <node concept="37vLTw" id="2cyQj2NXXKa" role="37vLTJ">
+              <ref role="3cqZAo" node="2cyQj2NXWnz" resolve="myDefaultHeight" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="rKHxOEkI9F" role="jymVt" />
+    <node concept="3clFb_" id="2cyQj2NYjUa" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="setHeight" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3Tm1VV" id="2cyQj2NYjUb" role="1B3o_S" />
+      <node concept="3cqZAl" id="2cyQj2NYjUd" role="3clF45" />
+      <node concept="37vLTG" id="2cyQj2NYjUe" role="3clF46">
+        <property role="TrG5h" value="i" />
+        <node concept="10Oyi0" id="2cyQj2NYjUf" role="1tU5fm" />
+      </node>
+      <node concept="3clFbS" id="2cyQj2NYjUg" role="3clF47">
+        <node concept="3clFbF" id="2cyQj2NYjUk" role="3cqZAp">
+          <node concept="3nyPlj" id="2cyQj2NYjUj" role="3clFbG">
+            <ref role="37wK5l" to="g51k:~EditorCell_Basic.setHeight(int):void" resolve="setHeight" />
+            <node concept="37vLTw" id="2cyQj2NYjUi" role="37wK5m">
+              <ref role="3cqZAo" node="2cyQj2NYjUe" resolve="i" />
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="2AHcQZ" id="2cyQj2NYjUh" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+    </node>
     <node concept="3clFb_" id="rKHxOEkIlR" role="jymVt">
       <property role="1EzhhJ" value="false" />
       <property role="TrG5h" value="relayoutImpl" />
@@ -2787,8 +2872,8 @@
       <node concept="3clFbS" id="rKHxOEkIlV" role="3clF47">
         <node concept="3clFbF" id="rKHxOEkIBE" role="3cqZAp">
           <node concept="37vLTI" id="rKHxOEkJ7_" role="3clFbG">
-            <node concept="3cmrfG" id="rKHxOEkJa6" role="37vLTx">
-              <property role="3cmrfH" value="50" />
+            <node concept="37vLTw" id="2cyQj2NXXc4" role="37vLTx">
+              <ref role="3cqZAo" node="2cyQj2NXVF2" resolve="myDefaultWidth" />
             </node>
             <node concept="37vLTw" id="rKHxOEkIBD" role="37vLTJ">
               <ref role="3cqZAo" to="g51k:~EditorCell_Basic.myWidth" resolve="myWidth" />
@@ -2797,8 +2882,8 @@
         </node>
         <node concept="3clFbF" id="rKHxOEkJ_1" role="3cqZAp">
           <node concept="37vLTI" id="rKHxOEkK6K" role="3clFbG">
-            <node concept="3cmrfG" id="rKHxOEkK9h" role="37vLTx">
-              <property role="3cmrfH" value="50" />
+            <node concept="37vLTw" id="2cyQj2NXXpT" role="37vLTx">
+              <ref role="3cqZAo" node="2cyQj2NXWnz" resolve="myDefaultHeight" />
             </node>
             <node concept="37vLTw" id="rKHxOEkJ$Z" role="37vLTJ">
               <ref role="3cqZAo" to="g51k:~EditorCell_Basic.myHeight" resolve="myHeight" />
@@ -3010,11 +3095,21 @@
       <node concept="3clFbS" id="5WYUu8HctwW" role="3clF47">
         <node concept="3clFbF" id="5WYUu8HcuU0" role="3cqZAp">
           <node concept="3K4zz7" id="5WYUu8HcvMo" role="3clFbG">
-            <node concept="37vLTw" id="5WYUu8HcvYO" role="3K4E3e">
-              <ref role="3cqZAo" node="5WYUu8HctwR" resolve="widthHint" />
+            <node concept="FJ1c_" id="2cyQj2NY0QF" role="3K4E3e">
+              <node concept="37vLTw" id="2cyQj2NY14N" role="3uHU7w">
+                <ref role="3cqZAo" node="2cyQj2NXVF2" resolve="myDefaultWidth" />
+              </node>
+              <node concept="17qRlL" id="2cyQj2NY0q2" role="3uHU7B">
+                <node concept="37vLTw" id="5WYUu8HcvYO" role="3uHU7B">
+                  <ref role="3cqZAo" node="5WYUu8HctwR" resolve="widthHint" />
+                </node>
+                <node concept="37vLTw" id="2cyQj2NY0BK" role="3uHU7w">
+                  <ref role="3cqZAo" node="2cyQj2NXWnz" resolve="myDefaultHeight" />
+                </node>
+              </node>
             </node>
-            <node concept="3cmrfG" id="5WYUu8HcwaS" role="3K4GZi">
-              <property role="3cmrfH" value="50" />
+            <node concept="37vLTw" id="2cyQj2NXZ3L" role="3K4GZi">
+              <ref role="3cqZAo" node="2cyQj2NXWnz" resolve="myDefaultHeight" />
             </node>
             <node concept="3eOSWO" id="5WYUu8Hcvi6" role="3K4Cdx">
               <node concept="3cmrfG" id="5WYUu8Hcvig" role="3uHU7w">
@@ -3042,11 +3137,21 @@
       <node concept="3clFbS" id="5WYUu8Hctx5" role="3clF47">
         <node concept="3clFbF" id="5WYUu8Hcwf8" role="3cqZAp">
           <node concept="3K4zz7" id="5WYUu8Hcx7w" role="3clFbG">
-            <node concept="37vLTw" id="5WYUu8HcxjW" role="3K4E3e">
-              <ref role="3cqZAo" node="5WYUu8Hctx0" resolve="heightHint" />
+            <node concept="FJ1c_" id="2cyQj2NXZWF" role="3K4E3e">
+              <node concept="37vLTw" id="2cyQj2NY0aV" role="3uHU7w">
+                <ref role="3cqZAo" node="2cyQj2NXWnz" resolve="myDefaultHeight" />
+              </node>
+              <node concept="17qRlL" id="2cyQj2NXZw1" role="3uHU7B">
+                <node concept="37vLTw" id="5WYUu8HcxjW" role="3uHU7B">
+                  <ref role="3cqZAo" node="5WYUu8Hctx0" resolve="heightHint" />
+                </node>
+                <node concept="37vLTw" id="2cyQj2NXZHJ" role="3uHU7w">
+                  <ref role="3cqZAo" node="2cyQj2NXVF2" resolve="myDefaultWidth" />
+                </node>
+              </node>
             </node>
-            <node concept="3cmrfG" id="5WYUu8Hcxw0" role="3K4GZi">
-              <property role="3cmrfH" value="50" />
+            <node concept="37vLTw" id="2cyQj2NXZhi" role="3K4GZi">
+              <ref role="3cqZAo" node="2cyQj2NXVF2" resolve="myDefaultWidth" />
             </node>
             <node concept="3eOSWO" id="5WYUu8HcwBe" role="3K4Cdx">
               <node concept="3cmrfG" id="5WYUu8HcwBo" role="3uHU7w">

From 9c1b93ad5ba57f4ff2b69582d8b66b31895f316e Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Fri, 8 Jan 2016 10:10:56 +0100
Subject: [PATCH 08/15] SelectionIntentions: Intentions where always shown,
 also if not applicable

---
 .../models/de/itemis/mps/selection/runtime/intentions.mps       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/plugins/sl-all/solutions/de.itemis.mps.selection.runtime/models/de/itemis/mps/selection/runtime/intentions.mps b/code/plugins/sl-all/solutions/de.itemis.mps.selection.runtime/models/de/itemis/mps/selection/runtime/intentions.mps
index 7599677caa8..6c1b15cafaa 100644
--- a/code/plugins/sl-all/solutions/de.itemis.mps.selection.runtime/models/de/itemis/mps/selection/runtime/intentions.mps
+++ b/code/plugins/sl-all/solutions/de.itemis.mps.selection.runtime/models/de/itemis/mps/selection/runtime/intentions.mps
@@ -1316,7 +1316,7 @@
               <ref role="1Pybhc" node="630t2b86nFa" resolve="SelectionIntentionsManager" />
             </node>
             <node concept="liA8E" id="630t2b8dcPO" role="2OqNvi">
-              <ref role="37wK5l" node="630t2b8bDVI" resolve="getIntentions" />
+              <ref role="37wK5l" node="630t2b8dGzk" resolve="getApplicableIntentions" />
               <node concept="37vLTw" id="630t2b8dcPP" role="37wK5m">
                 <ref role="3cqZAo" node="630t2b8dcPU" resolve="selection" />
               </node>

From ba487e305417aa69627ed46e245d4ea4bcbd01db Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Fri, 8 Jan 2016 14:16:19 +0100
Subject: [PATCH 09/15] Diagram: Second attempt to fix #1251 (Port Tooltips
 seem to have no effect)

---
 code/plugins/sl-all/.mps/modules.xml          |  1 +
 .../mps/editor/diagram/runtime/jgraph.mps     | 80 +++++++++++++------
 2 files changed, 56 insertions(+), 25 deletions(-)

diff --git a/code/plugins/sl-all/.mps/modules.xml b/code/plugins/sl-all/.mps/modules.xml
index 4e6ffd9a8f4..1ac1c2a36ff 100644
--- a/code/plugins/sl-all/.mps/modules.xml
+++ b/code/plugins/sl-all/.mps/modules.xml
@@ -18,6 +18,7 @@
       <modulePath path="$PROJECT_DIR$/diagram/languages/de.itemis.mps.editor.layout/de.itemis.mps.editor.layout.mpl" folder="diagram" />
       <modulePath path="$PROJECT_DIR$/diagram/languages/test.de.itemis.mps.editor.diagram.lang/test.de.itemis.mps.editor.diagram.lang.mpl" folder="diagram" />
       <modulePath path="$PROJECT_DIR$/diagram/solutions/de.itemis.mps.editor.collapsible.runtime/de.itemis.mps.editor.collapsible.runtime.msd" folder="diagram" />
+      <modulePath path="$PROJECT_DIR$/diagram/solutions/de.itemis.mps.editor.diagram.contextactions/de.itemis.mps.editor.diagram.contextactions.msd" folder="diagram" />
       <modulePath path="$PROJECT_DIR$/diagram/solutions/de.itemis.mps.editor.diagram.demo.activity.sandbox/de.itemis.mps.editor.diagram.demo.activity.sandbox.msd" folder="diagram" />
       <modulePath path="$PROJECT_DIR$/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd" folder="diagram" />
       <modulePath path="$PROJECT_DIR$/diagram/solutions/de.itemis.mps.editor.diagram.sandbox/de.itemis.mps.editor.diagram.sandbox.msd" folder="diagram" />
diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 34a56242a6c..362aac393ca 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -22478,6 +22478,14 @@
             </node>
           </node>
         </node>
+        <node concept="3clFbF" id="2cyQj2O1qn6" role="3cqZAp">
+          <node concept="1rXfSq" id="2cyQj2O1qn4" role="3clFbG">
+            <ref role="37wK5l" to="z60i:~Component.setFocusable(boolean):void" resolve="setFocusable" />
+            <node concept="3clFbT" id="2cyQj2O1rrc" role="37wK5m">
+              <property role="3clFbU" value="false" />
+            </node>
+          </node>
+        </node>
         <node concept="3clFbF" id="6zxgcXkRCsL" role="3cqZAp">
           <node concept="1rXfSq" id="6zxgcXkRCsK" role="3clFbG">
             <ref role="37wK5l" to="p8va:~mxGraphComponent.setToolTips(boolean):void" resolve="setToolTips" />
@@ -23070,37 +23078,51 @@
             <node concept="3uibUv" id="5biqYZY$DSw" role="1tU5fm">
               <ref role="3uigEE" to="nkm5:20KyIMr11_p" resolve="Point" />
             </node>
-            <node concept="2YIFZM" id="5biqYZY$IQ6" role="33vP2m">
-              <ref role="1Pybhc" node="5biqYZYyZRi" resolve="JGraphUtil" />
-              <ref role="37wK5l" node="5biqYZY$FPy" resolve="convertFromView" />
-              <node concept="2OqwBi" id="5biqYZY$IRa" role="37wK5m">
-                <node concept="1rXfSq" id="5biqYZY$IRb" role="2Oq$k0">
-                  <ref role="37wK5l" node="5YRJpe$xLEy" resolve="getGraph" />
+            <node concept="2ShNRf" id="7FkgTXZs1Pg" role="33vP2m">
+              <node concept="1pGfFk" id="7FkgTXZs1Ph" role="2ShVmc">
+                <ref role="37wK5l" to="nkm5:20KyIMr12mx" resolve="Point" />
+                <node concept="2OqwBi" id="7FkgTXZs1Pi" role="37wK5m">
+                  <node concept="37vLTw" id="7FkgTXZs1Pj" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5biqYZY5CQX" resolve="sourceEvent" />
+                  </node>
+                  <node concept="liA8E" id="7FkgTXZs1Pk" role="2OqNvi">
+                    <ref role="37wK5l" to="hyam:~MouseEvent.getX():int" resolve="getX" />
+                  </node>
                 </node>
-                <node concept="liA8E" id="5biqYZY$IRc" role="2OqNvi">
-                  <ref role="37wK5l" node="5YRJpe$ygQu" resolve="getView" />
+                <node concept="2OqwBi" id="7FkgTXZs1Pl" role="37wK5m">
+                  <node concept="37vLTw" id="7FkgTXZs1Pm" role="2Oq$k0">
+                    <ref role="3cqZAo" node="5biqYZY5CQX" resolve="sourceEvent" />
+                  </node>
+                  <node concept="liA8E" id="7FkgTXZs1Pn" role="2OqNvi">
+                    <ref role="37wK5l" to="hyam:~MouseEvent.getY():int" resolve="getY" />
+                  </node>
                 </node>
               </node>
-              <node concept="2ShNRf" id="5biqYZY$IZl" role="37wK5m">
-                <node concept="1pGfFk" id="5biqYZY$IZm" role="2ShVmc">
-                  <ref role="37wK5l" to="nkm5:20KyIMr12mx" resolve="Point" />
-                  <node concept="2OqwBi" id="5biqYZY$IZn" role="37wK5m">
-                    <node concept="37vLTw" id="5biqYZY$IZo" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5biqYZY5CQX" resolve="sourceEvent" />
-                    </node>
-                    <node concept="liA8E" id="5biqYZY$IZp" role="2OqNvi">
-                      <ref role="37wK5l" to="hyam:~MouseEvent.getX():int" resolve="getX" />
-                    </node>
+            </node>
+          </node>
+        </node>
+        <node concept="1X3_iC" id="7FkgTXZsjtn" role="lGtFl">
+          <property role="3V$3am" value="statement" />
+          <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
+          <node concept="3clFbF" id="7FkgTXZrI1V" role="8Wnug">
+            <node concept="37vLTI" id="7FkgTXZrI1X" role="3clFbG">
+              <node concept="2YIFZM" id="7FkgTXZseIt" role="37vLTx">
+                <ref role="37wK5l" node="5biqYZY$FPy" resolve="convertFromView" />
+                <ref role="1Pybhc" node="5biqYZYyZRi" resolve="JGraphUtil" />
+                <node concept="2OqwBi" id="7FkgTXZseIu" role="37wK5m">
+                  <node concept="1rXfSq" id="7FkgTXZseIv" role="2Oq$k0">
+                    <ref role="37wK5l" node="5YRJpe$xLEy" resolve="getGraph" />
                   </node>
-                  <node concept="2OqwBi" id="5biqYZY$IZq" role="37wK5m">
-                    <node concept="37vLTw" id="5biqYZY$IZr" role="2Oq$k0">
-                      <ref role="3cqZAo" node="5biqYZY5CQX" resolve="sourceEvent" />
-                    </node>
-                    <node concept="liA8E" id="5biqYZY$IZs" role="2OqNvi">
-                      <ref role="37wK5l" to="hyam:~MouseEvent.getY():int" resolve="getY" />
-                    </node>
+                  <node concept="liA8E" id="7FkgTXZseIw" role="2OqNvi">
+                    <ref role="37wK5l" node="5YRJpe$ygQu" resolve="getView" />
                   </node>
                 </node>
+                <node concept="37vLTw" id="7FkgTXZseIx" role="37wK5m">
+                  <ref role="3cqZAo" node="5biqYZY$DSv" resolve="p" />
+                </node>
+              </node>
+              <node concept="37vLTw" id="7FkgTXZrI21" role="37vLTJ">
+                <ref role="3cqZAo" node="5biqYZY$DSv" resolve="p" />
               </node>
             </node>
           </node>
@@ -25856,6 +25878,14 @@
               </node>
             </node>
           </node>
+          <node concept="3clFbF" id="2cyQj2O1uvJ" role="3cqZAp">
+            <node concept="1rXfSq" id="2cyQj2O1uvH" role="3clFbG">
+              <ref role="37wK5l" to="z60i:~Component.setFocusable(boolean):void" resolve="setFocusable" />
+              <node concept="3clFbT" id="2cyQj2O1vxv" role="37wK5m">
+                <property role="3clFbU" value="false" />
+              </node>
+            </node>
+          </node>
           <node concept="3clFbH" id="6V44h9HZPEF" role="3cqZAp" />
           <node concept="3cpWs8" id="6V44h9I2H5e" role="3cqZAp">
             <node concept="3cpWsn" id="6V44h9I2H5f" role="3cpWs9">

From 15b9c40a1ac8cac13113d026f205d48daa899ebd Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Fri, 8 Jan 2016 14:57:58 +0100
Subject: [PATCH 10/15] GrammarCells: Wrap around enum property create an enum
 with default value

If the internal value was different from the presentation, the enum was
alsways set to the default value.
---
 .../grammarcells/sandboxlang/editor.mps       |   8 ++
 .../grammarcells/sandboxlang/structure.mps    |  42 ++++++
 .../generator/template/main@generator.mps     | 136 +++++++++---------
 .../mbeddr/mpsutil/grammarcells/runtime.mps   |  96 +++++++++++++
 4 files changed, 217 insertions(+), 65 deletions(-)

diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps
index c32abd65bfa..4b5c5ef5aea 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/editor.mps
@@ -968,5 +968,13 @@
       </node>
     </node>
   </node>
+  <node concept="24kQdi" id="7FkgTXZtQf_">
+    <ref role="1XX52x" to="ibwz:7FkgTXZtQe1" resolve="TEST_EnumWrapper" />
+    <node concept="1kIj98" id="7FkgTXZtQg5" role="2wV5jI">
+      <node concept="3F0A7n" id="7FkgTXZtQgm" role="1kIj9b">
+        <ref role="1NtTu8" to="ibwz:7FkgTXZtQgh" resolve="enum1" />
+      </node>
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps
index ad3a0a434fd..48e9b19f140 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells.sandboxlang/models/com/mbeddr/mpsutil/grammarcells/sandboxlang/structure.mps
@@ -10,9 +10,18 @@
   </imports>
   <registry>
     <language id="c72da2b9-7cce-4447-8389-f407dc1158b7" name="jetbrains.mps.lang.structure">
+      <concept id="1082978164219" name="jetbrains.mps.lang.structure.structure.EnumerationDataTypeDeclaration" flags="ng" index="AxPO7">
+        <property id="1197591154882" name="memberIdentifierPolicy" index="3lZH7k" />
+        <reference id="1083171729157" name="memberDataType" index="M4eZT" />
+        <child id="1083172003582" name="member" index="M5hS2" />
+      </concept>
       <concept id="1082978499127" name="jetbrains.mps.lang.structure.structure.ConstrainedDataTypeDeclaration" flags="ng" index="Az7Fb">
         <property id="1083066089218" name="constraint" index="FLfZY" />
       </concept>
+      <concept id="1083171877298" name="jetbrains.mps.lang.structure.structure.EnumerationMemberDeclaration" flags="ig" index="M4N5e">
+        <property id="1083923523172" name="externalValue" index="1uS6qo" />
+        <property id="1083923523171" name="internalValue" index="1uS6qv" />
+      </concept>
       <concept id="1169125787135" name="jetbrains.mps.lang.structure.structure.AbstractConceptDeclaration" flags="ig" index="PkWjJ">
         <property id="4628067390765956807" name="final" index="R5$K2" />
         <property id="4628067390765956802" name="abstract" index="R5$K7" />
@@ -465,5 +474,38 @@
       <ref role="PrY4T" node="1x69AmkdYA2" resolve="IStatement" />
     </node>
   </node>
+  <node concept="1TIwiD" id="7FkgTXZtQe1">
+    <property role="1pbfSe" value="95705312" />
+    <property role="TrG5h" value="TEST_EnumWrapper" />
+    <ref role="1TJDcQ" to="tpck:gw2VY9q" resolve="BaseConcept" />
+    <node concept="1TJgyi" id="7FkgTXZtQgh" role="1TKVEl">
+      <property role="TrG5h" value="enum1" />
+      <ref role="AX2Wp" node="7FkgTXZtQev" resolve="Enum1" />
+    </node>
+    <node concept="PrWs8" id="7FkgTXZtQeq" role="PzmwI">
+      <ref role="PrY4T" node="6oKG1kMxn8A" resolve="IExpression" />
+    </node>
+  </node>
+  <node concept="AxPO7" id="7FkgTXZtQev">
+    <property role="TrG5h" value="Enum1" />
+    <property role="3lZH7k" value="derive_from_internal_value" />
+    <ref role="M4eZT" to="tpck:fKAOsGN" resolve="string" />
+    <node concept="M4N5e" id="7FkgTXZtQew" role="M5hS2">
+      <property role="1uS6qo" value="a" />
+      <property role="1uS6qv" value="100" />
+    </node>
+    <node concept="M4N5e" id="7FkgTXZtQeT" role="M5hS2">
+      <property role="1uS6qo" value="b" />
+      <property role="1uS6qv" value="101" />
+    </node>
+    <node concept="M4N5e" id="7FkgTXZtQf2" role="M5hS2">
+      <property role="1uS6qo" value="c" />
+      <property role="1uS6qv" value="102" />
+    </node>
+    <node concept="M4N5e" id="7FkgTXZtQff" role="M5hS2">
+      <property role="1uS6qo" value="d" />
+      <property role="1uS6qv" value="103" />
+    </node>
+  </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
index 5b37cdf98db..91b44435aa9 100644
--- a/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
+++ b/code/languages/com.mbeddr.mpsutil/languages/com.mbeddr.mpsutil.grammarcells/generator/template/main@generator.mps
@@ -6327,6 +6327,66 @@
                                 <property role="2bfB8j" value="true" />
                                 <ref role="1Y3XeK" to="zce0:~AbstractSubstituteAction" resolve="AbstractSubstituteAction" />
                                 <ref role="37wK5l" to="zce0:~AbstractSubstituteAction.&lt;init&gt;(org.jetbrains.mps.openapi.model.SNode)" resolve="AbstractSubstituteAction" />
+                                <node concept="312cEg" id="7FkgTXZuZOq" role="jymVt">
+                                  <property role="TrG5h" value="myProperty" />
+                                  <node concept="3Tm6S6" id="7FkgTXZuZO2" role="1B3o_S" />
+                                  <node concept="3uibUv" id="7FkgTXZuZO3" role="1tU5fm">
+                                    <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+                                  </node>
+                                  <node concept="355D3s" id="7FkgTXZuZO4" role="33vP2m">
+                                    <ref role="355D3t" to="tpck:gw2VY9q" resolve="BaseConcept" />
+                                    <ref role="355D3u" to="tpck:hnGE5uv" resolve="virtualPackage" />
+                                    <node concept="1ZhdrF" id="7FkgTXZuZO5" role="lGtFl">
+                                      <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474302386080/2644386474302386081" />
+                                      <property role="2qtEX8" value="conceptDeclaration" />
+                                      <node concept="3$xsQk" id="7FkgTXZuZO6" role="3$ytzL">
+                                        <node concept="3clFbS" id="7FkgTXZuZO7" role="2VODD2">
+                                          <node concept="3clFbF" id="7FkgTXZuZO8" role="3cqZAp">
+                                            <node concept="2OqwBi" id="7FkgTXZuZO9" role="3clFbG">
+                                              <node concept="2OqwBi" id="7FkgTXZuZOa" role="2Oq$k0">
+                                                <node concept="30H73N" id="7FkgTXZuZOb" role="2Oq$k0" />
+                                                <node concept="2Xjw5R" id="7FkgTXZuZOc" role="2OqNvi">
+                                                  <node concept="1xMEDy" id="7FkgTXZuZOd" role="1xVPHs">
+                                                    <node concept="chp4Y" id="7FkgTXZuZOe" role="ri$Ld">
+                                                      <ref role="cht4Q" to="tpc2:gXXWOiD" resolve="AbstractComponent" />
+                                                    </node>
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="2qgKlT" id="7FkgTXZuZOf" role="2OqNvi">
+                                                <ref role="37wK5l" to="tpcb:67EYkym$wx3" resolve="getConceptDeclaration" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                    <node concept="1ZhdrF" id="7FkgTXZuZOg" role="lGtFl">
+                                      <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474302386080/2644386474302386082" />
+                                      <property role="2qtEX8" value="propertyDeclaration" />
+                                      <node concept="3$xsQk" id="7FkgTXZuZOh" role="3$ytzL">
+                                        <node concept="3clFbS" id="7FkgTXZuZOi" role="2VODD2">
+                                          <node concept="3clFbF" id="7FkgTXZuZOj" role="3cqZAp">
+                                            <node concept="2OqwBi" id="7FkgTXZuZOk" role="3clFbG">
+                                              <node concept="1PxgMI" id="7FkgTXZuZOl" role="2Oq$k0">
+                                                <ref role="1PxNhF" to="tpc2:fBF0A4I" resolve="CellModel_Property" />
+                                                <node concept="2OqwBi" id="7FkgTXZuZOm" role="1PxMeX">
+                                                  <node concept="30H73N" id="7FkgTXZuZOn" role="2Oq$k0" />
+                                                  <node concept="2qgKlT" id="7FkgTXZuZOo" role="2OqNvi">
+                                                    <ref role="37wK5l" to="karh:3O7ZvCZLQaV" resolve="getWrappedLeaf" />
+                                                  </node>
+                                                </node>
+                                              </node>
+                                              <node concept="3TrEf2" id="7FkgTXZuZOp" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="tpc2:fBF1KQc" />
+                                              </node>
+                                            </node>
+                                          </node>
+                                        </node>
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
                                 <node concept="3Tm1VV" id="4qdNcH$23jT" role="1B3o_S" />
                                 <node concept="2OqwBi" id="4qdNcH$23ro" role="37wK5m">
                                   <node concept="37vLTw" id="4qdNcH$23nY" role="2Oq$k0">
@@ -6399,73 +6459,12 @@
                                         <node concept="17RlXB" id="4qdNcH$2817" role="2OqNvi" />
                                       </node>
                                     </node>
-                                    <node concept="3cpWs8" id="4qdNcH$28rp" role="3cqZAp">
-                                      <node concept="3cpWsn" id="4qdNcH$28rq" role="3cpWs9">
-                                        <property role="TrG5h" value="property" />
-                                        <node concept="3uibUv" id="4qdNcH$28rb" role="1tU5fm">
-                                          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
-                                        </node>
-                                        <node concept="355D3s" id="4qdNcH$28rr" role="33vP2m">
-                                          <ref role="355D3t" to="tpck:gw2VY9q" resolve="BaseConcept" />
-                                          <ref role="355D3u" to="tpck:hnGE5uv" resolve="virtualPackage" />
-                                          <node concept="1ZhdrF" id="4qdNcH$28rs" role="lGtFl">
-                                            <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474302386080/2644386474302386081" />
-                                            <property role="2qtEX8" value="conceptDeclaration" />
-                                            <node concept="3$xsQk" id="4qdNcH$28rt" role="3$ytzL">
-                                              <node concept="3clFbS" id="4qdNcH$28ru" role="2VODD2">
-                                                <node concept="3clFbF" id="4qdNcH$28rv" role="3cqZAp">
-                                                  <node concept="2OqwBi" id="4qdNcH$28rw" role="3clFbG">
-                                                    <node concept="2OqwBi" id="4qdNcH$28rx" role="2Oq$k0">
-                                                      <node concept="30H73N" id="4qdNcH$28ry" role="2Oq$k0" />
-                                                      <node concept="2Xjw5R" id="4qdNcH$28rz" role="2OqNvi">
-                                                        <node concept="1xMEDy" id="4qdNcH$28r$" role="1xVPHs">
-                                                          <node concept="chp4Y" id="4qdNcH$28r_" role="ri$Ld">
-                                                            <ref role="cht4Q" to="tpc2:gXXWOiD" resolve="AbstractComponent" />
-                                                          </node>
-                                                        </node>
-                                                      </node>
-                                                    </node>
-                                                    <node concept="2qgKlT" id="4qdNcH$28rA" role="2OqNvi">
-                                                      <ref role="37wK5l" to="tpcb:67EYkym$wx3" resolve="getConceptDeclaration" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                          <node concept="1ZhdrF" id="4qdNcH$28rB" role="lGtFl">
-                                            <property role="P3scX" value="7866978e-a0f0-4cc7-81bc-4d213d9375e1/2644386474302386080/2644386474302386082" />
-                                            <property role="2qtEX8" value="propertyDeclaration" />
-                                            <node concept="3$xsQk" id="4qdNcH$28rC" role="3$ytzL">
-                                              <node concept="3clFbS" id="4qdNcH$28rD" role="2VODD2">
-                                                <node concept="3clFbF" id="4qdNcH$28rE" role="3cqZAp">
-                                                  <node concept="2OqwBi" id="4qdNcH$28rF" role="3clFbG">
-                                                    <node concept="1PxgMI" id="4qdNcH$28rG" role="2Oq$k0">
-                                                      <ref role="1PxNhF" to="tpc2:fBF0A4I" resolve="CellModel_Property" />
-                                                      <node concept="2OqwBi" id="4qdNcH$28rH" role="1PxMeX">
-                                                        <node concept="30H73N" id="4qdNcH$28rI" role="2Oq$k0" />
-                                                        <node concept="2qgKlT" id="6hg40VOQ1NR" role="2OqNvi">
-                                                          <ref role="37wK5l" to="karh:3O7ZvCZLQaV" resolve="getWrappedLeaf" />
-                                                        </node>
-                                                      </node>
-                                                    </node>
-                                                    <node concept="3TrEf2" id="4qdNcH$28rK" role="2OqNvi">
-                                                      <ref role="3Tt5mk" to="tpc2:fBF1KQc" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                          </node>
-                                        </node>
-                                      </node>
-                                    </node>
                                     <node concept="3cpWs6" id="3pFNVizu3ZG" role="3cqZAp">
                                       <node concept="2YIFZM" id="3pFNVizuKQa" role="3cqZAk">
                                         <ref role="37wK5l" to="czm:1gQHfgGXJro" resolve="isValidPropertyValue" />
                                         <ref role="1Pybhc" to="czm:RbLMy696h3" resolve="GrammarCellsUtil" />
-                                        <node concept="37vLTw" id="3pFNVizuLDJ" role="37wK5m">
-                                          <ref role="3cqZAo" node="4qdNcH$28rq" resolve="property" />
+                                        <node concept="37vLTw" id="7FkgTXZv4JQ" role="37wK5m">
+                                          <ref role="3cqZAo" node="7FkgTXZuZOq" resolve="myProperty" />
                                         </node>
                                         <node concept="37vLTw" id="3pFNVizuO5U" role="37wK5m">
                                           <ref role="3cqZAo" node="4qdNcH$1EE7" resolve="outputConcept" />
@@ -6571,8 +6570,15 @@
                                     </node>
                                     <node concept="3clFbF" id="4qdNcH$2cRZ" role="3cqZAp">
                                       <node concept="37vLTI" id="4qdNcH$2dKj" role="3clFbG">
-                                        <node concept="37vLTw" id="4qdNcH$2dQi" role="37vLTx">
-                                          <ref role="3cqZAo" node="4qdNcH$2aTc" resolve="pattern" />
+                                        <node concept="2YIFZM" id="7FkgTXZuYER" role="37vLTx">
+                                          <ref role="37wK5l" to="czm:7FkgTXZuQyG" resolve="toInternalPropertyValue" />
+                                          <ref role="1Pybhc" to="czm:RbLMy696h3" resolve="GrammarCellsUtil" />
+                                          <node concept="37vLTw" id="7FkgTXZv0Y5" role="37wK5m">
+                                            <ref role="3cqZAo" node="7FkgTXZuZOq" resolve="myProperty" />
+                                          </node>
+                                          <node concept="37vLTw" id="7FkgTXZuZbg" role="37wK5m">
+                                            <ref role="3cqZAo" node="4qdNcH$2aTc" resolve="pattern" />
+                                          </node>
                                         </node>
                                         <node concept="2OqwBi" id="4qdNcH$2cUX" role="37vLTJ">
                                           <node concept="37vLTw" id="4qdNcH$2cRX" role="2Oq$k0">
diff --git a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps
index 7c9e4711618..03991e1ca37 100644
--- a/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps
+++ b/code/languages/com.mbeddr.mpsutil/solutions/com.mbeddr.mpsutil.grammarcells.runtime/models/com/mbeddr/mpsutil/grammarcells/runtime.mps
@@ -2502,6 +2502,102 @@
       <node concept="10P_77" id="1gQHfgGXJgw" role="3clF45" />
       <node concept="3Tm1VV" id="1gQHfgGXDve" role="1B3o_S" />
     </node>
+    <node concept="2tJIrI" id="7FkgTXZuRu9" role="jymVt" />
+    <node concept="2YIFZL" id="7FkgTXZuQyG" role="jymVt">
+      <property role="TrG5h" value="toInternalPropertyValue" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="7FkgTXZuQyH" role="3clF47">
+        <node concept="3cpWs8" id="7FkgTXZuQyI" role="3cqZAp">
+          <node concept="3cpWsn" id="7FkgTXZuQyJ" role="3cpWs9">
+            <property role="TrG5h" value="support" />
+            <node concept="3uibUv" id="7FkgTXZuQyK" role="1tU5fm">
+              <ref role="3uigEE" to="w1kc:~PropertySupport" resolve="PropertySupport" />
+            </node>
+            <node concept="2YIFZM" id="7FkgTXZuQyL" role="33vP2m">
+              <ref role="37wK5l" to="w1kc:~PropertySupport.getPropertySupport(org.jetbrains.mps.openapi.language.SProperty):jetbrains.mps.smodel.PropertySupport" resolve="getPropertySupport" />
+              <ref role="1Pybhc" to="w1kc:~PropertySupport" resolve="PropertySupport" />
+              <node concept="37vLTw" id="7FkgTXZuQyM" role="37wK5m">
+                <ref role="3cqZAo" node="7FkgTXZuQzb" resolve="property" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="7FkgTXZuQz4" role="3cqZAp">
+          <node concept="2OqwBi" id="7FkgTXZuQz5" role="3cqZAk">
+            <node concept="37vLTw" id="7FkgTXZuQz6" role="2Oq$k0">
+              <ref role="3cqZAo" node="7FkgTXZuQyJ" resolve="support" />
+            </node>
+            <node concept="liA8E" id="7FkgTXZuQz7" role="2OqNvi">
+              <ref role="37wK5l" to="w1kc:~PropertySupport.toInternalValue(java.lang.String):java.lang.String" resolve="toInternalValue" />
+              <node concept="37vLTw" id="7FkgTXZuTvf" role="37wK5m">
+                <ref role="3cqZAo" node="7FkgTXZuQzg" resolve="value" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7FkgTXZuQzb" role="3clF46">
+        <property role="TrG5h" value="property" />
+        <node concept="3uibUv" id="7FkgTXZuQzc" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7FkgTXZuQzg" role="3clF46">
+        <property role="TrG5h" value="value" />
+        <node concept="17QB3L" id="7FkgTXZuQzh" role="1tU5fm" />
+      </node>
+      <node concept="17QB3L" id="7FkgTXZuTxT" role="3clF45" />
+      <node concept="3Tm1VV" id="7FkgTXZuQzj" role="1B3o_S" />
+    </node>
+    <node concept="2tJIrI" id="7FkgTXZuUKE" role="jymVt" />
+    <node concept="2YIFZL" id="7FkgTXZuTUj" role="jymVt">
+      <property role="TrG5h" value="fromInternalPropertyValue" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="7FkgTXZuTUk" role="3clF47">
+        <node concept="3cpWs8" id="7FkgTXZuTUl" role="3cqZAp">
+          <node concept="3cpWsn" id="7FkgTXZuTUm" role="3cpWs9">
+            <property role="TrG5h" value="support" />
+            <node concept="3uibUv" id="7FkgTXZuTUn" role="1tU5fm">
+              <ref role="3uigEE" to="w1kc:~PropertySupport" resolve="PropertySupport" />
+            </node>
+            <node concept="2YIFZM" id="7FkgTXZuTUo" role="33vP2m">
+              <ref role="37wK5l" to="w1kc:~PropertySupport.getPropertySupport(org.jetbrains.mps.openapi.language.SProperty):jetbrains.mps.smodel.PropertySupport" resolve="getPropertySupport" />
+              <ref role="1Pybhc" to="w1kc:~PropertySupport" resolve="PropertySupport" />
+              <node concept="37vLTw" id="7FkgTXZuTUp" role="37wK5m">
+                <ref role="3cqZAo" node="7FkgTXZuTUv" resolve="property" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3cpWs6" id="7FkgTXZuTUq" role="3cqZAp">
+          <node concept="2OqwBi" id="7FkgTXZuTUr" role="3cqZAk">
+            <node concept="37vLTw" id="7FkgTXZuTUs" role="2Oq$k0">
+              <ref role="3cqZAo" node="7FkgTXZuTUm" resolve="support" />
+            </node>
+            <node concept="liA8E" id="7FkgTXZuTUt" role="2OqNvi">
+              <ref role="37wK5l" to="w1kc:~PropertySupport.fromInternalValue(java.lang.String):java.lang.String" resolve="fromInternalValue" />
+              <node concept="37vLTw" id="7FkgTXZuTUu" role="37wK5m">
+                <ref role="3cqZAo" node="7FkgTXZuTUx" resolve="value" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="37vLTG" id="7FkgTXZuTUv" role="3clF46">
+        <property role="TrG5h" value="property" />
+        <node concept="3uibUv" id="7FkgTXZuTUw" role="1tU5fm">
+          <ref role="3uigEE" to="c17a:~SProperty" resolve="SProperty" />
+        </node>
+      </node>
+      <node concept="37vLTG" id="7FkgTXZuTUx" role="3clF46">
+        <property role="TrG5h" value="value" />
+        <node concept="17QB3L" id="7FkgTXZuTUy" role="1tU5fm" />
+      </node>
+      <node concept="17QB3L" id="7FkgTXZuTUz" role="3clF45" />
+      <node concept="3Tm1VV" id="7FkgTXZuTU$" role="1B3o_S" />
+    </node>
     <node concept="3Tm1VV" id="RbLMy696h4" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="RbLMy69lMx">

From 704a995e11b0e598955266c96587737986d9c140 Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Mon, 11 Jan 2016 09:35:17 +0100
Subject: [PATCH 11/15] Diagram: #1268 Pressing Backspace to Delete Boxes or
 Edges has no effect

---
 .../mps/editor/diagram/runtime/jgraph.mps     | 122 +++++++++++++++++-
 1 file changed, 119 insertions(+), 3 deletions(-)

diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 362aac393ca..cc69379273f 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -424,6 +424,9 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
+      <concept id="1206629501431" name="jetbrains.mps.baseLanguage.structure.InstanceInitializer" flags="lg" index="3KIgzJ">
+        <child id="1206629521979" name="statementList" index="3KIlGz" />
+      </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
       <concept id="1221737317277" name="jetbrains.mps.baseLanguage.structure.StaticInitializer" flags="lg" index="1Pe0a1">
         <child id="1221737317278" name="statementList" index="1Pe0a2" />
@@ -45385,6 +45388,96 @@
         </node>
       </node>
     </node>
+    <node concept="2tJIrI" id="7FkgTXZDoWn" role="jymVt" />
+    <node concept="312cEg" id="7FkgTXZDs8I" role="jymVt">
+      <property role="TrG5h" value="myActions" />
+      <node concept="3Tm6S6" id="7FkgTXZDs8J" role="1B3o_S" />
+      <node concept="3rvAFt" id="7FkgTXZDup3" role="1tU5fm">
+        <node concept="1ajhzC" id="7FkgTXZE1tg" role="3rvSg0">
+          <node concept="3cqZAl" id="7FkgTXZE1Iq" role="1ajl9A" />
+        </node>
+        <node concept="3uibUv" id="7FkgTXZDuG9" role="3rvQeY">
+          <ref role="3uigEE" to="f4zo:~CellActionType" resolve="CellActionType" />
+        </node>
+      </node>
+      <node concept="2ShNRf" id="7FkgTXZDvBP" role="33vP2m">
+        <node concept="3rGOSV" id="7FkgTXZDvwI" role="2ShVmc">
+          <node concept="3uibUv" id="7FkgTXZDvwJ" role="3rHrn6">
+            <ref role="3uigEE" to="f4zo:~CellActionType" resolve="CellActionType" />
+          </node>
+          <node concept="1ajhzC" id="7FkgTXZE7fs" role="3rHtpV">
+            <node concept="3cqZAl" id="7FkgTXZE7$G" role="1ajl9A" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7FkgTXZDvKD" role="jymVt" />
+    <node concept="3KIgzJ" id="7FkgTXZDz3m" role="jymVt">
+      <node concept="3clFbS" id="7FkgTXZDz3o" role="3KIlGz">
+        <node concept="3clFbF" id="7FkgTXZD_yw" role="3cqZAp">
+          <node concept="37vLTI" id="7FkgTXZDAWf" role="3clFbG">
+            <node concept="1bVj0M" id="7FkgTXZE2c9" role="37vLTx">
+              <node concept="3clFbS" id="7FkgTXZE2ci" role="1bW5cS">
+                <node concept="3cpWs8" id="7FkgTXZGAoI" role="3cqZAp">
+                  <node concept="3cpWsn" id="7FkgTXZGAoJ" role="3cpWs9">
+                    <property role="TrG5h" value="removedCells" />
+                    <node concept="10Q1$e" id="7FkgTXZGAoz" role="1tU5fm">
+                      <node concept="3uibUv" id="7FkgTXZGAoA" role="10Q1$1">
+                        <ref role="3uigEE" to="wyt6:~Object" resolve="Object" />
+                      </node>
+                    </node>
+                    <node concept="2OqwBi" id="7FkgTXZGAoK" role="33vP2m">
+                      <node concept="2OqwBi" id="7FkgTXZGAoL" role="2Oq$k0">
+                        <node concept="1rXfSq" id="7FkgTXZGAoM" role="2Oq$k0">
+                          <ref role="37wK5l" node="6I91F6s9MlO" resolve="getDiagramCell" />
+                        </node>
+                        <node concept="liA8E" id="7FkgTXZGAoN" role="2OqNvi">
+                          <ref role="37wK5l" node="4dus55SGE6v" resolve="getGraph" />
+                        </node>
+                      </node>
+                      <node concept="liA8E" id="7FkgTXZGAoO" role="2OqNvi">
+                        <ref role="37wK5l" to="1njx:~mxGraph.removeCells():java.lang.Object[]" resolve="removeCells" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3EllGN" id="7FkgTXZDAmk" role="37vLTJ">
+              <node concept="Rm8GO" id="7FkgTXZDAMg" role="3ElVtu">
+                <ref role="Rm8GQ" to="f4zo:~CellActionType.DELETE" resolve="DELETE" />
+                <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+              </node>
+              <node concept="37vLTw" id="7FkgTXZD_yv" role="3ElQJh">
+                <ref role="3cqZAo" node="7FkgTXZDs8I" resolve="myActions" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7FkgTXZE4Th" role="3cqZAp">
+          <node concept="37vLTI" id="7FkgTXZE5QX" role="3clFbG">
+            <node concept="3EllGN" id="7FkgTXZE6ve" role="37vLTx">
+              <node concept="Rm8GO" id="7FkgTXZE6Za" role="3ElVtu">
+                <ref role="Rm8GQ" to="f4zo:~CellActionType.DELETE" resolve="DELETE" />
+                <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+              </node>
+              <node concept="37vLTw" id="7FkgTXZE6aC" role="3ElQJh">
+                <ref role="3cqZAo" node="7FkgTXZDs8I" resolve="myActions" />
+              </node>
+            </node>
+            <node concept="3EllGN" id="7FkgTXZE5fK" role="37vLTJ">
+              <node concept="Rm8GO" id="7FkgTXZE5GQ" role="3ElVtu">
+                <ref role="Rm8GQ" to="f4zo:~CellActionType.BACKSPACE" resolve="BACKSPACE" />
+                <ref role="1Px2BO" to="f4zo:~CellActionType" resolve="CellActionType" />
+              </node>
+              <node concept="37vLTw" id="7FkgTXZE4Tf" role="3ElQJh">
+                <ref role="3cqZAo" node="7FkgTXZDs8I" resolve="myActions" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="2tJIrI" id="4dus55SAbqF" role="jymVt" />
     <node concept="3clFbW" id="2_D0AvWRqTT" role="jymVt">
       <node concept="37vLTG" id="1laD9eY9cE0" role="3clF46">
@@ -45857,8 +45950,17 @@
         </node>
       </node>
       <node concept="3clFbS" id="4dus55S_FIc" role="3clF47">
-        <node concept="3clFbF" id="4dus55S_FIe" role="3cqZAp">
-          <node concept="3clFbT" id="4dus55S_FId" role="3clFbG" />
+        <node concept="3clFbF" id="7FkgTXZE8aR" role="3cqZAp">
+          <node concept="2OqwBi" id="7FkgTXZE8ux" role="3clFbG">
+            <node concept="37vLTw" id="7FkgTXZE8aQ" role="2Oq$k0">
+              <ref role="3cqZAo" node="7FkgTXZDs8I" resolve="myActions" />
+            </node>
+            <node concept="2Nt0df" id="7FkgTXZE9qb" role="2OqNvi">
+              <node concept="37vLTw" id="7FkgTXZE9xk" role="38cxEo">
+                <ref role="3cqZAo" node="4dus55S_FI7" resolve="type" />
+              </node>
+            </node>
+          </node>
         </node>
       </node>
     </node>
@@ -45876,7 +45978,21 @@
           <ref role="3uigEE" to="f4zo:~CellActionType" resolve="CellActionType" />
         </node>
       </node>
-      <node concept="3clFbS" id="4dus55S_FIC" role="3clF47" />
+      <node concept="3clFbS" id="4dus55S_FIC" role="3clF47">
+        <node concept="3clFbF" id="7FkgTXZEbN9" role="3cqZAp">
+          <node concept="2EnYce" id="7FkgTXZEcay" role="3clFbG">
+            <node concept="3EllGN" id="7FkgTXZEaGM" role="2Oq$k0">
+              <node concept="37vLTw" id="7FkgTXZEaGN" role="3ElVtu">
+                <ref role="3cqZAo" node="4dus55S_FIz" resolve="type" />
+              </node>
+              <node concept="37vLTw" id="7FkgTXZEaGO" role="3ElQJh">
+                <ref role="3cqZAo" node="7FkgTXZDs8I" resolve="myActions" />
+              </node>
+            </node>
+            <node concept="1Bd96e" id="7FkgTXZEc7N" role="2OqNvi" />
+          </node>
+        </node>
+      </node>
     </node>
     <node concept="2tJIrI" id="4dus55SPGDU" role="jymVt" />
     <node concept="3clFb_" id="4dus55S_FID" role="jymVt">

From 11d98538e8772870e77f522687abae29ad88c0ba Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Mon, 11 Jan 2016 10:23:17 +0100
Subject: [PATCH 12/15] Diagram: #1266 Resize (button, or automatic) should
 take into account ports

---
 .../mps/editor/diagram/runtime/jgraph.mps     | 289 ++++++++++++++++--
 1 file changed, 266 insertions(+), 23 deletions(-)

diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index cc69379273f..eaed47e33b0 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -587,6 +587,7 @@
       <concept id="1205679737078" name="jetbrains.mps.baseLanguage.collections.structure.SortOperation" flags="nn" index="2S7cBI">
         <child id="1205679832066" name="ascending" index="2S7zOq" />
       </concept>
+      <concept id="1237909114519" name="jetbrains.mps.baseLanguage.collections.structure.GetValuesOperation" flags="nn" index="T8wYR" />
       <concept id="1160600644654" name="jetbrains.mps.baseLanguage.collections.structure.ListCreatorWithInit" flags="nn" index="Tc6Ow" />
       <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="4611582986551314327" name="jetbrains.mps.baseLanguage.collections.structure.OfTypeOperation" flags="nn" index="UnYns">
@@ -641,6 +642,9 @@
       <concept id="8293956702609956630" name="jetbrains.mps.baseLanguage.collections.structure.MultiForEachVariableReference" flags="nn" index="3M$PaV">
         <reference id="8293956702609966325" name="variable" index="3M$S_o" />
       </concept>
+      <concept id="1522217801069396578" name="jetbrains.mps.baseLanguage.collections.structure.FoldLeftOperation" flags="nn" index="1MD8d$">
+        <child id="1522217801069421796" name="seed" index="1MDeny" />
+      </concept>
       <concept id="1180964022718" name="jetbrains.mps.baseLanguage.collections.structure.ConcatOperation" flags="nn" index="3QWeyG" />
       <concept id="599357942184015200" name="jetbrains.mps.baseLanguage.collections.structure.AlsoSortOperation" flags="nn" index="1XvEQZ" />
     </language>
@@ -43005,6 +43009,235 @@
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
       </node>
     </node>
+    <node concept="2tJIrI" id="7FkgTXZJq7G" role="jymVt" />
+    <node concept="3clFb_" id="7FkgTXZJpC2" role="jymVt">
+      <property role="1EzhhJ" value="false" />
+      <property role="TrG5h" value="getRequiredSize" />
+      <node concept="1LlUBW" id="7FkgTXZJpC3" role="3clF45">
+        <node concept="10P55v" id="7FkgTXZJpC4" role="1Lm7xW" />
+        <node concept="10P55v" id="7FkgTXZJpC5" role="1Lm7xW" />
+      </node>
+      <node concept="3Tm1VV" id="7FkgTXZJpC6" role="1B3o_S" />
+      <node concept="2AHcQZ" id="7FkgTXZJpC7" role="2AJF6D">
+        <ref role="2AI5Lk" to="mhfm:~Nullable" resolve="Nullable" />
+      </node>
+      <node concept="2AHcQZ" id="7FkgTXZJpCA" role="2AJF6D">
+        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+      </node>
+      <node concept="3clFbS" id="7FkgTXZJpCB" role="3clF47">
+        <node concept="3cpWs8" id="7FkgTXZJqvv" role="3cqZAp">
+          <node concept="3cpWsn" id="7FkgTXZJqvw" role="3cpWs9">
+            <property role="TrG5h" value="size" />
+            <node concept="1LlUBW" id="7FkgTXZJqvo" role="1tU5fm">
+              <node concept="10P55v" id="7FkgTXZJqvt" role="1Lm7xW" />
+              <node concept="10P55v" id="7FkgTXZJqvu" role="1Lm7xW" />
+            </node>
+            <node concept="3nyPlj" id="7FkgTXZJqvx" role="33vP2m">
+              <ref role="37wK5l" node="5emhLEC$jET" resolve="getRequiredSize" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7FkgTXZJE86" role="3cqZAp">
+          <node concept="37vLTI" id="7FkgTXZJGAo" role="3clFbG">
+            <node concept="2YIFZM" id="7FkgTXZJH7G" role="37vLTx">
+              <ref role="37wK5l" to="wyt6:~Math.max(double,double):double" resolve="max" />
+              <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+              <node concept="1LFfDK" id="7FkgTXZJI22" role="37wK5m">
+                <node concept="3cmrfG" id="7FkgTXZJItZ" role="1LF_Uc">
+                  <property role="3cmrfH" value="1" />
+                </node>
+                <node concept="37vLTw" id="7FkgTXZJHz8" role="1LFl5Q">
+                  <ref role="3cqZAo" node="7FkgTXZJqvw" resolve="size" />
+                </node>
+              </node>
+              <node concept="1rXfSq" id="7FkgTXZN7Ve" role="37wK5m">
+                <ref role="37wK5l" node="7FkgTXZN2O0" resolve="getRequiredHeightForPorts" />
+              </node>
+            </node>
+            <node concept="1LFfDK" id="7FkgTXZJG5A" role="37vLTJ">
+              <node concept="3cmrfG" id="7FkgTXZJGzv" role="1LF_Uc">
+                <property role="3cmrfH" value="1" />
+              </node>
+              <node concept="37vLTw" id="7FkgTXZJE84" role="1LFl5Q">
+                <ref role="3cqZAo" node="7FkgTXZJqvw" resolve="size" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7FkgTXZJpCD" role="3cqZAp">
+          <node concept="37vLTw" id="7FkgTXZJqvy" role="3clFbG">
+            <ref role="3cqZAo" node="7FkgTXZJqvw" resolve="size" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="2tJIrI" id="7FkgTXZN1Mj" role="jymVt" />
+    <node concept="3clFb_" id="7FkgTXZN2O0" role="jymVt">
+      <property role="TrG5h" value="getRequiredHeightForPorts" />
+      <node concept="10P55v" id="7FkgTXZN6gT" role="3clF45" />
+      <node concept="3Tmbuc" id="7FkgTXZNPy8" role="1B3o_S" />
+      <node concept="3clFbS" id="7FkgTXZN2O4" role="3clF47">
+        <node concept="3cpWs8" id="7FkgTXZN5F2" role="3cqZAp">
+          <node concept="3cpWsn" id="7FkgTXZN5F3" role="3cpWs9">
+            <property role="TrG5h" value="portsHeights" />
+            <node concept="3rvAFt" id="7FkgTXZN5F4" role="1tU5fm">
+              <node concept="10P55v" id="7FkgTXZN5F5" role="3rvSg0" />
+              <node concept="10P55v" id="7FkgTXZN5F6" role="3rvQeY" />
+            </node>
+            <node concept="2ShNRf" id="7FkgTXZN5F7" role="33vP2m">
+              <node concept="3rGOSV" id="7FkgTXZN5F8" role="2ShVmc">
+                <node concept="10P55v" id="7FkgTXZN5F9" role="3rHrn6" />
+                <node concept="10P55v" id="7FkgTXZN5Fa" role="3rHtpV" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="2Gpval" id="7FkgTXZN5Fb" role="3cqZAp">
+          <node concept="2GrKxI" id="7FkgTXZN5Fc" role="2Gsz3X">
+            <property role="TrG5h" value="port" />
+          </node>
+          <node concept="3clFbS" id="7FkgTXZN5Fd" role="2LFqv$">
+            <node concept="3cpWs8" id="7FkgTXZN5Fe" role="3cqZAp">
+              <node concept="3cpWsn" id="7FkgTXZN5Ff" role="3cpWs9">
+                <property role="TrG5h" value="portsHeight" />
+                <node concept="10P55v" id="7FkgTXZN5Fg" role="1tU5fm" />
+                <node concept="3K4zz7" id="7FkgTXZN5Fh" role="33vP2m">
+                  <node concept="3b6qkQ" id="7FkgTXZN5Fi" role="3K4GZi">
+                    <property role="$nhwW" value="0.0" />
+                  </node>
+                  <node concept="2OqwBi" id="7FkgTXZN5Fj" role="3K4Cdx">
+                    <node concept="37vLTw" id="7FkgTXZN5Fk" role="2Oq$k0">
+                      <ref role="3cqZAo" node="7FkgTXZN5F3" resolve="portsHeights" />
+                    </node>
+                    <node concept="2Nt0df" id="7FkgTXZN5Fl" role="2OqNvi">
+                      <node concept="2OqwBi" id="7FkgTXZN5Fm" role="38cxEo">
+                        <node concept="2GrUjf" id="7FkgTXZN5Fn" role="2Oq$k0">
+                          <ref role="2Gs0qQ" node="7FkgTXZN5Fc" resolve="port" />
+                        </node>
+                        <node concept="liA8E" id="7FkgTXZN5Fo" role="2OqNvi">
+                          <ref role="37wK5l" to="nkm5:5elYBhUTTjT" resolve="getRelativeXNN" />
+                        </node>
+                      </node>
+                    </node>
+                  </node>
+                  <node concept="3EllGN" id="7FkgTXZN5Fp" role="3K4E3e">
+                    <node concept="37vLTw" id="7FkgTXZN5Fq" role="3ElQJh">
+                      <ref role="3cqZAo" node="7FkgTXZN5F3" resolve="portsHeights" />
+                    </node>
+                    <node concept="2OqwBi" id="7FkgTXZN5Fr" role="3ElVtu">
+                      <node concept="2GrUjf" id="7FkgTXZN5Fs" role="2Oq$k0">
+                        <ref role="2Gs0qQ" node="7FkgTXZN5Fc" resolve="port" />
+                      </node>
+                      <node concept="liA8E" id="7FkgTXZN5Ft" role="2OqNvi">
+                        <ref role="37wK5l" to="nkm5:5elYBhUTTjT" resolve="getRelativeXNN" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7FkgTXZN5Fu" role="3cqZAp">
+              <node concept="d57v9" id="7FkgTXZN5Fv" role="3clFbG">
+                <node concept="2OqwBi" id="7FkgTXZN5Fw" role="37vLTx">
+                  <node concept="2GrUjf" id="7FkgTXZN5Fx" role="2Oq$k0">
+                    <ref role="2Gs0qQ" node="7FkgTXZN5Fc" resolve="port" />
+                  </node>
+                  <node concept="liA8E" id="7FkgTXZN5Fy" role="2OqNvi">
+                    <ref role="37wK5l" to="nkm5:5NCN5Pnk34t" resolve="getHeight" />
+                  </node>
+                </node>
+                <node concept="37vLTw" id="7FkgTXZN5Fz" role="37vLTJ">
+                  <ref role="3cqZAo" node="7FkgTXZN5Ff" resolve="portsHeight" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7FkgTXZN5F$" role="3cqZAp">
+              <node concept="d57v9" id="7FkgTXZN5F_" role="3clFbG">
+                <node concept="37vLTw" id="7FkgTXZN5FA" role="37vLTJ">
+                  <ref role="3cqZAo" node="7FkgTXZN5Ff" resolve="portsHeight" />
+                </node>
+                <node concept="10M0yZ" id="7FkgTXZN5FB" role="37vLTx">
+                  <ref role="1PxDUh" to="xqcy:3FRjz$vys4Z" resolve="PortLayouter" />
+                  <ref role="3cqZAo" to="xqcy:7TThwQl_5Ux" resolve="SPACE_BETWEEN_PORTS" />
+                </node>
+              </node>
+            </node>
+            <node concept="3clFbF" id="7FkgTXZN5FC" role="3cqZAp">
+              <node concept="37vLTI" id="7FkgTXZN5FD" role="3clFbG">
+                <node concept="37vLTw" id="7FkgTXZN5FE" role="37vLTx">
+                  <ref role="3cqZAo" node="7FkgTXZN5Ff" resolve="portsHeight" />
+                </node>
+                <node concept="3EllGN" id="7FkgTXZN5FF" role="37vLTJ">
+                  <node concept="2OqwBi" id="7FkgTXZN5FG" role="3ElVtu">
+                    <node concept="2GrUjf" id="7FkgTXZN5FH" role="2Oq$k0">
+                      <ref role="2Gs0qQ" node="7FkgTXZN5Fc" resolve="port" />
+                    </node>
+                    <node concept="liA8E" id="7FkgTXZN5FI" role="2OqNvi">
+                      <ref role="37wK5l" to="nkm5:5elYBhUTTjT" resolve="getRelativeXNN" />
+                    </node>
+                  </node>
+                  <node concept="37vLTw" id="7FkgTXZN5FJ" role="3ElQJh">
+                    <ref role="3cqZAo" node="7FkgTXZN5F3" resolve="portsHeights" />
+                  </node>
+                </node>
+              </node>
+            </node>
+          </node>
+          <node concept="2OqwBi" id="7FkgTXZN5FK" role="2GsD0m">
+            <node concept="2OqwBi" id="7FkgTXZN5FL" role="2Oq$k0">
+              <node concept="37vLTw" id="7FkgTXZN5FM" role="2Oq$k0">
+                <ref role="3cqZAo" node="f4v_NgLsq3" resolve="myBox" />
+              </node>
+              <node concept="liA8E" id="7FkgTXZN5FN" role="2OqNvi">
+                <ref role="37wK5l" to="nkm5:3FRjz$v9I0d" resolve="get" />
+              </node>
+            </node>
+            <node concept="liA8E" id="7FkgTXZN5FO" role="2OqNvi">
+              <ref role="37wK5l" to="nkm5:1FlH1cK4vt8" resolve="getPorts" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7FkgTXZN6LX" role="3cqZAp">
+          <node concept="2OqwBi" id="7FkgTXZN5G4" role="3clFbG">
+            <node concept="2OqwBi" id="7FkgTXZN5G5" role="2Oq$k0">
+              <node concept="37vLTw" id="7FkgTXZN5G6" role="2Oq$k0">
+                <ref role="3cqZAo" node="7FkgTXZN5F3" resolve="portsHeights" />
+              </node>
+              <node concept="T8wYR" id="7FkgTXZN5G7" role="2OqNvi" />
+            </node>
+            <node concept="1MD8d$" id="7FkgTXZN5G8" role="2OqNvi">
+              <node concept="1bVj0M" id="7FkgTXZN5G9" role="23t8la">
+                <node concept="3clFbS" id="7FkgTXZN5Ga" role="1bW5cS">
+                  <node concept="3clFbF" id="7FkgTXZN5Gb" role="3cqZAp">
+                    <node concept="2YIFZM" id="7FkgTXZN5Gc" role="3clFbG">
+                      <ref role="1Pybhc" to="wyt6:~Math" resolve="Math" />
+                      <ref role="37wK5l" to="wyt6:~Math.max(double,double):double" resolve="max" />
+                      <node concept="37vLTw" id="7FkgTXZN5Gd" role="37wK5m">
+                        <ref role="3cqZAo" node="7FkgTXZN5Gf" resolve="s" />
+                      </node>
+                      <node concept="37vLTw" id="7FkgTXZN5Ge" role="37wK5m">
+                        <ref role="3cqZAo" node="7FkgTXZN5Gh" resolve="it" />
+                      </node>
+                    </node>
+                  </node>
+                </node>
+                <node concept="37vLTG" id="7FkgTXZN5Gf" role="1bW2Oz">
+                  <property role="TrG5h" value="s" />
+                  <node concept="10P55v" id="7FkgTXZN5Gg" role="1tU5fm" />
+                </node>
+                <node concept="Rh6nW" id="7FkgTXZN5Gh" role="1bW2Oz">
+                  <property role="TrG5h" value="it" />
+                  <node concept="2jxLKc" id="7FkgTXZN5Gi" role="1tU5fm" />
+                </node>
+              </node>
+              <node concept="3b6qkQ" id="7FkgTXZN5Gj" role="1MDeny">
+                <property role="$nhwW" value="0.0" />
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
   </node>
   <node concept="312cEu" id="f4v_NgK4Sg">
     <property role="TrG5h" value="EdgeDCell" />
@@ -89179,38 +89412,48 @@
             </node>
           </node>
         </node>
-        <node concept="3cpWs6" id="5emhLEC$mDQ" role="3cqZAp">
-          <node concept="1Ls8ON" id="5emhLEC$nx1" role="3cqZAk">
-            <node concept="3cpWs3" id="5emhLEC$rNn" role="1Lso8e">
-              <node concept="10M0yZ" id="5emhLEC$sDY" role="3uHU7w">
-                <ref role="1PxDUh" to="nkm5:27djZ8_YaUo" resolve="Box" />
-                <ref role="3cqZAo" to="nkm5:TBoO2mIKvo" resolve="PADDING" />
-              </node>
-              <node concept="1LFfDK" id="5emhLEC$q35" role="3uHU7B">
-                <node concept="3cmrfG" id="5emhLEC$qRp" role="1LF_Uc">
-                  <property role="3cmrfH" value="0" />
+        <node concept="3clFbF" id="7FkgTXZHx5i" role="3cqZAp">
+          <node concept="37vLTI" id="7FkgTXZHy5Y" role="3clFbG">
+            <node concept="37vLTw" id="7FkgTXZHx5g" role="37vLTJ">
+              <ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
+            </node>
+            <node concept="1Ls8ON" id="5emhLEC$nx1" role="37vLTx">
+              <node concept="3cpWs3" id="5emhLEC$rNn" role="1Lso8e">
+                <node concept="10M0yZ" id="5emhLEC$sDY" role="3uHU7w">
+                  <ref role="1PxDUh" to="nkm5:27djZ8_YaUo" resolve="Box" />
+                  <ref role="3cqZAo" to="nkm5:TBoO2mIKvo" resolve="PADDING" />
                 </node>
-                <node concept="37vLTw" id="5emhLEC$p6Y" role="1LFl5Q">
-                  <ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
+                <node concept="1LFfDK" id="5emhLEC$q35" role="3uHU7B">
+                  <node concept="3cmrfG" id="5emhLEC$qRp" role="1LF_Uc">
+                    <property role="3cmrfH" value="0" />
+                  </node>
+                  <node concept="37vLTw" id="5emhLEC$p6Y" role="1LFl5Q">
+                    <ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
+                  </node>
                 </node>
               </node>
-            </node>
-            <node concept="3cpWs3" id="5emhLEC$vcP" role="1Lso8e">
-              <node concept="10M0yZ" id="5emhLEC$vcQ" role="3uHU7w">
-                <ref role="1PxDUh" to="nkm5:27djZ8_YaUo" resolve="Box" />
-                <ref role="3cqZAo" to="nkm5:TBoO2mIKvo" resolve="PADDING" />
-              </node>
-              <node concept="1LFfDK" id="5emhLEC$vcR" role="3uHU7B">
-                <node concept="3cmrfG" id="5emhLEC$vcS" role="1LF_Uc">
-                  <property role="3cmrfH" value="1" />
+              <node concept="3cpWs3" id="5emhLEC$vcP" role="1Lso8e">
+                <node concept="10M0yZ" id="5emhLEC$vcQ" role="3uHU7w">
+                  <ref role="1PxDUh" to="nkm5:27djZ8_YaUo" resolve="Box" />
+                  <ref role="3cqZAo" to="nkm5:TBoO2mIKvo" resolve="PADDING" />
                 </node>
-                <node concept="37vLTw" id="5emhLEC$vcT" role="1LFl5Q">
-                  <ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
+                <node concept="1LFfDK" id="5emhLEC$vcR" role="3uHU7B">
+                  <node concept="3cmrfG" id="5emhLEC$vcS" role="1LF_Uc">
+                    <property role="3cmrfH" value="1" />
+                  </node>
+                  <node concept="37vLTw" id="5emhLEC$vcT" role="1LFl5Q">
+                    <ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
+                  </node>
                 </node>
               </node>
             </node>
           </node>
         </node>
+        <node concept="3cpWs6" id="5emhLEC$mDQ" role="3cqZAp">
+          <node concept="37vLTw" id="7FkgTXZHzRH" role="3cqZAk">
+            <ref role="3cqZAo" node="5emhLEC$map" resolve="size" />
+          </node>
+        </node>
       </node>
       <node concept="2AHcQZ" id="5emhLEC$jG0" role="2AJF6D">
         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />

From 4f34f63b96e033c19beea3d0cd7c30761e7532d5 Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Mon, 11 Jan 2016 10:56:26 +0100
Subject: [PATCH 13/15] Diagram: #1256 If the edge label has a condition, the
 thin grey line points into nowhere

---
 .../generator/template/main@generator.mps     | 568 ++++++++++--------
 .../de/itemis/mps/editor/diagram/runtime.mps  |  55 ++
 .../mps/editor/diagram/runtime/jgraph.mps     |   2 +-
 3 files changed, 367 insertions(+), 258 deletions(-)

diff --git a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
index a54ec2c8a11..95a96478b0e 100644
--- a/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
+++ b/code/plugins/sl-all/diagram/languages/de.itemis.mps.editor.diagram/generator/template/main@generator.mps
@@ -5663,33 +5663,37 @@
                           <node concept="3uibUv" id="5RIhRmzydXi" role="1tU5fm">
                             <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                           </node>
-                          <node concept="1rXfSq" id="5RIhRmzydXj" role="33vP2m">
-                            <ref role="37wK5l" node="5qgNcfDowQr" resolve="_cell_factory_method_" />
-                            <node concept="37vLTw" id="5RIhRmzydXk" role="37wK5m">
-                              <ref role="3cqZAo" node="5qgNcfDowQJ" resolve="editorContext" />
-                            </node>
-                            <node concept="37vLTw" id="5RIhRmzydXl" role="37wK5m">
-                              <ref role="3cqZAo" node="5qgNcfDowQN" resolve="node" />
-                            </node>
-                            <node concept="1ZhdrF" id="5RIhRmzydXm" role="lGtFl">
-                              <property role="2qtEX8" value="baseMethodDeclaration" />
-                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                              <node concept="3$xsQk" id="5RIhRmzydXn" role="3$ytzL">
-                                <node concept="3clFbS" id="5RIhRmzydXo" role="2VODD2">
-                                  <node concept="3clFbF" id="5RIhRmzydXp" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5RIhRmzydXq" role="3clFbG">
-                                      <node concept="1iwH7S" id="5RIhRmzydXr" role="2Oq$k0" />
-                                      <node concept="1iwH70" id="5RIhRmzydXs" role="2OqNvi">
-                                        <ref role="1iwH77" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-                                        <node concept="2OqwBi" id="5RIhRmzydXt" role="1iwH7V">
-                                          <node concept="2OqwBi" id="5RIhRmzydXu" role="2Oq$k0">
-                                            <node concept="30H73N" id="5RIhRmzydXv" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="5RIhRmzydXw" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="2qld:1Lwguv828$4" />
+                          <node concept="2YIFZM" id="7FkgTXZSuYx" role="33vP2m">
+                            <ref role="37wK5l" to="2o4v:7FkgTXZRBW6" resolve="getCellIfNotEmpty" />
+                            <ref role="1Pybhc" to="2o4v:7L$rKAVcmAh" resolve="DiagramUtil" />
+                            <node concept="1rXfSq" id="5RIhRmzydXj" role="37wK5m">
+                              <ref role="37wK5l" node="5qgNcfDowQr" resolve="_cell_factory_method_" />
+                              <node concept="37vLTw" id="5RIhRmzydXk" role="37wK5m">
+                                <ref role="3cqZAo" node="5qgNcfDowQJ" resolve="editorContext" />
+                              </node>
+                              <node concept="37vLTw" id="5RIhRmzydXl" role="37wK5m">
+                                <ref role="3cqZAo" node="5qgNcfDowQN" resolve="node" />
+                              </node>
+                              <node concept="1ZhdrF" id="5RIhRmzydXm" role="lGtFl">
+                                <property role="2qtEX8" value="baseMethodDeclaration" />
+                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                <node concept="3$xsQk" id="5RIhRmzydXn" role="3$ytzL">
+                                  <node concept="3clFbS" id="5RIhRmzydXo" role="2VODD2">
+                                    <node concept="3clFbF" id="5RIhRmzydXp" role="3cqZAp">
+                                      <node concept="2OqwBi" id="5RIhRmzydXq" role="3clFbG">
+                                        <node concept="1iwH7S" id="5RIhRmzydXr" role="2Oq$k0" />
+                                        <node concept="1iwH70" id="5RIhRmzydXs" role="2OqNvi">
+                                          <ref role="1iwH77" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+                                          <node concept="2OqwBi" id="5RIhRmzydXt" role="1iwH7V">
+                                            <node concept="2OqwBi" id="5RIhRmzydXu" role="2Oq$k0">
+                                              <node concept="30H73N" id="5RIhRmzydXv" role="2Oq$k0" />
+                                              <node concept="3TrEf2" id="5RIhRmzydXw" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="2qld:1Lwguv828$4" />
+                                              </node>
+                                            </node>
+                                            <node concept="3TrEf2" id="5RIhRmzydXx" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="tpc2:fIwV5gl" />
                                             </node>
-                                          </node>
-                                          <node concept="3TrEf2" id="5RIhRmzydXx" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="tpc2:fIwV5gl" />
                                           </node>
                                         </node>
                                       </node>
@@ -5697,25 +5701,25 @@
                                   </node>
                                 </node>
                               </node>
-                            </node>
-                            <node concept="1W57fq" id="5RIhRmzydXy" role="lGtFl">
-                              <node concept="3IZrLx" id="5RIhRmzydXz" role="3IZSJc">
-                                <node concept="3clFbS" id="5RIhRmzydX$" role="2VODD2">
-                                  <node concept="3clFbF" id="5RIhRmzydX_" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5RIhRmzydXA" role="3clFbG">
-                                      <node concept="2OqwBi" id="5RIhRmzydXB" role="2Oq$k0">
-                                        <node concept="30H73N" id="5RIhRmzydXC" role="2Oq$k0" />
-                                        <node concept="3TrEf2" id="5RIhRmzydXD" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="2qld:1Lwguv828$4" />
+                              <node concept="1W57fq" id="5RIhRmzydXy" role="lGtFl">
+                                <node concept="3IZrLx" id="5RIhRmzydXz" role="3IZSJc">
+                                  <node concept="3clFbS" id="5RIhRmzydX$" role="2VODD2">
+                                    <node concept="3clFbF" id="5RIhRmzydX_" role="3cqZAp">
+                                      <node concept="2OqwBi" id="5RIhRmzydXA" role="3clFbG">
+                                        <node concept="2OqwBi" id="5RIhRmzydXB" role="2Oq$k0">
+                                          <node concept="30H73N" id="5RIhRmzydXC" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="5RIhRmzydXD" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="2qld:1Lwguv828$4" />
+                                          </node>
                                         </node>
+                                        <node concept="3x8VRR" id="5RIhRmzydXE" role="2OqNvi" />
                                       </node>
-                                      <node concept="3x8VRR" id="5RIhRmzydXE" role="2OqNvi" />
                                     </node>
                                   </node>
                                 </node>
-                              </node>
-                              <node concept="gft3U" id="5RIhRmzydXF" role="UU_$l">
-                                <node concept="10Nm6u" id="5RIhRmzydXG" role="gfFT$" />
+                                <node concept="gft3U" id="5RIhRmzydXF" role="UU_$l">
+                                  <node concept="10Nm6u" id="5RIhRmzydXG" role="gfFT$" />
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -5727,69 +5731,73 @@
                           <node concept="3uibUv" id="5RIhRmzydXJ" role="1tU5fm">
                             <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                           </node>
-                          <node concept="1rXfSq" id="5RIhRmzydXK" role="33vP2m">
-                            <ref role="37wK5l" node="5qgNcfDowQr" resolve="_cell_factory_method_" />
-                            <node concept="37vLTw" id="5RIhRmzydXL" role="37wK5m">
-                              <ref role="3cqZAo" node="5qgNcfDowQJ" resolve="editorContext" />
-                            </node>
-                            <node concept="37vLTw" id="5RIhRmzydXM" role="37wK5m">
-                              <ref role="3cqZAo" node="5qgNcfDowQN" resolve="node" />
-                            </node>
-                            <node concept="1ZhdrF" id="5RIhRmzydXN" role="lGtFl">
-                              <property role="2qtEX8" value="baseMethodDeclaration" />
-                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                              <node concept="3$xsQk" id="5RIhRmzydXO" role="3$ytzL">
-                                <node concept="3clFbS" id="5RIhRmzydXP" role="2VODD2">
-                                  <node concept="3clFbF" id="5RIhRmzydXQ" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5RIhRmzydXR" role="3clFbG">
-                                      <node concept="1iwH7S" id="5RIhRmzydXS" role="2Oq$k0" />
-                                      <node concept="1iwH70" id="5RIhRmzydXT" role="2OqNvi">
-                                        <ref role="1iwH77" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-                                        <node concept="2OqwBi" id="5RIhRmzydXU" role="1iwH7V">
-                                          <node concept="2OqwBi" id="5RIhRmzydXV" role="2Oq$k0">
-                                            <node concept="2OqwBi" id="5RIhRmzydXW" role="2Oq$k0">
-                                              <node concept="30H73N" id="5RIhRmzydXX" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="5RIhRmzydXY" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="2qld:7sHDEc2Si0$" />
+                          <node concept="2YIFZM" id="7FkgTXZSwD4" role="33vP2m">
+                            <ref role="37wK5l" to="2o4v:7FkgTXZRBW6" resolve="getCellIfNotEmpty" />
+                            <ref role="1Pybhc" to="2o4v:7L$rKAVcmAh" resolve="DiagramUtil" />
+                            <node concept="1rXfSq" id="5RIhRmzydXK" role="37wK5m">
+                              <ref role="37wK5l" node="5qgNcfDowQr" resolve="_cell_factory_method_" />
+                              <node concept="37vLTw" id="5RIhRmzydXL" role="37wK5m">
+                                <ref role="3cqZAo" node="5qgNcfDowQJ" resolve="editorContext" />
+                              </node>
+                              <node concept="37vLTw" id="5RIhRmzydXM" role="37wK5m">
+                                <ref role="3cqZAo" node="5qgNcfDowQN" resolve="node" />
+                              </node>
+                              <node concept="1ZhdrF" id="5RIhRmzydXN" role="lGtFl">
+                                <property role="2qtEX8" value="baseMethodDeclaration" />
+                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                <node concept="3$xsQk" id="5RIhRmzydXO" role="3$ytzL">
+                                  <node concept="3clFbS" id="5RIhRmzydXP" role="2VODD2">
+                                    <node concept="3clFbF" id="5RIhRmzydXQ" role="3cqZAp">
+                                      <node concept="2OqwBi" id="5RIhRmzydXR" role="3clFbG">
+                                        <node concept="1iwH7S" id="5RIhRmzydXS" role="2Oq$k0" />
+                                        <node concept="1iwH70" id="5RIhRmzydXT" role="2OqNvi">
+                                          <ref role="1iwH77" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+                                          <node concept="2OqwBi" id="5RIhRmzydXU" role="1iwH7V">
+                                            <node concept="2OqwBi" id="5RIhRmzydXV" role="2Oq$k0">
+                                              <node concept="2OqwBi" id="5RIhRmzydXW" role="2Oq$k0">
+                                                <node concept="30H73N" id="5RIhRmzydXX" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="5RIhRmzydXY" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="2qld:7sHDEc2Si0$" />
+                                                </node>
+                                              </node>
+                                              <node concept="3TrEf2" id="5RIhRmzydXZ" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
                                               </node>
                                             </node>
-                                            <node concept="3TrEf2" id="5RIhRmzydXZ" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
+                                            <node concept="3TrEf2" id="5RIhRmzydY0" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="tpc2:fIwV5gl" />
                                             </node>
                                           </node>
-                                          <node concept="3TrEf2" id="5RIhRmzydY0" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="tpc2:fIwV5gl" />
-                                          </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                            </node>
-                            <node concept="1W57fq" id="5RIhRmzydY1" role="lGtFl">
-                              <node concept="3IZrLx" id="5RIhRmzydY2" role="3IZSJc">
-                                <node concept="3clFbS" id="5RIhRmzydY3" role="2VODD2">
-                                  <node concept="3clFbF" id="5RIhRmzydY4" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5RIhRmzydY5" role="3clFbG">
-                                      <node concept="2OqwBi" id="5RIhRmzydY6" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="5RIhRmzydY7" role="2Oq$k0">
-                                          <node concept="30H73N" id="5RIhRmzydY8" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="5RIhRmzydY9" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="2qld:7sHDEc2Si0$" />
+                              <node concept="1W57fq" id="5RIhRmzydY1" role="lGtFl">
+                                <node concept="3IZrLx" id="5RIhRmzydY2" role="3IZSJc">
+                                  <node concept="3clFbS" id="5RIhRmzydY3" role="2VODD2">
+                                    <node concept="3clFbF" id="5RIhRmzydY4" role="3cqZAp">
+                                      <node concept="2OqwBi" id="5RIhRmzydY5" role="3clFbG">
+                                        <node concept="2OqwBi" id="5RIhRmzydY6" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="5RIhRmzydY7" role="2Oq$k0">
+                                            <node concept="30H73N" id="5RIhRmzydY8" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="5RIhRmzydY9" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="2qld:7sHDEc2Si0$" />
+                                            </node>
+                                          </node>
+                                          <node concept="3TrEf2" id="5RIhRmzydYa" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
                                           </node>
                                         </node>
-                                        <node concept="3TrEf2" id="5RIhRmzydYa" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
-                                        </node>
+                                        <node concept="3x8VRR" id="5RIhRmzydYb" role="2OqNvi" />
                                       </node>
-                                      <node concept="3x8VRR" id="5RIhRmzydYb" role="2OqNvi" />
                                     </node>
                                   </node>
                                 </node>
-                              </node>
-                              <node concept="gft3U" id="5RIhRmzydYc" role="UU_$l">
-                                <node concept="10Nm6u" id="5RIhRmzydYd" role="gfFT$" />
+                                <node concept="gft3U" id="5RIhRmzydYc" role="UU_$l">
+                                  <node concept="10Nm6u" id="5RIhRmzydYd" role="gfFT$" />
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -5801,69 +5809,73 @@
                           <node concept="3uibUv" id="5RIhRmzydYg" role="1tU5fm">
                             <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                           </node>
-                          <node concept="1rXfSq" id="5RIhRmzydYh" role="33vP2m">
-                            <ref role="37wK5l" node="5qgNcfDowQr" resolve="_cell_factory_method_" />
-                            <node concept="37vLTw" id="5RIhRmzydYi" role="37wK5m">
-                              <ref role="3cqZAo" node="5qgNcfDowQJ" resolve="editorContext" />
-                            </node>
-                            <node concept="37vLTw" id="5RIhRmzydYj" role="37wK5m">
-                              <ref role="3cqZAo" node="5qgNcfDowQN" resolve="node" />
-                            </node>
-                            <node concept="1ZhdrF" id="5RIhRmzydYk" role="lGtFl">
-                              <property role="2qtEX8" value="baseMethodDeclaration" />
-                              <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
-                              <node concept="3$xsQk" id="5RIhRmzydYl" role="3$ytzL">
-                                <node concept="3clFbS" id="5RIhRmzydYm" role="2VODD2">
-                                  <node concept="3clFbF" id="5RIhRmzydYn" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5RIhRmzydYo" role="3clFbG">
-                                      <node concept="1iwH7S" id="5RIhRmzydYp" role="2Oq$k0" />
-                                      <node concept="1iwH70" id="5RIhRmzydYq" role="2OqNvi">
-                                        <ref role="1iwH77" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
-                                        <node concept="2OqwBi" id="5RIhRmzydYr" role="1iwH7V">
-                                          <node concept="2OqwBi" id="5RIhRmzydYs" role="2Oq$k0">
-                                            <node concept="2OqwBi" id="5RIhRmzydYt" role="2Oq$k0">
-                                              <node concept="30H73N" id="5RIhRmzydYu" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="5RIhRmzydYv" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="2qld:7sHDEc2Si0M" />
+                          <node concept="2YIFZM" id="7FkgTXZSymP" role="33vP2m">
+                            <ref role="37wK5l" to="2o4v:7FkgTXZRBW6" resolve="getCellIfNotEmpty" />
+                            <ref role="1Pybhc" to="2o4v:7L$rKAVcmAh" resolve="DiagramUtil" />
+                            <node concept="1rXfSq" id="5RIhRmzydYh" role="37wK5m">
+                              <ref role="37wK5l" node="5qgNcfDowQr" resolve="_cell_factory_method_" />
+                              <node concept="37vLTw" id="5RIhRmzydYi" role="37wK5m">
+                                <ref role="3cqZAo" node="5qgNcfDowQJ" resolve="editorContext" />
+                              </node>
+                              <node concept="37vLTw" id="5RIhRmzydYj" role="37wK5m">
+                                <ref role="3cqZAo" node="5qgNcfDowQN" resolve="node" />
+                              </node>
+                              <node concept="1ZhdrF" id="5RIhRmzydYk" role="lGtFl">
+                                <property role="2qtEX8" value="baseMethodDeclaration" />
+                                <property role="P3scX" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1204053956946/1068499141037" />
+                                <node concept="3$xsQk" id="5RIhRmzydYl" role="3$ytzL">
+                                  <node concept="3clFbS" id="5RIhRmzydYm" role="2VODD2">
+                                    <node concept="3clFbF" id="5RIhRmzydYn" role="3cqZAp">
+                                      <node concept="2OqwBi" id="5RIhRmzydYo" role="3clFbG">
+                                        <node concept="1iwH7S" id="5RIhRmzydYp" role="2Oq$k0" />
+                                        <node concept="1iwH70" id="5RIhRmzydYq" role="2OqNvi">
+                                          <ref role="1iwH77" to="tpc3:hG092h3" resolve="cellFactoryMethod" />
+                                          <node concept="2OqwBi" id="5RIhRmzydYr" role="1iwH7V">
+                                            <node concept="2OqwBi" id="5RIhRmzydYs" role="2Oq$k0">
+                                              <node concept="2OqwBi" id="5RIhRmzydYt" role="2Oq$k0">
+                                                <node concept="30H73N" id="5RIhRmzydYu" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="5RIhRmzydYv" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="2qld:7sHDEc2Si0M" />
+                                                </node>
+                                              </node>
+                                              <node concept="3TrEf2" id="5RIhRmzydYw" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
                                               </node>
                                             </node>
-                                            <node concept="3TrEf2" id="5RIhRmzydYw" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
+                                            <node concept="3TrEf2" id="5RIhRmzydYx" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="tpc2:fIwV5gl" />
                                             </node>
                                           </node>
-                                          <node concept="3TrEf2" id="5RIhRmzydYx" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="tpc2:fIwV5gl" />
-                                          </node>
                                         </node>
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
-                            </node>
-                            <node concept="1W57fq" id="5RIhRmzydYy" role="lGtFl">
-                              <node concept="3IZrLx" id="5RIhRmzydYz" role="3IZSJc">
-                                <node concept="3clFbS" id="5RIhRmzydY$" role="2VODD2">
-                                  <node concept="3clFbF" id="5RIhRmzydY_" role="3cqZAp">
-                                    <node concept="2OqwBi" id="5RIhRmzydYA" role="3clFbG">
-                                      <node concept="2OqwBi" id="5RIhRmzydYB" role="2Oq$k0">
-                                        <node concept="2OqwBi" id="5RIhRmzydYC" role="2Oq$k0">
-                                          <node concept="30H73N" id="5RIhRmzydYD" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="5RIhRmzydYE" role="2OqNvi">
-                                            <ref role="3Tt5mk" to="2qld:7sHDEc2Si0M" />
+                              <node concept="1W57fq" id="5RIhRmzydYy" role="lGtFl">
+                                <node concept="3IZrLx" id="5RIhRmzydYz" role="3IZSJc">
+                                  <node concept="3clFbS" id="5RIhRmzydY$" role="2VODD2">
+                                    <node concept="3clFbF" id="5RIhRmzydY_" role="3cqZAp">
+                                      <node concept="2OqwBi" id="5RIhRmzydYA" role="3clFbG">
+                                        <node concept="2OqwBi" id="5RIhRmzydYB" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="5RIhRmzydYC" role="2Oq$k0">
+                                            <node concept="30H73N" id="5RIhRmzydYD" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="5RIhRmzydYE" role="2OqNvi">
+                                              <ref role="3Tt5mk" to="2qld:7sHDEc2Si0M" />
+                                            </node>
+                                          </node>
+                                          <node concept="3TrEf2" id="5RIhRmzydYF" role="2OqNvi">
+                                            <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
                                           </node>
                                         </node>
-                                        <node concept="3TrEf2" id="5RIhRmzydYF" role="2OqNvi">
-                                          <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
-                                        </node>
+                                        <node concept="3x8VRR" id="5RIhRmzydYG" role="2OqNvi" />
                                       </node>
-                                      <node concept="3x8VRR" id="5RIhRmzydYG" role="2OqNvi" />
                                     </node>
                                   </node>
                                 </node>
-                              </node>
-                              <node concept="gft3U" id="5RIhRmzydYH" role="UU_$l">
-                                <node concept="10Nm6u" id="5RIhRmzydYI" role="gfFT$" />
+                                <node concept="gft3U" id="5RIhRmzydYH" role="UU_$l">
+                                  <node concept="10Nm6u" id="5RIhRmzydYI" role="gfFT$" />
+                                </node>
                               </node>
                             </node>
                           </node>
@@ -8970,30 +8982,34 @@
                                 <node concept="3uibUv" id="4s$H8QXmi2f" role="1tU5fm">
                                   <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                                 </node>
-                                <node concept="10Nm6u" id="4s$H8QXmi2g" role="33vP2m">
-                                  <node concept="5jKBG" id="4s$H8QXmi2h" role="lGtFl">
-                                    <ref role="v9R2y" node="5RIhRmzl00J" resolve="reduce_InlineEditorComponent_Call" />
-                                    <node concept="1UUvTB" id="4s$H8QXmi2i" role="v9R3O">
-                                      <node concept="1UU6SM" id="4s$H8QXmi2j" role="1UU7Ll">
-                                        <node concept="3clFbS" id="4s$H8QXmi2k" role="2VODD2">
-                                          <node concept="3clFbF" id="4s$H8QXmi2l" role="3cqZAp">
-                                            <node concept="2OqwBi" id="4s$H8QXmi2m" role="3clFbG">
-                                              <node concept="30H73N" id="4s$H8QXmi2n" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="4s$H8QXmi2o" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="2qld:6Q0ZYbv$Dig" />
+                                <node concept="2YIFZM" id="7FkgTXZS$zR" role="33vP2m">
+                                  <ref role="37wK5l" to="2o4v:7FkgTXZRBW6" resolve="getCellIfNotEmpty" />
+                                  <ref role="1Pybhc" to="2o4v:7L$rKAVcmAh" resolve="DiagramUtil" />
+                                  <node concept="10Nm6u" id="4s$H8QXmi2g" role="37wK5m">
+                                    <node concept="5jKBG" id="4s$H8QXmi2h" role="lGtFl">
+                                      <ref role="v9R2y" node="5RIhRmzl00J" resolve="reduce_InlineEditorComponent_Call" />
+                                      <node concept="1UUvTB" id="4s$H8QXmi2i" role="v9R3O">
+                                        <node concept="1UU6SM" id="4s$H8QXmi2j" role="1UU7Ll">
+                                          <node concept="3clFbS" id="4s$H8QXmi2k" role="2VODD2">
+                                            <node concept="3clFbF" id="4s$H8QXmi2l" role="3cqZAp">
+                                              <node concept="2OqwBi" id="4s$H8QXmi2m" role="3clFbG">
+                                                <node concept="30H73N" id="4s$H8QXmi2n" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="4s$H8QXmi2o" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="2qld:6Q0ZYbv$Dig" />
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                    </node>
-                                    <node concept="3NFfHV" id="4s$H8QXmi2p" role="5jGum">
-                                      <node concept="3clFbS" id="4s$H8QXmi2q" role="2VODD2">
-                                        <node concept="3clFbF" id="4s$H8QXmi2r" role="3cqZAp">
-                                          <node concept="2OqwBi" id="4s$H8QXmi2s" role="3clFbG">
-                                            <node concept="30H73N" id="4s$H8QXmi2t" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="6clvLV1u1RH" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="2qld:1Lwguv828$4" />
+                                      <node concept="3NFfHV" id="4s$H8QXmi2p" role="5jGum">
+                                        <node concept="3clFbS" id="4s$H8QXmi2q" role="2VODD2">
+                                          <node concept="3clFbF" id="4s$H8QXmi2r" role="3cqZAp">
+                                            <node concept="2OqwBi" id="4s$H8QXmi2s" role="3clFbG">
+                                              <node concept="30H73N" id="4s$H8QXmi2t" role="2Oq$k0" />
+                                              <node concept="3TrEf2" id="6clvLV1u1RH" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="2qld:1Lwguv828$4" />
+                                              </node>
                                             </node>
                                           </node>
                                         </node>
@@ -9027,35 +9043,39 @@
                                 <node concept="3uibUv" id="4s$H8QXmkhF" role="1tU5fm">
                                   <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                                 </node>
-                                <node concept="10Nm6u" id="4s$H8QXmkhG" role="33vP2m">
-                                  <node concept="5jKBG" id="4s$H8QXmkhH" role="lGtFl">
-                                    <ref role="v9R2y" node="5RIhRmzl00J" resolve="reduce_InlineEditorComponent_Call" />
-                                    <node concept="1UUvTB" id="4s$H8QXmkhI" role="v9R3O">
-                                      <node concept="1UU6SM" id="4s$H8QXmkhJ" role="1UU7Ll">
-                                        <node concept="3clFbS" id="4s$H8QXmkhK" role="2VODD2">
-                                          <node concept="3clFbF" id="4s$H8QXmkhL" role="3cqZAp">
-                                            <node concept="2OqwBi" id="4s$H8QXmkhM" role="3clFbG">
-                                              <node concept="30H73N" id="4s$H8QXmkhN" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="4s$H8QXmkhO" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="2qld:6Q0ZYbv$Dig" />
+                                <node concept="2YIFZM" id="7FkgTXZS$Mr" role="33vP2m">
+                                  <ref role="37wK5l" to="2o4v:7FkgTXZRBW6" resolve="getCellIfNotEmpty" />
+                                  <ref role="1Pybhc" to="2o4v:7L$rKAVcmAh" resolve="DiagramUtil" />
+                                  <node concept="10Nm6u" id="4s$H8QXmkhG" role="37wK5m">
+                                    <node concept="5jKBG" id="4s$H8QXmkhH" role="lGtFl">
+                                      <ref role="v9R2y" node="5RIhRmzl00J" resolve="reduce_InlineEditorComponent_Call" />
+                                      <node concept="1UUvTB" id="4s$H8QXmkhI" role="v9R3O">
+                                        <node concept="1UU6SM" id="4s$H8QXmkhJ" role="1UU7Ll">
+                                          <node concept="3clFbS" id="4s$H8QXmkhK" role="2VODD2">
+                                            <node concept="3clFbF" id="4s$H8QXmkhL" role="3cqZAp">
+                                              <node concept="2OqwBi" id="4s$H8QXmkhM" role="3clFbG">
+                                                <node concept="30H73N" id="4s$H8QXmkhN" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="4s$H8QXmkhO" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="2qld:6Q0ZYbv$Dig" />
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                    </node>
-                                    <node concept="3NFfHV" id="4s$H8QXmkhP" role="5jGum">
-                                      <node concept="3clFbS" id="4s$H8QXmkhQ" role="2VODD2">
-                                        <node concept="3clFbF" id="4s$H8QXmkhR" role="3cqZAp">
-                                          <node concept="2OqwBi" id="6clvLV1u53m" role="3clFbG">
-                                            <node concept="2OqwBi" id="4s$H8QXmkhS" role="2Oq$k0">
-                                              <node concept="30H73N" id="4s$H8QXmkhT" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="6clvLV1u4E1" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="2qld:7sHDEc2Si0$" />
+                                      <node concept="3NFfHV" id="4s$H8QXmkhP" role="5jGum">
+                                        <node concept="3clFbS" id="4s$H8QXmkhQ" role="2VODD2">
+                                          <node concept="3clFbF" id="4s$H8QXmkhR" role="3cqZAp">
+                                            <node concept="2OqwBi" id="6clvLV1u53m" role="3clFbG">
+                                              <node concept="2OqwBi" id="4s$H8QXmkhS" role="2Oq$k0">
+                                                <node concept="30H73N" id="4s$H8QXmkhT" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="6clvLV1u4E1" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="2qld:7sHDEc2Si0$" />
+                                                </node>
+                                              </node>
+                                              <node concept="3TrEf2" id="6clvLV1u5ni" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
                                               </node>
-                                            </node>
-                                            <node concept="3TrEf2" id="6clvLV1u5ni" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
                                             </node>
                                           </node>
                                         </node>
@@ -9094,35 +9114,39 @@
                                 <node concept="3uibUv" id="4s$H8QXmkS1" role="1tU5fm">
                                   <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
                                 </node>
-                                <node concept="10Nm6u" id="4s$H8QXmkS2" role="33vP2m">
-                                  <node concept="5jKBG" id="4s$H8QXmkS3" role="lGtFl">
-                                    <ref role="v9R2y" node="5RIhRmzl00J" resolve="reduce_InlineEditorComponent_Call" />
-                                    <node concept="1UUvTB" id="4s$H8QXmkS4" role="v9R3O">
-                                      <node concept="1UU6SM" id="4s$H8QXmkS5" role="1UU7Ll">
-                                        <node concept="3clFbS" id="4s$H8QXmkS6" role="2VODD2">
-                                          <node concept="3clFbF" id="4s$H8QXmkS7" role="3cqZAp">
-                                            <node concept="2OqwBi" id="4s$H8QXmkS8" role="3clFbG">
-                                              <node concept="30H73N" id="4s$H8QXmkS9" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="4s$H8QXmkSa" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="2qld:6Q0ZYbv$Dig" />
+                                <node concept="2YIFZM" id="7FkgTXZS_36" role="33vP2m">
+                                  <ref role="37wK5l" to="2o4v:7FkgTXZRBW6" resolve="getCellIfNotEmpty" />
+                                  <ref role="1Pybhc" to="2o4v:7L$rKAVcmAh" resolve="DiagramUtil" />
+                                  <node concept="10Nm6u" id="4s$H8QXmkS2" role="37wK5m">
+                                    <node concept="5jKBG" id="4s$H8QXmkS3" role="lGtFl">
+                                      <ref role="v9R2y" node="5RIhRmzl00J" resolve="reduce_InlineEditorComponent_Call" />
+                                      <node concept="1UUvTB" id="4s$H8QXmkS4" role="v9R3O">
+                                        <node concept="1UU6SM" id="4s$H8QXmkS5" role="1UU7Ll">
+                                          <node concept="3clFbS" id="4s$H8QXmkS6" role="2VODD2">
+                                            <node concept="3clFbF" id="4s$H8QXmkS7" role="3cqZAp">
+                                              <node concept="2OqwBi" id="4s$H8QXmkS8" role="3clFbG">
+                                                <node concept="30H73N" id="4s$H8QXmkS9" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="4s$H8QXmkSa" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="2qld:6Q0ZYbv$Dig" />
+                                                </node>
                                               </node>
                                             </node>
                                           </node>
                                         </node>
                                       </node>
-                                    </node>
-                                    <node concept="3NFfHV" id="4s$H8QXmkSb" role="5jGum">
-                                      <node concept="3clFbS" id="4s$H8QXmkSc" role="2VODD2">
-                                        <node concept="3clFbF" id="4s$H8QXmkSd" role="3cqZAp">
-                                          <node concept="2OqwBi" id="6clvLV1u7Aw" role="3clFbG">
-                                            <node concept="2OqwBi" id="4s$H8QXmkSe" role="2Oq$k0">
-                                              <node concept="30H73N" id="4s$H8QXmkSf" role="2Oq$k0" />
-                                              <node concept="3TrEf2" id="6clvLV1u7gb" role="2OqNvi">
-                                                <ref role="3Tt5mk" to="2qld:7sHDEc2Si0M" />
+                                      <node concept="3NFfHV" id="4s$H8QXmkSb" role="5jGum">
+                                        <node concept="3clFbS" id="4s$H8QXmkSc" role="2VODD2">
+                                          <node concept="3clFbF" id="4s$H8QXmkSd" role="3cqZAp">
+                                            <node concept="2OqwBi" id="6clvLV1u7Aw" role="3clFbG">
+                                              <node concept="2OqwBi" id="4s$H8QXmkSe" role="2Oq$k0">
+                                                <node concept="30H73N" id="4s$H8QXmkSf" role="2Oq$k0" />
+                                                <node concept="3TrEf2" id="6clvLV1u7gb" role="2OqNvi">
+                                                  <ref role="3Tt5mk" to="2qld:7sHDEc2Si0M" />
+                                                </node>
+                                              </node>
+                                              <node concept="3TrEf2" id="6clvLV1u7Us" role="2OqNvi">
+                                                <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
                                               </node>
-                                            </node>
-                                            <node concept="3TrEf2" id="6clvLV1u7Us" role="2OqNvi">
-                                              <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
                                             </node>
                                           </node>
                                         </node>
@@ -9154,100 +9178,130 @@
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbF" id="4s$H8QXn6w8" role="3cqZAp">
-                              <node concept="2OqwBi" id="4s$H8QXn6E8" role="3clFbG">
-                                <node concept="37vLTw" id="4s$H8QXn6w7" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5BPceOKawro" resolve="editorCell" />
-                                </node>
-                                <node concept="liA8E" id="4s$H8QXn8bR" role="2OqNvi">
-                                  <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell):void" resolve="addEditorCell" />
-                                  <node concept="37vLTw" id="4s$H8QXn8d3" role="37wK5m">
-                                    <ref role="3cqZAo" node="4s$H8QXmi2e" resolve="labelCell" />
+                            <node concept="3clFbJ" id="7FkgTXZSOxx" role="3cqZAp">
+                              <node concept="3clFbS" id="7FkgTXZSOxz" role="3clFbx">
+                                <node concept="3clFbF" id="4s$H8QXn6w8" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4s$H8QXn6E8" role="3clFbG">
+                                    <node concept="37vLTw" id="4s$H8QXn6w7" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="5BPceOKawro" resolve="editorCell" />
+                                    </node>
+                                    <node concept="liA8E" id="4s$H8QXn8bR" role="2OqNvi">
+                                      <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell):void" resolve="addEditorCell" />
+                                      <node concept="37vLTw" id="4s$H8QXn8d3" role="37wK5m">
+                                        <ref role="3cqZAo" node="4s$H8QXmi2e" resolve="labelCell" />
+                                      </node>
+                                    </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="1W57fq" id="4s$H8QXnhl_" role="lGtFl">
-                                <node concept="3IZrLx" id="4s$H8QXnhlB" role="3IZSJc">
-                                  <node concept="3clFbS" id="4s$H8QXnhlD" role="2VODD2">
-                                    <node concept="3clFbF" id="4s$H8QXnhxy" role="3cqZAp">
-                                      <node concept="2OqwBi" id="4s$H8QXnikr" role="3clFbG">
-                                        <node concept="2OqwBi" id="4s$H8QXnhAI" role="2Oq$k0">
-                                          <node concept="30H73N" id="4s$H8QXnhxx" role="2Oq$k0" />
-                                          <node concept="3TrEf2" id="6clvLV1u8jV" role="2OqNvi">
+                              <node concept="3y3z36" id="7FkgTXZSQme" role="3clFbw">
+                                <node concept="10Nm6u" id="7FkgTXZSQou" role="3uHU7w" />
+                                <node concept="37vLTw" id="7FkgTXZSQj9" role="3uHU7B">
+                                  <ref role="3cqZAo" node="4s$H8QXmi2e" resolve="labelCell" />
+                                </node>
+                              </node>
+                              <node concept="1W57fq" id="7FkgTXZSTff" role="lGtFl">
+                                <node concept="3IZrLx" id="7FkgTXZSTfh" role="3IZSJc">
+                                  <node concept="3clFbS" id="7FkgTXZSTfj" role="2VODD2">
+                                    <node concept="3clFbF" id="7FkgTXZSTkw" role="3cqZAp">
+                                      <node concept="2OqwBi" id="7FkgTXZSTky" role="3clFbG">
+                                        <node concept="2OqwBi" id="7FkgTXZSTkz" role="2Oq$k0">
+                                          <node concept="30H73N" id="7FkgTXZSTk$" role="2Oq$k0" />
+                                          <node concept="3TrEf2" id="7FkgTXZSTk_" role="2OqNvi">
                                             <ref role="3Tt5mk" to="2qld:1Lwguv828$4" />
                                           </node>
                                         </node>
-                                        <node concept="3x8VRR" id="4s$H8QXniCT" role="2OqNvi" />
+                                        <node concept="3x8VRR" id="7FkgTXZSTkA" role="2OqNvi" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbF" id="4s$H8QXn8gs" role="3cqZAp">
-                              <node concept="2OqwBi" id="4s$H8QXn8gt" role="3clFbG">
-                                <node concept="37vLTw" id="4s$H8QXn8gu" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5BPceOKawro" resolve="editorCell" />
-                                </node>
-                                <node concept="liA8E" id="4s$H8QXn8gv" role="2OqNvi">
-                                  <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell):void" resolve="addEditorCell" />
-                                  <node concept="37vLTw" id="4s$H8QXnhgF" role="37wK5m">
-                                    <ref role="3cqZAo" node="4s$H8QXmkhE" resolve="startRoleCell" />
+                            <node concept="3clFbJ" id="7FkgTXZSVgo" role="3cqZAp">
+                              <node concept="3clFbS" id="7FkgTXZSVgq" role="3clFbx">
+                                <node concept="3clFbF" id="4s$H8QXn8gs" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4s$H8QXn8gt" role="3clFbG">
+                                    <node concept="37vLTw" id="4s$H8QXn8gu" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="5BPceOKawro" resolve="editorCell" />
+                                    </node>
+                                    <node concept="liA8E" id="4s$H8QXn8gv" role="2OqNvi">
+                                      <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell):void" resolve="addEditorCell" />
+                                      <node concept="37vLTw" id="4s$H8QXnhgF" role="37wK5m">
+                                        <ref role="3cqZAo" node="4s$H8QXmkhE" resolve="startRoleCell" />
+                                      </node>
+                                    </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="1W57fq" id="4s$H8QXniSF" role="lGtFl">
-                                <node concept="3IZrLx" id="4s$H8QXniSH" role="3IZSJc">
-                                  <node concept="3clFbS" id="4s$H8QXniSJ" role="2VODD2">
-                                    <node concept="3clFbF" id="4s$H8QXnj4C" role="3cqZAp">
-                                      <node concept="2OqwBi" id="4s$H8QXnk23" role="3clFbG">
-                                        <node concept="2OqwBi" id="6clvLV1u9p$" role="2Oq$k0">
-                                          <node concept="2OqwBi" id="4s$H8QXnj9O" role="2Oq$k0">
-                                            <node concept="30H73N" id="4s$H8QXnj4B" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="6clvLV1u8QH" role="2OqNvi">
+                              <node concept="3y3z36" id="7FkgTXZSX71" role="3clFbw">
+                                <node concept="10Nm6u" id="7FkgTXZSX9h" role="3uHU7w" />
+                                <node concept="37vLTw" id="7FkgTXZSX3W" role="3uHU7B">
+                                  <ref role="3cqZAo" node="4s$H8QXmkhE" resolve="startRoleCell" />
+                                </node>
+                              </node>
+                              <node concept="1W57fq" id="7FkgTXZSZ3I" role="lGtFl">
+                                <node concept="3IZrLx" id="7FkgTXZSZ3K" role="3IZSJc">
+                                  <node concept="3clFbS" id="7FkgTXZSZ3M" role="2VODD2">
+                                    <node concept="3clFbF" id="7FkgTXZT04b" role="3cqZAp">
+                                      <node concept="2OqwBi" id="7FkgTXZT04d" role="3clFbG">
+                                        <node concept="2OqwBi" id="7FkgTXZT04e" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="7FkgTXZT04f" role="2Oq$k0">
+                                            <node concept="30H73N" id="7FkgTXZT04g" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="7FkgTXZT04h" role="2OqNvi">
                                               <ref role="3Tt5mk" to="2qld:7sHDEc2Si0$" />
                                             </node>
                                           </node>
-                                          <node concept="3TrEf2" id="6clvLV1u9QI" role="2OqNvi">
+                                          <node concept="3TrEf2" id="7FkgTXZT04i" role="2OqNvi">
                                             <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
                                           </node>
                                         </node>
-                                        <node concept="3x8VRR" id="4s$H8QXnkmx" role="2OqNvi" />
+                                        <node concept="3x8VRR" id="7FkgTXZT04j" role="2OqNvi" />
                                       </node>
                                     </node>
                                   </node>
                                 </node>
                               </node>
                             </node>
-                            <node concept="3clFbF" id="4s$H8QXn8VP" role="3cqZAp">
-                              <node concept="2OqwBi" id="4s$H8QXn8VQ" role="3clFbG">
-                                <node concept="37vLTw" id="4s$H8QXn8VR" role="2Oq$k0">
-                                  <ref role="3cqZAo" node="5BPceOKawro" resolve="editorCell" />
-                                </node>
-                                <node concept="liA8E" id="4s$H8QXn8VS" role="2OqNvi">
-                                  <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell):void" resolve="addEditorCell" />
-                                  <node concept="37vLTw" id="4s$H8QXnhin" role="37wK5m">
-                                    <ref role="3cqZAo" node="4s$H8QXmkS0" resolve="endRoleCell" />
+                            <node concept="3clFbJ" id="7FkgTXZT1Qs" role="3cqZAp">
+                              <node concept="3clFbS" id="7FkgTXZT1Qu" role="3clFbx">
+                                <node concept="3clFbF" id="4s$H8QXn8VP" role="3cqZAp">
+                                  <node concept="2OqwBi" id="4s$H8QXn8VQ" role="3clFbG">
+                                    <node concept="37vLTw" id="4s$H8QXn8VR" role="2Oq$k0">
+                                      <ref role="3cqZAo" node="5BPceOKawro" resolve="editorCell" />
+                                    </node>
+                                    <node concept="liA8E" id="4s$H8QXn8VS" role="2OqNvi">
+                                      <ref role="37wK5l" to="g51k:~EditorCell_Collection.addEditorCell(jetbrains.mps.openapi.editor.cells.EditorCell):void" resolve="addEditorCell" />
+                                      <node concept="37vLTw" id="4s$H8QXnhin" role="37wK5m">
+                                        <ref role="3cqZAo" node="4s$H8QXmkS0" resolve="endRoleCell" />
+                                      </node>
+                                    </node>
                                   </node>
                                 </node>
                               </node>
-                              <node concept="1W57fq" id="4s$H8QXnkAj" role="lGtFl">
-                                <node concept="3IZrLx" id="4s$H8QXnkAl" role="3IZSJc">
-                                  <node concept="3clFbS" id="4s$H8QXnkAn" role="2VODD2">
-                                    <node concept="3clFbF" id="4s$H8QXnkMg" role="3cqZAp">
-                                      <node concept="2OqwBi" id="4s$H8QXnlQ9" role="3clFbG">
-                                        <node concept="2OqwBi" id="6clvLV1uaX6" role="2Oq$k0">
-                                          <node concept="2OqwBi" id="4s$H8QXnkRs" role="2Oq$k0">
-                                            <node concept="30H73N" id="4s$H8QXnkMf" role="2Oq$k0" />
-                                            <node concept="3TrEf2" id="6clvLV1uaqf" role="2OqNvi">
+                              <node concept="3y3z36" id="7FkgTXZT3Gk" role="3clFbw">
+                                <node concept="10Nm6u" id="7FkgTXZT3I$" role="3uHU7w" />
+                                <node concept="37vLTw" id="7FkgTXZT3Df" role="3uHU7B">
+                                  <ref role="3cqZAo" node="4s$H8QXmkS0" resolve="endRoleCell" />
+                                </node>
+                              </node>
+                              <node concept="1W57fq" id="7FkgTXZT5H2" role="lGtFl">
+                                <node concept="3IZrLx" id="7FkgTXZT5H4" role="3IZSJc">
+                                  <node concept="3clFbS" id="7FkgTXZT5H6" role="2VODD2">
+                                    <node concept="3clFbF" id="7FkgTXZT5MP" role="3cqZAp">
+                                      <node concept="2OqwBi" id="7FkgTXZT5MR" role="3clFbG">
+                                        <node concept="2OqwBi" id="7FkgTXZT5MS" role="2Oq$k0">
+                                          <node concept="2OqwBi" id="7FkgTXZT5MT" role="2Oq$k0">
+                                            <node concept="30H73N" id="7FkgTXZT5MU" role="2Oq$k0" />
+                                            <node concept="3TrEf2" id="7FkgTXZT5MV" role="2OqNvi">
                                               <ref role="3Tt5mk" to="2qld:7sHDEc2Si0M" />
                                             </node>
                                           </node>
-                                          <node concept="3TrEf2" id="6clvLV1ubb9" role="2OqNvi">
+                                          <node concept="3TrEf2" id="7FkgTXZT5MW" role="2OqNvi">
                                             <ref role="3Tt5mk" to="2qld:7sHDEc2ShEm" />
                                           </node>
                                         </node>
-                                        <node concept="3x8VRR" id="4s$H8QXnmaB" role="2OqNvi" />
+                                        <node concept="3x8VRR" id="7FkgTXZT5MX" role="2OqNvi" />
                                       </node>
                                     </node>
                                   </node>
diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps
index 3cfa128b964..dcfcdab8b0b 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime.mps
@@ -256,6 +256,11 @@
         <child id="1170075728144" name="expression" index="1HWFw0" />
         <child id="1170075736412" name="block" index="1HWHxc" />
       </concept>
+      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
+        <child id="1163668914799" name="condition" index="3K4Cdx" />
+        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
+        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
+      </concept>
       <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
@@ -1498,6 +1503,56 @@
       <node concept="3Tm1VV" id="1HYYbxGaejv" role="1B3o_S" />
     </node>
     <node concept="2tJIrI" id="1HYYbxGadYe" role="jymVt" />
+    <node concept="2YIFZL" id="7FkgTXZRBW6" role="jymVt">
+      <property role="TrG5h" value="getCellIfNotEmpty" />
+      <property role="DiZV1" value="false" />
+      <property role="od$2w" value="false" />
+      <node concept="3clFbS" id="7FkgTXZRBIk" role="3clF47">
+        <node concept="3clFbJ" id="7FkgTXZRGEI" role="3cqZAp">
+          <node concept="3clFbS" id="7FkgTXZRGEK" role="3clFbx">
+            <node concept="3cpWs6" id="7FkgTXZRH7h" role="3cqZAp">
+              <node concept="10Nm6u" id="7FkgTXZRHdq" role="3cqZAk" />
+            </node>
+          </node>
+          <node concept="3clFbC" id="7FkgTXZRGS5" role="3clFbw">
+            <node concept="10Nm6u" id="7FkgTXZRGYn" role="3uHU7w" />
+            <node concept="37vLTw" id="7FkgTXZRGLC" role="3uHU7B">
+              <ref role="3cqZAo" node="7FkgTXZRC66" resolve="cell" />
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="7FkgTXZRCnE" role="3cqZAp">
+          <node concept="3K4zz7" id="7FkgTXZRCGg" role="3clFbG">
+            <node concept="10Nm6u" id="7FkgTXZRCMO" role="3K4E3e" />
+            <node concept="37vLTw" id="7FkgTXZRCSz" role="3K4GZi">
+              <ref role="3cqZAo" node="7FkgTXZRC66" resolve="cell" />
+            </node>
+            <node concept="2ZW3vV" id="7FkgTXZRCAz" role="3K4Cdx">
+              <node concept="3uibUv" id="7FkgTXZRCA$" role="2ZW6by">
+                <ref role="3uigEE" to="f4zo:~EditorCell_Collection" resolve="EditorCell_Collection" />
+              </node>
+              <node concept="2YIFZM" id="7FkgTXZRCA_" role="2ZW6bz">
+                <ref role="37wK5l" to="f4zo:~CellTraversalUtil.getFirstLeaf(jetbrains.mps.openapi.editor.cells.EditorCell):jetbrains.mps.openapi.editor.cells.EditorCell" resolve="getFirstLeaf" />
+                <ref role="1Pybhc" to="f4zo:~CellTraversalUtil" resolve="CellTraversalUtil" />
+                <node concept="37vLTw" id="7FkgTXZRCAA" role="37wK5m">
+                  <ref role="3cqZAo" node="7FkgTXZRC66" resolve="cell" />
+                </node>
+              </node>
+            </node>
+          </node>
+        </node>
+      </node>
+      <node concept="3uibUv" id="7FkgTXZRBVe" role="3clF45">
+        <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+      </node>
+      <node concept="3Tm1VV" id="7FkgTXZRBIj" role="1B3o_S" />
+      <node concept="37vLTG" id="7FkgTXZRC66" role="3clF46">
+        <property role="TrG5h" value="cell" />
+        <node concept="3uibUv" id="7FkgTXZRC65" role="1tU5fm">
+          <ref role="3uigEE" to="f4zo:~EditorCell" resolve="EditorCell" />
+        </node>
+      </node>
+    </node>
     <node concept="3Tm1VV" id="7L$rKAVcmAi" role="1B3o_S" />
   </node>
   <node concept="312cEu" id="1sJnak6wM3n">
diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index eaed47e33b0..8d19e0a0808 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -42399,7 +42399,7 @@
                           <ref role="3cqZAo" node="eyrvBdcUiW" resolve="sourceEvent" />
                         </node>
                         <node concept="liA8E" id="2MQBX6Kvp9y" role="2OqNvi">
-                          <ref role="37wK5l" to="hyam:~InputEvent.getModifiersEx():int" resolve="getModifiersEx" />
+                          <ref role="37wK5l" to="hyam:~MouseEvent.getModifiersEx():int" resolve="getModifiersEx" />
                         </node>
                       </node>
                     </node>

From eaf1a79d3152f77e9d5dab06ad5ce39702d5f63e Mon Sep 17 00:00:00 2001
From: Sascha Lisson <sl@slisson.de>
Date: Mon, 11 Jan 2016 12:22:37 +0100
Subject: [PATCH 14/15] Diagram: Tooltip is shown if you click on an palette
 entry ("Use Drag and Drop")

---
 .../mps/editor/diagram/runtime/jgraph.mps     | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)

diff --git a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 8d19e0a0808..2850ffefdfd 100644
--- a/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/plugins/sl-all/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -98,6 +98,7 @@
     <import index="gsia" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing.event(JDK/)" />
     <import index="kvq8" ref="r:2e938759-cfd0-47cd-9046-896d85204f59(de.slisson.mps.hacks.editor)" />
     <import index="lzb2" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ui(MPS.IDEA/)" />
+    <import index="ddhc" ref="498d89d2-c2e9-11e2-ad49-6cf049e62fe5/java:com.intellij.ide(MPS.IDEA/)" />
     <import index="tpce" ref="r:00000000-0000-4000-0000-011c89590292(jetbrains.mps.lang.structure.structure)" implicit="true" />
   </imports>
   <registry>
@@ -16407,6 +16408,91 @@
                         <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
                       </node>
                     </node>
+                    <node concept="2tJIrI" id="7FkgTXZUM0x" role="jymVt" />
+                    <node concept="3clFb_" id="7FkgTXZUMeX" role="jymVt">
+                      <property role="1EzhhJ" value="false" />
+                      <property role="TrG5h" value="mouseClicked" />
+                      <property role="DiZV1" value="false" />
+                      <property role="od$2w" value="false" />
+                      <node concept="3Tm1VV" id="7FkgTXZUMeY" role="1B3o_S" />
+                      <node concept="3cqZAl" id="7FkgTXZUMf0" role="3clF45" />
+                      <node concept="37vLTG" id="7FkgTXZUMf1" role="3clF46">
+                        <property role="TrG5h" value="event" />
+                        <node concept="3uibUv" id="7FkgTXZUMf2" role="1tU5fm">
+                          <ref role="3uigEE" to="hyam:~MouseEvent" resolve="MouseEvent" />
+                        </node>
+                      </node>
+                      <node concept="3clFbS" id="7FkgTXZUMf4" role="3clF47">
+                        <node concept="3cpWs8" id="7FkgTXZVqAo" role="3cqZAp">
+                          <node concept="3cpWsn" id="7FkgTXZVqAp" role="3cpWs9">
+                            <property role="TrG5h" value="tooltip" />
+                            <node concept="3uibUv" id="7FkgTXZVqAm" role="1tU5fm">
+                              <ref role="3uigEE" to="ddhc:~IdeTooltip" resolve="IdeTooltip" />
+                            </node>
+                            <node concept="2ShNRf" id="7FkgTXZVqAq" role="33vP2m">
+                              <node concept="1pGfFk" id="7FkgTXZVqAr" role="2ShVmc">
+                                <ref role="37wK5l" to="ddhc:~IdeTooltip.&lt;init&gt;(java.awt.Component,java.awt.Point,javax.swing.JComponent,java.lang.Object...)" resolve="IdeTooltip" />
+                                <node concept="Xjq3P" id="7FkgTXZVqAs" role="37wK5m">
+                                  <ref role="1HBi2w" node="30G27JW8Ccm" resolve="Palette.HoverLabel" />
+                                </node>
+                                <node concept="2ShNRf" id="7FkgTXZVqAt" role="37wK5m">
+                                  <node concept="1pGfFk" id="7FkgTXZVqAu" role="2ShVmc">
+                                    <ref role="37wK5l" to="z60i:~Point.&lt;init&gt;(int,int)" resolve="Point" />
+                                    <node concept="2OqwBi" id="7FkgTXZYxYE" role="37wK5m">
+                                      <node concept="37vLTw" id="7FkgTXZYx3$" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="7FkgTXZUMf1" resolve="event" />
+                                      </node>
+                                      <node concept="liA8E" id="7FkgTXZYynz" role="2OqNvi">
+                                        <ref role="37wK5l" to="hyam:~MouseEvent.getX():int" resolve="getX" />
+                                      </node>
+                                    </node>
+                                    <node concept="2OqwBi" id="7FkgTXZY$cu" role="37wK5m">
+                                      <node concept="37vLTw" id="7FkgTXZYzi2" role="2Oq$k0">
+                                        <ref role="3cqZAo" node="7FkgTXZUMf1" resolve="event" />
+                                      </node>
+                                      <node concept="liA8E" id="7FkgTXZY$xI" role="2OqNvi">
+                                        <ref role="37wK5l" to="hyam:~MouseEvent.getY():int" resolve="getY" />
+                                      </node>
+                                    </node>
+                                  </node>
+                                </node>
+                                <node concept="2ShNRf" id="7FkgTXZVqA_" role="37wK5m">
+                                  <node concept="1pGfFk" id="7FkgTXZVqAA" role="2ShVmc">
+                                    <ref role="37wK5l" to="dxuu:~JLabel.&lt;init&gt;(java.lang.String)" resolve="JLabel" />
+                                    <node concept="Xl_RD" id="7FkgTXZVqAB" role="37wK5m">
+                                      <property role="Xl_RC" value="Use Drag and Drop" />
+                                    </node>
+                                  </node>
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="3clFbF" id="7FkgTXZUTs9" role="3cqZAp">
+                          <node concept="2OqwBi" id="7FkgTXZUVLM" role="3clFbG">
+                            <node concept="2YIFZM" id="7FkgTXZUVK0" role="2Oq$k0">
+                              <ref role="37wK5l" to="ddhc:~IdeTooltipManager.getInstance():com.intellij.ide.IdeTooltipManager" resolve="getInstance" />
+                              <ref role="1Pybhc" to="ddhc:~IdeTooltipManager" resolve="IdeTooltipManager" />
+                            </node>
+                            <node concept="liA8E" id="7FkgTXZUVTH" role="2OqNvi">
+                              <ref role="37wK5l" to="ddhc:~IdeTooltipManager.show(com.intellij.ide.IdeTooltip,boolean,boolean):com.intellij.ide.IdeTooltip" resolve="show" />
+                              <node concept="37vLTw" id="7FkgTXZVsrC" role="37wK5m">
+                                <ref role="3cqZAo" node="7FkgTXZVqAp" resolve="tooltip" />
+                              </node>
+                              <node concept="3clFbT" id="7FkgTXZVtkA" role="37wK5m">
+                                <property role="3clFbU" value="true" />
+                              </node>
+                              <node concept="3clFbT" id="7FkgTXZWe0Y" role="37wK5m">
+                                <property role="3clFbU" value="true" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
+                      <node concept="2AHcQZ" id="7FkgTXZUMf5" role="2AJF6D">
+                        <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
+                      </node>
+                    </node>
                   </node>
                 </node>
               </node>

From a4ffcdb84dc4b0ab647a7449ed94b6a26447ee99 Mon Sep 17 00:00:00 2001
From: Niko Stotz <stotz@itemis.de>
Date: Mon, 11 Jan 2016 13:15:56 +0100
Subject: [PATCH 15/15] added qsort() and qsort_r() to stdlib (fixes #1269)

---
 .../models/com/mbeddr/core/stdlib.mps         | 123 ++++++++++++++++++
 1 file changed, 123 insertions(+)

diff --git a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps
index 519e0532154..07e00be11f3 100644
--- a/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps
+++ b/code/languages/com.mbeddr.core/solutions/com.mbeddr.core.stdlib/models/com/mbeddr/core/stdlib.mps
@@ -4017,6 +4017,129 @@
         <property role="2c7vTL" value="false" />
       </node>
     </node>
+    <node concept="2NXPZ9" id="1N1hUWXfbur" role="N3F5h">
+      <property role="TrG5h" value="empty_1452508364965_1" />
+    </node>
+    <node concept="N3Fnw" id="1N1hUWXfdj4" role="N3F5h">
+      <property role="TrG5h" value="qsort" />
+      <property role="2OOxQR" value="false" />
+      <node concept="19Rifw" id="1N1hUWXfcsM" role="2C2TGm">
+        <property role="2caQfQ" value="false" />
+        <property role="2c7vTL" value="false" />
+      </node>
+      <node concept="19RgSI" id="1N1hUWXfe97" role="1UOdpc">
+        <property role="TrG5h" value="base" />
+        <node concept="3wxxNl" id="1N1hUWXfe9m" role="2C2TGm">
+          <property role="2caQfQ" value="false" />
+          <property role="2c7vTL" value="false" />
+          <node concept="19Rifw" id="1N1hUWXfe96" role="2umbIo">
+            <property role="2caQfQ" value="false" />
+            <property role="2c7vTL" value="false" />
+          </node>
+        </node>
+      </node>
+      <node concept="19RgSI" id="1N1hUWXfeae" role="1UOdpc">
+        <property role="TrG5h" value="num" />
+        <node concept="2O5j3L" id="1N1hUWXfeac" role="2C2TGm">
+          <property role="2caQfQ" value="false" />
+          <property role="2c7vTL" value="false" />
+        </node>
+      </node>
+      <node concept="19RgSI" id="1N1hUWXfeaX" role="1UOdpc">
+        <property role="TrG5h" value="size" />
+        <node concept="2O5j3L" id="1N1hUWXfeaV" role="2C2TGm">
+          <property role="2caQfQ" value="false" />
+          <property role="2c7vTL" value="false" />
+        </node>
+      </node>
+      <node concept="19RgSI" id="1N1hUWXfebA" role="1UOdpc">
+        <property role="TrG5h" value="compar" />
+        <node concept="pFrBc" id="1N1hUWXfebY" role="2C2TGm">
+          <property role="2caQfQ" value="false" />
+          <property role="2c7vTL" value="false" />
+          <node concept="3wxxNl" id="1N1hUWXfedH" role="pFrBa">
+            <property role="2caQfQ" value="false" />
+            <property role="2c7vTL" value="true" />
+            <node concept="19Rifw" id="1N1hUWXfedb" role="2umbIo">
+              <property role="2caQfQ" value="false" />
+              <property role="2c7vTL" value="false" />
+            </node>
+          </node>
+          <node concept="3wxxNl" id="1N1hUWXfekQ" role="pFrBa">
+            <property role="2caQfQ" value="false" />
+            <property role="2c7vTL" value="true" />
+            <node concept="19Rifw" id="1N1hUWXfek8" role="2umbIo">
+              <property role="2caQfQ" value="false" />
+              <property role="2c7vTL" value="false" />
+            </node>
+          </node>
+          <node concept="3TlMh2" id="1N1hUWXfemT" role="pFrBb">
+            <property role="2caQfQ" value="false" />
+            <property role="2c7vTL" value="false" />
+          </node>
+        </node>
+      </node>
+    </node>
+    <node concept="N3Fnw" id="1N1hUWXfeq5" role="N3F5h">
+      <property role="TrG5h" value="qsort_r" />
+      <property role="2OOxQR" value="false" />
+      <node concept="19Rifw" id="1N1hUWXfeq6" role="2C2TGm">
+        <property role="2caQfQ" value="false" />
+        <property role="2c7vTL" value="false" />
+      </node>
+      <node concept="19RgSI" id="1N1hUWXfeq7" role="1UOdpc">
+        <property role="TrG5h" value="base" />
+        <node concept="3wxxNl" id="1N1hUWXfeq8" role="2C2TGm">
+          <property role="2caQfQ" value="false" />
+          <property role="2c7vTL" value="false" />
+          <node concept="19Rifw" id="1N1hUWXfeq9" role="2umbIo">
+            <property role="2caQfQ" value="false" />
+            <property role="2c7vTL" value="false" />
+          </node>
+        </node>
+      </node>
+      <node concept="19RgSI" id="1N1hUWXfeqa" role="1UOdpc">
+        <property role="TrG5h" value="num" />
+        <node concept="2O5j3L" id="1N1hUWXfeqb" role="2C2TGm">
+          <property role="2caQfQ" value="false" />
+          <property role="2c7vTL" value="false" />
+        </node>
+      </node>
+      <node concept="19RgSI" id="1N1hUWXfeqc" role="1UOdpc">
+        <property role="TrG5h" value="size" />
+        <node concept="2O5j3L" id="1N1hUWXfeqd" role="2C2TGm">
+          <property role="2caQfQ" value="false" />
+          <property role="2c7vTL" value="false" />
+        </node>
+      </node>
+      <node concept="19RgSI" id="1N1hUWXfeqe" role="1UOdpc">
+        <property role="TrG5h" value="compar" />
+        <node concept="pFrBc" id="1N1hUWXfeqf" role="2C2TGm">
+          <property role="2caQfQ" value="false" />
+          <property role="2c7vTL" value="false" />
+          <node concept="3wxxNl" id="1N1hUWXfeqg" role="pFrBa">
+            <property role="2caQfQ" value="false" />
+            <property role="2c7vTL" value="true" />
+            <node concept="19Rifw" id="1N1hUWXfeqh" role="2umbIo">
+              <property role="2caQfQ" value="false" />
+              <property role="2c7vTL" value="false" />
+            </node>
+          </node>
+          <node concept="3wxxNl" id="1N1hUWXfeqi" role="pFrBa">
+            <property role="2caQfQ" value="false" />
+            <property role="2c7vTL" value="true" />
+            <node concept="19Rifw" id="1N1hUWXfeqj" role="2umbIo">
+              <property role="2caQfQ" value="false" />
+              <property role="2c7vTL" value="false" />
+            </node>
+          </node>
+          <node concept="3TlMh2" id="1N1hUWXfeqk" role="pFrBb">
+            <property role="2caQfQ" value="false" />
+            <property role="2c7vTL" value="false" />
+          </node>
+        </node>
+      </node>
+    </node>
     <node concept="rcWE1" id="1WTn9U1b1j2" role="rcWEr">
       <property role="rcWEL" value="&lt;stdlib.h&gt;" />
     </node>