From b70788c6fd51b63ecfad2cd6f237c8acc512ad8f Mon Sep 17 00:00:00 2001
From: Alexander Shatalin <Alexander.Shatalin@jetbrains.com>
Date: Fri, 1 Jun 2018 18:19:38 +0200
Subject: [PATCH] Correcting the code to reflect latest changes in MPS / master
 branch

---
 .../mps/editor/diagram/runtime/jgraph.mps     | 24 +++++++++++++------
 .../de/slisson/mps/tables/runtime/cells.mps   |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
index 186ec3af1..77445ac9c 100755
--- a/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
+++ b/code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
@@ -2243,12 +2243,17 @@
               <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project):com.intellij.openapi.project.Project" resolve="toIdeaProject" />
               <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
               <node concept="2OqwBi" id="6Bd7VwqA68z" role="37wK5m">
-                <node concept="1rXfSq" id="6Bd7VwqA68$" role="2Oq$k0">
-                  <ref role="37wK5l" to="g51k:~EditorCell_Basic.getOperationContext():jetbrains.mps.smodel.IOperationContext" resolve="getOperationContext" />
-                </node>
                 <node concept="liA8E" id="6Bd7VwqA68_" role="2OqNvi">
                   <ref role="37wK5l" to="w1kc:~IOperationContext.getProject():jetbrains.mps.project.Project" resolve="getProject" />
                 </node>
+                <node concept="2OqwBi" id="2WtZELtyqRN" role="2Oq$k0">
+                  <node concept="1rXfSq" id="2WtZELtyqRO" role="2Oq$k0">
+                    <ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext():jetbrains.mps.openapi.editor.EditorContext" resolve="getContext" />
+                  </node>
+                  <node concept="liA8E" id="2WtZELtyqRP" role="2OqNvi">
+                    <ref role="37wK5l" to="cj4x:~EditorContext.getOperationContext():jetbrains.mps.smodel.IOperationContext" resolve="getOperationContext" />
+                  </node>
+                </node>
               </node>
             </node>
           </node>
@@ -3661,11 +3666,16 @@
                 <node concept="2YIFZM" id="3kITFmIEFID" role="33vP2m">
                   <ref role="37wK5l" to="alof:~ProjectHelper.toIdeaProject(jetbrains.mps.project.Project):com.intellij.openapi.project.Project" resolve="toIdeaProject" />
                   <ref role="1Pybhc" to="alof:~ProjectHelper" resolve="ProjectHelper" />
-                  <node concept="2OqwBi" id="3kITFmIEFIE" role="37wK5m">
-                    <node concept="1rXfSq" id="3kITFmIEFIF" role="2Oq$k0">
-                      <ref role="37wK5l" to="g51k:~EditorCell_Basic.getOperationContext():jetbrains.mps.smodel.IOperationContext" resolve="getOperationContext" />
+                  <node concept="2OqwBi" id="2WtZELtylOw" role="37wK5m">
+                    <node concept="2OqwBi" id="2WtZELtya0I" role="2Oq$k0">
+                      <node concept="1rXfSq" id="2WtZELty8_x" role="2Oq$k0">
+                        <ref role="37wK5l" to="g51k:~EditorCell_Basic.getContext():jetbrains.mps.openapi.editor.EditorContext" resolve="getContext" />
+                      </node>
+                      <node concept="liA8E" id="2WtZELtylIL" role="2OqNvi">
+                        <ref role="37wK5l" to="cj4x:~EditorContext.getOperationContext():jetbrains.mps.smodel.IOperationContext" resolve="getOperationContext" />
+                      </node>
                     </node>
-                    <node concept="liA8E" id="3kITFmIEFIG" role="2OqNvi">
+                    <node concept="liA8E" id="2WtZELtynhD" role="2OqNvi">
                       <ref role="37wK5l" to="w1kc:~IOperationContext.getProject():jetbrains.mps.project.Project" resolve="getProject" />
                     </node>
                   </node>
diff --git a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
index 98107a320..9163ff5ea 100755
--- a/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
+++ b/code/tables/languages/de.slisson.mps.tables/runtime/models/de/slisson/mps/tables/runtime/cells.mps
@@ -30443,7 +30443,7 @@
                   <ref role="37wK5l" to="nivk:~AbstractEditorBuilder.getEditorContext():jetbrains.mps.openapi.editor.EditorContext" resolve="getEditorContext" />
                 </node>
                 <node concept="1rXfSq" id="XrIi9uGxCl" role="37wK5m">
-                  <ref role="37wK5l" to="nivk:~AbstractEditorBuilder.getNode():org.jetbrains.mps.openapi.model.SNode" resolve="getNode" />
+                  <ref role="37wK5l" to="nivk:~EditorBuilderEnvironment.getNode():org.jetbrains.mps.openapi.model.SNode" resolve="getNode" />
                 </node>
                 <node concept="10Nm6u" id="XrIi9uGxCm" role="37wK5m" />
               </node>