From fd18a54deb2d98c22c52d713c4d8d30ff3534040 Mon Sep 17 00:00:00 2001
From: Mykhailo Lytvyn <lytvyn.michael@gmail.com>
Date: Fri, 17 Mar 2023 17:41:23 +0100
Subject: [PATCH] #287 | Added Context Parameters node for Business Process
 Diagram

---
 gradle.properties                             |  4 +-
 resources/META-INF/plugin-release-info.xml    | 11 +++-
 .../colorSchemes/HybrisDiagramDarcula.xml     |  1 +
 .../colorSchemes/HybrisDiagramDefault.xml     |  1 +
 .../hybris/common/utils/HybrisIcons.java      | 28 +++++-----
 .../businessProcess/BpDiagramColorManager.kt  |  2 +
 .../businessProcess/BpDiagramColors.kt        |  1 +
 .../BpDiagramElementManager.kt                | 29 ++++++----
 .../BpDiagramNodeContentManager.kt            |  6 +-
 .../impl/BpGraphServiceImpl.kt                | 28 +++++++---
 .../node/BpDiagramDataModel.kt                |  8 ++-
 .../businessProcess/node/BpDiagramEdgeType.kt |  1 +
 .../businessProcess/node/BpDiagramNode.kt     | 25 ++++++---
 .../node/BpDiagramRelationship.kt             | 19 ++++---
 .../node/graph/BpGraphFactory.kt              | 55 ++++++++++++++-----
 .../node/graph/BpGraphField.kt                | 23 ++++++++
 .../graph/BpGraphFieldContextParameter.kt     | 27 +++++++++
 .../node/graph/BpGraphFieldParameter.kt       |  4 +-
 .../businessProcess/node/graph/BpGraphNode.kt |  5 +-
 .../graph/BpGraphNodeContextParameters.kt     | 52 ++++++++++++++++++
 .../node/graph/BpGraphNodeDefault.kt          |  8 +--
 .../node/graph/BpGraphNodeNavigable.kt        | 25 +++++++++
 .../node/graph/BpGraphNodeRoot.kt             |  6 +-
 .../typeSystem/node/TSDiagramColorManager.kt  | 10 +---
 .../typeSystem/node/TSDiagramDataModel.kt     |  2 +-
 .../system/businessProcess/model/Process.java |  8 ++-
 26 files changed, 293 insertions(+), 96 deletions(-)
 create mode 100644 src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphField.kt
 create mode 100644 src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFieldContextParameter.kt
 create mode 100644 src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeContextParameters.kt
 create mode 100644 src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeNavigable.kt

diff --git a/gradle.properties b/gradle.properties
index 0e1f7f76b..a9b8c202d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,7 +16,7 @@ intellij.update.since.until.build=true
 
 intellij.plugin.name=SAP-Commerce-Developers-Toolset
 intellij.plugin.version=2023.1.2
-intellij.plugin.since.build=231.8109.2
+intellij.plugin.since.build=231.8109.90
 intellij.plugin.until.build=231.*
 
 intellij.type=IU
@@ -27,7 +27,7 @@ intellij.download.sources=true
 # https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions
 # EAP snapshots -> https://www.jetbrains.com/intellij-repository/snapshots
-plugin.verifier.ide.versions=IU-231.8109.2
+plugin.verifier.ide.versions=IU-231.8109.90
 
 # Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html
 # Platform explorer (Plugin) -> https://plugins.jetbrains.com/intellij-platform-explorer/extensions
diff --git a/resources/META-INF/plugin-release-info.xml b/resources/META-INF/plugin-release-info.xml
index 470002e79..1a83188c6 100644
--- a/resources/META-INF/plugin-release-info.xml
+++ b/resources/META-INF/plugin-release-info.xml
@@ -110,11 +110,16 @@
                     <li><i>Feature:</i> Added Legend MD file (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/279" target="_blank" rel="nofollow">#279</a>)</li>
                 </ul>
                 </li>
+                <li>Business Process Diagrams Improvements
+                    <ul>
+                        <li><i>Feature:</i> Added node properties (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/267" target="_blank" rel="nofollow">#267</a>)</li>
+                        <li><i>Feature:</i> Added edge coloring (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/265" target="_blank" rel="nofollow">#265</a>)</li>
+                        <li><i>Feature:</i> Added cycle edges coloring (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/266" target="_blank" rel="nofollow">#266</a>)</li>
+                        <li><i>Feature:</i> Added Context Parameters node (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/283" target="_blank" rel="nofollow">#283</a>)</li>
+                    </ul>
+                </li>
                 <li><i>Feature:</i> Added navigation to generated Item and Enum classes from the <code>items.xml</code> (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/284" target="_blank" rel="nofollow">#284</a>)</li>
                 <li><i>Feature:</i> Added navigation to generated Enum Values fields from the <code>items.xml</code> (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/285" target="_blank" rel="nofollow">#285</a>)</li>
-                <li><i>Feature:</i> Added node properties for Business Process Diagrams (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/267" target="_blank" rel="nofollow">#267</a>)</li>
-                <li><i>Feature:</i> Added edges coloring for Business Process Diagrams (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/265" target="_blank" rel="nofollow">#265</a>)</li>
-                <li><i>Feature:</i> Added cycle edges coloring for Business Process Diagrams (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/266" target="_blank" rel="nofollow">#266</a>)</li>
                 <li><i>Feature:</i> Improved PSI cache usage (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/258" target="_blank" rel="nofollow">#258</a>)</li>
                 <li><i>Feature:</i> Improved performance of the Global Meta Model and TS LineMarker (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/257" target="_blank" rel="nofollow">#257</a>)</li>
                 <li><i>Feature:</i> IDEA modules by default will be stored in the <code>/.idea/idea-modules</code> (<a href="https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/259" target="_blank" rel="nofollow">#259</a>)</li>
diff --git a/resources/colorSchemes/HybrisDiagramDarcula.xml b/resources/colorSchemes/HybrisDiagramDarcula.xml
index e4cdd5693..083812346 100644
--- a/resources/colorSchemes/HybrisDiagramDarcula.xml
+++ b/resources/colorSchemes/HybrisDiagramDarcula.xml
@@ -12,6 +12,7 @@
         <option name="BP_DIAGRAM_EDGE_CYCLE" value="9407ED"/>
         <option name="BP_DIAGRAM_EDGE_CANCEL" value="F78058"/>
         <option name="BP_DIAGRAM_EDGE_DEFAULT" value="9B9EA1"/>
+        <option name="BP_DIAGRAM_EDGE_PARAMETERS" value="88FFCC"/>
 
         <!-- Module Dependencies Diagram -->
         <!-- EDGES -->
diff --git a/resources/colorSchemes/HybrisDiagramDefault.xml b/resources/colorSchemes/HybrisDiagramDefault.xml
index a5a3bf533..bc6dbd54e 100644
--- a/resources/colorSchemes/HybrisDiagramDefault.xml
+++ b/resources/colorSchemes/HybrisDiagramDefault.xml
@@ -12,6 +12,7 @@
         <option name="BP_DIAGRAM_EDGE_CYCLE" value="9407ED"/>
         <option name="BP_DIAGRAM_EDGE_CANCEL" value="F78058"/>
         <option name="BP_DIAGRAM_EDGE_DEFAULT" value="474747"/>
+        <option name="BP_DIAGRAM_EDGE_PARAMETERS" value="005765"/>
 
         <!-- Module Dependencies Diagram -->
         <!-- EDGES -->
diff --git a/src/com/intellij/idea/plugin/hybris/common/utils/HybrisIcons.java b/src/com/intellij/idea/plugin/hybris/common/utils/HybrisIcons.java
index 4996d247a..d3bab67de 100644
--- a/src/com/intellij/idea/plugin/hybris/common/utils/HybrisIcons.java
+++ b/src/com/intellij/idea/plugin/hybris/common/utils/HybrisIcons.java
@@ -63,14 +63,6 @@ private HybrisIcons() {
     public static final Icon EXTENSION_EXT = getIcon("/icons/extension/ext.svg");
     public static final Icon EXTENSION_OOTB = HYBRIS;
 
-    public static final Icon BP_DIAGRAM_WAIT = getIcon("/icons/businessProcess/diagram/wait.svg");
-    public static final Icon BP_DIAGRAM_END = getIcon("/icons/businessProcess/diagram/end.svg");
-    public static final Icon BP_DIAGRAM_NOTIFY = getIcon("/icons/businessProcess/diagram/notify.svg");
-    public static final Icon BP_DIAGRAM_ACTION = getIcon("/icons/businessProcess/diagram/action.svg");
-    public static final Icon BP_DIAGRAM_SPLIT = getIcon("/icons/businessProcess/diagram/split.svg");
-    public static final Icon BP_DIAGRAM_JOIN = getIcon("/icons/businessProcess/diagram/join.svg");
-    public static final Icon BP_DIAGRAM_SCRIPT = getIcon("/icons/businessProcess/diagram/script.svg");
-
     public static final Icon TYPE_SYSTEM = getIcon("/icons/typeSystem.svg");
     public static final Icon SPRING_BEAN = getIcon("icons/springBean.svg");
     public static final Icon LOCALIZED = getIcon("/icons/localized.svg");
@@ -112,14 +104,24 @@ private HybrisIcons() {
     public static final Icon BS_ENUM = getIcon("/icons/beanSystem/enum.svg");
     public static final Icon BS_ENUM_VALUE = getIcon("/icons/beanSystem/enumValue.svg");
 
-    public static final Icon BS_DIAGRAM_PROPERTY = BS_PROPERTY;
-    public static final Icon BS_DIAGRAM_SPRING_BEAN = SPRING_BEAN;
-    public static final Icon BS_DIAGRAM_NODE = AllIcons.Nodes.FieldPK;
-    public static final Icon BS_DIAGRAM_FIELD = AllIcons.Nodes.Field;
+    public static final Icon BP_DIAGRAM_WAIT = getIcon("/icons/businessProcess/diagram/wait.svg");
+    public static final Icon BP_DIAGRAM_END = getIcon("/icons/businessProcess/diagram/end.svg");
+    public static final Icon BP_DIAGRAM_NOTIFY = getIcon("/icons/businessProcess/diagram/notify.svg");
+    public static final Icon BP_DIAGRAM_ACTION = getIcon("/icons/businessProcess/diagram/action.svg");
+    public static final Icon BP_DIAGRAM_SPLIT = getIcon("/icons/businessProcess/diagram/split.svg");
+    public static final Icon BP_DIAGRAM_JOIN = getIcon("/icons/businessProcess/diagram/join.svg");
+    public static final Icon BP_DIAGRAM_SCRIPT = getIcon("/icons/businessProcess/diagram/script.svg");
+    public static final Icon BP_DIAGRAM_PARAMETERS = AllIcons.Nodes.NewParameter;
+    public static final Icon BP_DIAGRAM_PROPERTY = BS_PROPERTY;
+    public static final Icon BP_DIAGRAM_SPRING_BEAN = SPRING_BEAN;
+    public static final Icon BP_DIAGRAM_NODE = AllIcons.Nodes.FieldPK;
+    public static final Icon BP_DIAGRAM_FIELD = AllIcons.Nodes.Field;
+    public static final Icon BP_DIAGRAM_CLASS = AllIcons.Nodes.Class;
+    public static final Icon BP_DIAGRAM_PARAMETER_REQUIRED = AllIcons.Nodes.Plugin;
+    public static final Icon BP_DIAGRAM_PARAMETER_OPTIONAL = AllIcons.Nodes.Pluginobsolete;
 
     public static final Icon TS_DIAGRAM_PROPERTY = AllIcons.Nodes.Property;
     public static final Icon TS_DIAGRAM_DEPLOYMENT = AllIcons.Debugger.Db_db_object;
-
     public static final Icon TS_DIAGRAM_RESET_VIEW = getIcon("/icons/typeSystem/diagram/resetView.svg");
     public static final Icon TS_DIAGRAM_SETTINGS = getIcon("/icons/typeSystem/diagram/settings.svg");
 
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramColorManager.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramColorManager.kt
index dcab95156..c15999c54 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramColorManager.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramColorManager.kt
@@ -25,6 +25,7 @@ import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpDiagramColors.E
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpDiagramColors.EDGE_DEFAULT
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpDiagramColors.EDGE_NOK
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpDiagramColors.EDGE_OK
+import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpDiagramColors.EDGE_PARAMETERS
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpDiagramColors.EDGE_PARTIAL
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpDiagramColors.EDGE_START
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpDiagramColors.EDGE_TIMEOUT
@@ -45,6 +46,7 @@ class BpDiagramColorManager : DiagramColorManagerBase() {
             BpDiagramEdgeType.PARTIAL -> EDGE_PARTIAL
             BpDiagramEdgeType.CYCLE -> EDGE_CYCLE
             BpDiagramEdgeType.TIMEOUT -> EDGE_TIMEOUT
+            BpDiagramEdgeType.PARAMETERS -> EDGE_PARAMETERS
             else -> EDGE_DEFAULT
         }
 
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramColors.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramColors.kt
index af3461828..ddc4b7ca9 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramColors.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramColors.kt
@@ -31,4 +31,5 @@ object BpDiagramColors {
     val EDGE_CYCLE = createColorKeyWithFallback("BP_DIAGRAM_EDGE_CYCLE", DiagramColors.DEFAULT_EDGE)
     val EDGE_CANCEL = createColorKeyWithFallback("BP_DIAGRAM_EDGE_CANCEL", DiagramColors.DEFAULT_EDGE)
     val EDGE_DEFAULT = createColorKeyWithFallback("BP_DIAGRAM_EDGE_DEFAULT", DiagramColors.DEFAULT_EDGE)
+    val EDGE_PARAMETERS = createColorKeyWithFallback("BP_DIAGRAM_EDGE_PARAMETERS", DiagramColors.DEFAULT_EDGE)
 }
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramElementManager.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramElementManager.kt
index 3cb33fb2c..de9720218 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramElementManager.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramElementManager.kt
@@ -21,10 +21,10 @@ import com.intellij.diagram.AbstractDiagramElementManager
 import com.intellij.diagram.DiagramBuilder
 import com.intellij.idea.plugin.hybris.actions.ActionUtils
 import com.intellij.idea.plugin.hybris.common.utils.HybrisIcons
-import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphFactory
-import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphFieldParameter
-import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphNode
+import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.*
 import com.intellij.idea.plugin.hybris.system.businessProcess.model.Action
+import com.intellij.idea.plugin.hybris.system.businessProcess.model.ParameterUse
+import com.intellij.idea.plugin.hybris.system.businessProcess.model.Process
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.ui.SimpleColoredText
@@ -43,26 +43,33 @@ class BpDiagramElementManager : AbstractDiagramElementManager<BpGraphNode>() {
 
     override fun isAcceptableAsNode(o: Any?) = o is BpGraphNode
     override fun getElementTitle(t: BpGraphNode) = t.name
-    override fun getNodeTooltip(t: BpGraphNode) = t.name
+    override fun getNodeTooltip(t: BpGraphNode) = null
     override fun getNodeItems(parent: BpGraphNode?): Array<out Any> = parent?.properties ?: emptyArray()
 
     override fun getItemName(nodeElement: BpGraphNode?, nodeItem: Any?, builder: DiagramBuilder) = when (nodeItem) {
-        is BpGraphFieldParameter -> SimpleColoredText(nodeItem.name, SimpleTextAttributes.REGULAR_ATTRIBUTES)
+        is BpGraphField -> SimpleColoredText(nodeItem.name, SimpleTextAttributes.REGULAR_ATTRIBUTES)
         else -> null
     }
 
     override fun getItemType(element: Any?) = when (element) {
+        is BpGraphFieldContextParameter -> SimpleColoredText(element.type, SimpleTextAttributes.REGULAR_ATTRIBUTES)
         is BpGraphFieldParameter -> SimpleColoredText(element.value, SimpleTextAttributes.REGULAR_ATTRIBUTES)
         else -> null
     }
 
     override fun getItemIcon(nodeElement: BpGraphNode?, nodeItem: Any?, builder: DiagramBuilder?) = when (nodeItem) {
-        is BpGraphFieldParameter -> when (nodeItem.name) {
-            Action.BEAN -> HybrisIcons.BS_DIAGRAM_SPRING_BEAN
-            Action.NODE -> HybrisIcons.BS_DIAGRAM_NODE
-            Action.NODE_GROUP -> HybrisIcons.BS_DIAGRAM_NODE
-            Action.CAN_JOIN_PREVIOUS_NODE -> HybrisIcons.BS_DIAGRAM_FIELD
-            else -> HybrisIcons.BS_DIAGRAM_PROPERTY
+        is BpGraphFieldContextParameter -> when (nodeItem.use) {
+            ParameterUse.REQUIRED -> HybrisIcons.BP_DIAGRAM_PARAMETER_REQUIRED
+            else -> HybrisIcons.BP_DIAGRAM_PARAMETER_OPTIONAL
+        }
+        is BpGraphField -> when (nodeItem.name) {
+            Action.BEAN -> HybrisIcons.BP_DIAGRAM_SPRING_BEAN
+            Action.NODE -> HybrisIcons.BP_DIAGRAM_NODE
+            Action.NODE_GROUP -> HybrisIcons.BP_DIAGRAM_NODE
+            Action.CAN_JOIN_PREVIOUS_NODE -> HybrisIcons.BP_DIAGRAM_FIELD
+            Process.DEFAULT_NODE_GROUP -> HybrisIcons.BP_DIAGRAM_NODE
+            Process.PROCESS_CLASS -> HybrisIcons.BP_DIAGRAM_CLASS
+            else -> HybrisIcons.BP_DIAGRAM_PROPERTY
         }
 
         else -> null
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramNodeContentManager.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramNodeContentManager.kt
index 314f82439..6a6e74ff8 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramNodeContentManager.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/BpDiagramNodeContentManager.kt
@@ -23,15 +23,17 @@ import com.intellij.diagram.DiagramBuilder
 import com.intellij.diagram.DiagramCategory
 import com.intellij.icons.AllIcons
 import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
+import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphFieldContextParameter
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphFieldParameter
 
 class BpDiagramNodeContentManager : AbstractDiagramNodeContentManager() {
 
     override fun getContentCategories() = CATEGORIES
 
-    override fun isInCategory(nodeElement: Any?, item: Any?, category: DiagramCategory, builder: DiagramBuilder?) = when (nodeElement) {
+    override fun isInCategory(nodeElement: Any?, item: Any?, category: DiagramCategory, builder: DiagramBuilder?) = when (item) {
+        is BpGraphFieldContextParameter -> category == PARAMETERS
         is BpGraphFieldParameter -> category == PARAMETERS
-        else -> super.isInCategory(nodeElement, item, category, builder)
+        else -> false
     }
 
     companion object {
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/impl/BpGraphServiceImpl.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/impl/BpGraphServiceImpl.kt
index ee359fab2..1ceac845e 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/impl/BpGraphServiceImpl.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/impl/BpGraphServiceImpl.kt
@@ -19,9 +19,7 @@ package com.intellij.idea.plugin.hybris.diagram.businessProcess.impl
 
 import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils.message
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpGraphService
-import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphFactory
-import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphNode
-import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphNodeRoot
+import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.*
 import com.intellij.idea.plugin.hybris.system.businessProcess.model.*
 import org.apache.commons.collections4.CollectionUtils
 
@@ -50,11 +48,25 @@ class BpGraphServiceImpl : BpGraphService {
             ?.let { nodesMap[it] }
             ?.let { rootGraphNode.transitions["On Error"] = it }
 
-        return nodesMap
+        val contextParametersNode = rootGraphNode.process.contextParameters
+            .filter { it.name.stringValue != null && it.type.stringValue != null }
+            .map {
+                BpGraphFieldContextParameter(it.name.stringValue!!, it.type.stringValue!!, it.use.value ?: ParameterUse.OPTIONAL)
+            }
+            .takeIf { it.isNotEmpty() }
+            ?.let { BpGraphFactory.buildNode("Context Parameters", rootGraphNode, it.toTypedArray()) }
+
+        return if (contextParametersNode == null) nodesMap
+        else {
+            val mutableNodes: MutableMap<String, BpGraphNode> = nodesMap.toMutableMap()
+            mutableNodes["Context Parameters"] = contextParametersNode
+
+            mutableNodes
+        }
     }
 
     private fun populateNodesTransitions(
-        nodesMap: Map<String, BpGraphNode>,
+        nodesMap: Map<String, BpGraphNodeNavigable>,
         nodes: List<NavigableElement>
     ) {
         nodes.forEach {
@@ -75,15 +87,15 @@ class BpGraphServiceImpl : BpGraphService {
 
         is Notify -> mapOf("" to navigableElement.then.stringValue)
 
+        is ScriptAction -> navigableElement.transitions
+            .associate { (it.name.stringValue ?: "") to it.to.stringValue }
+
         is Action -> navigableElement.transitions
             .associate { (it.name.stringValue ?: "") to it.to.stringValue }
 
         is Split -> navigableElement.targetNodes
             .associate { (it.name.stringValue ?: "") to it.name.stringValue }
 
-        is ScriptAction -> navigableElement.transitions
-            .associate { (it.name.stringValue ?: "") to it.to.stringValue }
-
         is Wait -> {
             val transitions = mutableMapOf(
                 "" to navigableElement.then.stringValue
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramDataModel.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramDataModel.kt
index 75349d0c6..a1d443c20 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramDataModel.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramDataModel.kt
@@ -23,6 +23,7 @@ import com.intellij.diagram.DiagramProvider
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpGraphService
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphFactory
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphNode
+import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphNodeNavigable
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphNodeRoot
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.ModificationTracker
@@ -61,11 +62,16 @@ class BpDiagramDataModel(
 
         nodesMap[rootBpGraphNode.name] = BpDiagramNode(rootBpGraphNode, provider)
 
+        nodesMap["Context Parameters"]
+            ?.let { BpGraphFactory.buildEdge("parameters", nodesMap[rootBpGraphNode.name]!!, it) }
+            ?.let { edges.add(it) }
+
         nodesMap.values
+            .filter { it.identifyingElement is BpGraphNodeNavigable }
             .forEach { targetBpDiagramFileNode ->
                 val sourceBpGraphNode = targetBpDiagramFileNode.identifyingElement
 
-                sourceBpGraphNode.transitions
+                (sourceBpGraphNode as BpGraphNodeNavigable).transitions
                     .forEach { (transitionName, targetBpGraphNode) ->
                         nodesMap[targetBpGraphNode.name]
                             ?.let { sourceBpDiagramFileNode -> BpGraphFactory.buildEdge(transitionName, sourceBpDiagramFileNode, targetBpDiagramFileNode) }
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramEdgeType.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramEdgeType.kt
index 97c8656ea..0e210789d 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramEdgeType.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramEdgeType.kt
@@ -26,5 +26,6 @@ enum class BpDiagramEdgeType {
     PARTIAL,
     CYCLE,
     TIMEOUT,
+    PARAMETERS,
     DEFAULT
 }
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramNode.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramNode.kt
index 8033bf1e0..14e68a5ed 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramNode.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramNode.kt
@@ -21,6 +21,8 @@ import com.intellij.diagram.DiagramNodeBase
 import com.intellij.diagram.DiagramProvider
 import com.intellij.idea.plugin.hybris.common.utils.HybrisIcons
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphNode
+import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphNodeContextParameters
+import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph.BpGraphNodeNavigable
 import com.intellij.idea.plugin.hybris.system.businessProcess.model.*
 import java.io.Serial
 
@@ -29,15 +31,20 @@ class BpDiagramNode(val graphNode: BpGraphNode, provider: DiagramProvider<BpGrap
     override fun getIdentifyingElement() = graphNode
     override fun getTooltip() = graphNode.name
 
-    override fun getIcon() = when (graphNode.navigableElement) {
-        is Process -> HybrisIcons.BUSINESS_PROCESS
-        is ScriptAction -> HybrisIcons.BP_DIAGRAM_SCRIPT
-        is Action -> HybrisIcons.BP_DIAGRAM_ACTION
-        is Split -> HybrisIcons.BP_DIAGRAM_SPLIT
-        is Wait -> HybrisIcons.BP_DIAGRAM_WAIT
-        is Join -> HybrisIcons.BP_DIAGRAM_JOIN
-        is End -> HybrisIcons.BP_DIAGRAM_END
-        is Notify -> HybrisIcons.BP_DIAGRAM_NOTIFY
+    override fun getIcon() = when (graphNode) {
+        is BpGraphNodeContextParameters -> HybrisIcons.BP_DIAGRAM_PARAMETERS
+        is BpGraphNodeNavigable -> when (graphNode.navigableElement) {
+            is Process -> HybrisIcons.BUSINESS_PROCESS
+            is ScriptAction -> HybrisIcons.BP_DIAGRAM_SCRIPT
+            is Action -> HybrisIcons.BP_DIAGRAM_ACTION
+            is Split -> HybrisIcons.BP_DIAGRAM_SPLIT
+            is Wait -> HybrisIcons.BP_DIAGRAM_WAIT
+            is Join -> HybrisIcons.BP_DIAGRAM_JOIN
+            is End -> HybrisIcons.BP_DIAGRAM_END
+            is Notify -> HybrisIcons.BP_DIAGRAM_NOTIFY
+            else -> null
+        }
+
         else -> null
     }
 
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramRelationship.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramRelationship.kt
index 7b8551e73..698ef7d52 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramRelationship.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/BpDiagramRelationship.kt
@@ -22,12 +22,15 @@ import com.intellij.diagram.presentation.DiagramLineType
 import java.awt.Shape
 
 class BpDiagramRelationship(
-    label: String?,
+    name: String? = null,
+    upperCenterLabel: String? = null,
+    bottomCenterLabel: String? = null,
+    upperSourceLabel: String? = null,
+    bottomSourceLabel: String? = null,
+    upperTargetLabel: String? = null,
+    bottomTargetLabel: String? = null,
     lineType: DiagramLineType = DiagramLineType.SOLID,
-    fromLabel: String = "",
-    toLabel: String = "",
-    width: Int = 1
-) : DiagramRelationshipInfoAdapter(label, lineType, label, fromLabel, toLabel, width) {
-
-    override fun getStartArrow(): Shape = STANDARD
-}
+    width: Int = 1,
+    sourceArrow: Shape? = null,
+    targetArrow: Shape? = null,
+) : DiagramRelationshipInfoAdapter(name, lineType, width, sourceArrow, targetArrow, upperCenterLabel, bottomCenterLabel, upperSourceLabel, bottomSourceLabel, upperTargetLabel, bottomTargetLabel)
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFactory.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFactory.kt
index ceacd1468..1a32ae178 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFactory.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFactory.kt
@@ -18,6 +18,7 @@
 
 package com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph
 
+import com.intellij.diagram.DiagramRelationshipInfo
 import com.intellij.diagram.presentation.DiagramLineType
 import com.intellij.idea.plugin.hybris.common.utils.HybrisI18NBundleUtils
 import com.intellij.idea.plugin.hybris.diagram.businessProcess.node.BpDiagramEdge
@@ -46,14 +47,27 @@ object BpGraphFactory {
 
         val process = fileElement.rootElement
 
+        val properties: Array<BpGraphField> = listOfNotNull(
+            process.processClass.stringValue?.let { BpGraphFieldParameter(Process.PROCESS_CLASS, it.substringAfterLast(".")) },
+            process.defaultNodeGroup.stringValue?.let { BpGraphFieldParameter(Process.DEFAULT_NODE_GROUP, it) }
+        )
+            .toTypedArray()
         return BpGraphNodeRoot(
-            process.name.stringValue ?: virtualFile.nameWithoutExtension,
+            "[y] " + (process.name.stringValue ?: virtualFile.nameWithoutExtension),
             process,
             virtualFile,
-            process
+            process,
+            properties = properties
         )
     }
 
+    fun buildNode(nodeName: String, rootGraphNode: BpGraphNodeRoot, parameters: Array<BpGraphField>) = BpGraphNodeContextParameters(
+        nodeName,
+        rootGraphNode.virtualFile,
+        rootGraphNode.process,
+        parameters
+    )
+
     fun buildNode(nodeName: String, element: NavigableElement, rootGraphNode: BpGraphNodeRoot) = when (element) {
         is ScriptAction -> build(nodeName, element, rootGraphNode)
         is Action -> build(nodeName, element, rootGraphNode)
@@ -63,7 +77,15 @@ object BpGraphFactory {
         else -> build(nodeName, element, rootGraphNode)
     }
 
-    fun buildEdge(transitionName: String, source: BpDiagramNode, target: BpDiagramNode) = if (source == target) {
+    fun buildEdge(transitionName: String, source: BpDiagramNode, target: BpDiagramNode): BpDiagramEdge = if (source.graphNode is Process || target.graphNode is BpGraphNodeContextParameters) {
+        BpDiagramEdge(source, target, BpDiagramRelationship(
+            upperCenterLabel = transitionName,
+            lineType = DiagramLineType.DOTTED,
+            width = 2,
+            sourceArrow = DiagramRelationshipInfo.CROWS_FOOT_ONE,
+            targetArrow = DiagramRelationshipInfo.CROWS_FOOT_MANY_OPTIONAL
+        ), type = BpDiagramEdgeType.PARAMETERS)
+    } else if (source == target) {
         BpDiagramEdge(source, target, buildRelationship(transitionName, source, target), BpDiagramEdgeType.CYCLE)
     } else if ("Start".equals(transitionName, true)) {
         BpDiagramEdge(source, target, buildRelationship(transitionName, source, target), BpDiagramEdgeType.START)
@@ -82,8 +104,10 @@ object BpGraphFactory {
     }
 
     private fun buildRelationship(transitionName: String, source: BpDiagramNode, target: BpDiagramNode): BpDiagramRelationship {
-        val sourceNodeImportant = source.graphNode.navigableElement is End || source.graphNode.navigableElement is Process
-        val targetNodeImportant = target.graphNode.navigableElement is End || target.graphNode.navigableElement is Process
+        val sourceGraphNode = source.graphNode as BpGraphNodeNavigable
+        val targetGraphNode = target.graphNode as BpGraphNodeNavigable
+        val sourceNodeImportant = sourceGraphNode.navigableElement is End || sourceGraphNode.navigableElement is Process
+        val targetNodeImportant = targetGraphNode.navigableElement is End || targetGraphNode.navigableElement is Process
         var width = 1
 
         if (sourceNodeImportant) width++
@@ -93,13 +117,14 @@ object BpGraphFactory {
         else DiagramLineType.SOLID
 
         return BpDiagramRelationship(
-            label = transitionName,
+            upperCenterLabel = transitionName,
             lineType = lineType,
-            width = width
+            width = width,
+            sourceArrow = DiagramRelationshipInfo.STANDARD
         )
     }
 
-    private fun build(nodeName: String, element: Action, rootGraphNode: BpGraphNodeRoot): BpGraphNode {
+    private fun build(nodeName: String, element: Action, rootGraphNode: BpGraphNodeRoot): BpGraphNodeNavigable {
         val properties = mutableListOf(
             BpGraphFieldParameter(Action.CAN_JOIN_PREVIOUS_NODE, (element.canJoinPreviousNode.stringValue
                 ?: "false"))
@@ -118,14 +143,14 @@ object BpGraphFactory {
         return BpGraphNodeDefault(nodeName, element, rootGraphNode.virtualFile, rootGraphNode.process, properties.toTypedArray())
     }
 
-    private fun build(nodeName: String, element: End, rootGraphNode: BpGraphNodeRoot): BpGraphNode {
-        val properties = (element.state.stringValue
+    private fun build(nodeName: String, element: End, rootGraphNode: BpGraphNodeRoot): BpGraphNodeNavigable {
+        val properties: Array<BpGraphField> = (element.state.stringValue
             ?.let { arrayOf(BpGraphFieldParameter(End.STATE, it)) }
             ?: emptyArray())
         return BpGraphNodeDefault(nodeName, element, rootGraphNode.virtualFile, rootGraphNode.process, properties)
     }
 
-    private fun build(nodeName: String, element: Wait, rootGraphNode: BpGraphNodeRoot): BpGraphNode {
+    private fun build(nodeName: String, element: Wait, rootGraphNode: BpGraphNodeRoot): BpGraphNodeNavigable {
         val properties = mutableListOf(
             BpGraphFieldParameter(Wait.PREPEND_PROCESS_CODE, (element.prependProcessCode.stringValue
                 ?: "true"))
@@ -133,16 +158,16 @@ object BpGraphFactory {
         return BpGraphNodeDefault(nodeName, element, rootGraphNode.virtualFile, rootGraphNode.process, properties.toTypedArray())
     }
 
-    private fun build(nodeName: String, element: Notify, rootGraphNode: BpGraphNodeRoot): BpGraphNode {
-        val properties = element.userGroups
+    private fun build(nodeName: String, element: Notify, rootGraphNode: BpGraphNodeRoot): BpGraphNodeNavigable {
+        val properties: Array<BpGraphField> = element.userGroups
             .filter { it.name.stringValue?.isNotEmpty() ?: false }
             .map { BpGraphFieldParameter(it.name.stringValue!!, "") }
             .toTypedArray()
         return BpGraphNodeDefault(nodeName, element, rootGraphNode.virtualFile, rootGraphNode.process, properties)
     }
 
-    private fun build(nodeName: String, element: ScriptAction, rootGraphNode: BpGraphNodeRoot): BpGraphNode {
-        val properties = element.script.type.stringValue
+    private fun build(nodeName: String, element: ScriptAction, rootGraphNode: BpGraphNodeRoot): BpGraphNodeNavigable {
+        val properties: Array<BpGraphField> = element.script.type.stringValue
             ?.let { arrayOf(BpGraphFieldParameter(ScriptAction.SCRIPT, it)) }
             ?: emptyArray()
         return BpGraphNodeDefault(nodeName, element, rootGraphNode.virtualFile, rootGraphNode.process, properties)
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphField.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphField.kt
new file mode 100644
index 000000000..e3ec6010a
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphField.kt
@@ -0,0 +1,23 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph
+
+interface BpGraphField {
+    val name: String
+}
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFieldContextParameter.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFieldContextParameter.kt
new file mode 100644
index 000000000..9e3415dcd
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFieldContextParameter.kt
@@ -0,0 +1,27 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph
+
+import com.intellij.idea.plugin.hybris.system.businessProcess.model.ParameterUse
+
+data class BpGraphFieldContextParameter(
+    override val name: String,
+    val type: String,
+    val use: ParameterUse,
+) : BpGraphField
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFieldParameter.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFieldParameter.kt
index 5c958a0fb..f233f360e 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFieldParameter.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphFieldParameter.kt
@@ -19,6 +19,6 @@
 package com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph
 
 data class BpGraphFieldParameter(
-    val name: String,
+    override val name: String,
     val value: String,
-)
\ No newline at end of file
+) : BpGraphField
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNode.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNode.kt
index 48f64a268..c91ab47b3 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNode.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNode.kt
@@ -19,13 +19,10 @@ package com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph
 
 import com.intellij.idea.plugin.hybris.system.businessProcess.model.Process
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.util.xml.DomElement
 
 interface BpGraphNode {
     val name: String
-    val navigableElement: DomElement
-    val transitions: MutableMap<String, BpGraphNode>
     val virtualFile: VirtualFile
     val process: Process
-    val properties: Array<BpGraphFieldParameter>
+    val properties: Array<BpGraphField>
 }
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeContextParameters.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeContextParameters.kt
new file mode 100644
index 000000000..099cb156b
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeContextParameters.kt
@@ -0,0 +1,52 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph
+
+import com.intellij.idea.plugin.hybris.system.businessProcess.model.Process
+import com.intellij.openapi.vfs.VirtualFile
+import org.apache.commons.lang3.builder.EqualsBuilder
+import org.apache.commons.lang3.builder.HashCodeBuilder
+
+open class BpGraphNodeContextParameters(
+    override val name: String,
+    override val virtualFile: VirtualFile,
+    override val process: Process,
+    override val properties: Array<BpGraphField> = emptyArray()
+) : BpGraphNode {
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) {
+            return true
+        }
+        if (other == null || javaClass != other.javaClass) {
+            return false
+        }
+        val otherNode = other as BpGraphNodeContextParameters
+
+        return EqualsBuilder()
+            .append(name, otherNode.name)
+            .isEquals
+    }
+
+    override fun hashCode(): Int = HashCodeBuilder(17, 37)
+        .append(name)
+        .toHashCode()
+
+    override fun toString() = "BpGraphNodeContextParameters{genericAction=$name}"
+
+}
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeDefault.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeDefault.kt
index 0ab09c479..78df61315 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeDefault.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeDefault.kt
@@ -28,9 +28,9 @@ open class BpGraphNodeDefault(
     override val navigableElement: DomElement,
     override val virtualFile: VirtualFile,
     override val process: Process,
-    override val properties: Array<BpGraphFieldParameter> = emptyArray()
-) : BpGraphNode {
-    override val transitions: MutableMap<String, BpGraphNode> = HashMap()
+    override val properties: Array<BpGraphField> = emptyArray()
+) : BpGraphNodeNavigable {
+    override val transitions: MutableMap<String, BpGraphNodeNavigable> = HashMap()
 
     override fun equals(other: Any?): Boolean {
         if (this === other) {
@@ -50,6 +50,6 @@ open class BpGraphNodeDefault(
         .append(name)
         .toHashCode()
 
-    override fun toString() = "DefaultBpGraphNode{genericAction=$name}"
+    override fun toString() = "BpGraphNodeDefault{genericAction=$name}"
 
 }
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeNavigable.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeNavigable.kt
new file mode 100644
index 000000000..7575dbe5c
--- /dev/null
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeNavigable.kt
@@ -0,0 +1,25 @@
+/*
+ * This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
+ * Copyright (C) 2019 EPAM Systems <hybrisideaplugin@epam.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.intellij.idea.plugin.hybris.diagram.businessProcess.node.graph
+
+import com.intellij.util.xml.DomElement
+
+interface BpGraphNodeNavigable : BpGraphNode {
+    val navigableElement: DomElement
+    val transitions: MutableMap<String, BpGraphNodeNavigable>
+}
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeRoot.kt b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeRoot.kt
index bf99b952d..510d7d7b6 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeRoot.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/businessProcess/node/graph/BpGraphNodeRoot.kt
@@ -26,6 +26,6 @@ class BpGraphNodeRoot(
     override val navigableElement: Process,
     override val virtualFile: VirtualFile,
     override val process: Process,
-    override val transitions: MutableMap<String, BpGraphNode> = HashMap(),
-    override val properties: Array<BpGraphFieldParameter> = emptyArray()
-) : BpGraphNode
\ No newline at end of file
+    override val transitions: MutableMap<String, BpGraphNodeNavigable> = HashMap(),
+    override val properties: Array<BpGraphField> = emptyArray()
+) : BpGraphNodeNavigable
\ No newline at end of file
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/typeSystem/node/TSDiagramColorManager.kt b/src/com/intellij/idea/plugin/hybris/diagram/typeSystem/node/TSDiagramColorManager.kt
index 720e5b13a..925c67742 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/typeSystem/node/TSDiagramColorManager.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/typeSystem/node/TSDiagramColorManager.kt
@@ -18,11 +18,7 @@
 
 package com.intellij.idea.plugin.hybris.diagram.typeSystem.node
 
-import com.intellij.diagram.DiagramBuilder
-import com.intellij.diagram.DiagramColorManagerBase
-import com.intellij.diagram.DiagramEdge
-import com.intellij.diagram.DiagramNode
-import com.intellij.idea.plugin.hybris.diagram.businessProcess.BpDiagramColors
+import com.intellij.diagram.*
 import com.intellij.idea.plugin.hybris.diagram.typeSystem.TSDiagramColors
 import com.intellij.idea.plugin.hybris.diagram.typeSystem.node.graph.TSGraphNodeClassifier
 import java.awt.Color
@@ -35,10 +31,10 @@ class TSDiagramColorManager : DiagramColorManagerBase() {
             TSDiagramEdgeType.PART_OF -> TSDiagramColors.EDGE_PART_OF
             TSDiagramEdgeType.DEPENDENCY -> TSDiagramColors.EDGE_DEPENDENCY
             TSDiagramEdgeType.DEPENDENCY_NAVIGABLE -> TSDiagramColors.EDGE_DEPENDENCY_NAVIGABLE
-            else -> BpDiagramColors.EDGE_DEFAULT
+            else -> DiagramColors.DEFAULT_EDGE
         }
 
-        else -> BpDiagramColors.EDGE_DEFAULT
+        else -> DiagramColors.DEFAULT_EDGE
     }
 
     override fun getNodeHeaderBackground(builder: DiagramBuilder, node: DiagramNode<*>, graphNode: Any?): Color = when (graphNode) {
diff --git a/src/com/intellij/idea/plugin/hybris/diagram/typeSystem/node/TSDiagramDataModel.kt b/src/com/intellij/idea/plugin/hybris/diagram/typeSystem/node/TSDiagramDataModel.kt
index 953b32b9f..4fda0e4b2 100644
--- a/src/com/intellij/idea/plugin/hybris/diagram/typeSystem/node/TSDiagramDataModel.kt
+++ b/src/com/intellij/idea/plugin/hybris/diagram/typeSystem/node/TSDiagramDataModel.kt
@@ -67,7 +67,7 @@ class TSDiagramDataModel(val myProject: Project, provider: TSDiagramProvider)
         }
     }
 
-    override fun refreshDataModel() = DumbService.getInstance(myProject).runWhenSmart {
+    override fun refreshDataModel() = DumbService.getInstance(myProject).runReadActionInSmartMode {
         TSDiagramRefresher.refresh(this, nodesMap, edges)
         this.incModificationCount()
     }
diff --git a/src/com/intellij/idea/plugin/hybris/system/businessProcess/model/Process.java b/src/com/intellij/idea/plugin/hybris/system/businessProcess/model/Process.java
index 51c0850b6..aa80bb153 100644
--- a/src/com/intellij/idea/plugin/hybris/system/businessProcess/model/Process.java
+++ b/src/com/intellij/idea/plugin/hybris/system/businessProcess/model/Process.java
@@ -23,7 +23,6 @@
 
 import com.intellij.idea.plugin.hybris.system.businessProcess.util.xml.BpNavigableElementConverter;
 import com.intellij.util.xml.*;
-import com.intellij.util.xml.DomElement;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -33,6 +32,9 @@
 @StubbedOccurrence
 public interface Process extends DomElement {
 
+	String DEFAULT_NODE_GROUP = "defaultNodeGroup";
+	String PROCESS_CLASS = "processClass";
+
 	/**
 	 * Returns the value of the name child.
 	 * @return the value of the name child.
@@ -69,7 +71,7 @@ public interface Process extends DomElement {
 	 * @return the value of the processClass child.
 	 */
 	@NotNull
-	@com.intellij.util.xml.Attribute ("processClass")
+	@com.intellij.util.xml.Attribute (PROCESS_CLASS)
 	GenericAttributeValue<String> getProcessClass();
 
 
@@ -78,7 +80,7 @@ public interface Process extends DomElement {
 	 * @return the value of the defaultNodeGroup child.
 	 */
 	@NotNull
-	@com.intellij.util.xml.Attribute ("defaultNodeGroup")
+	@com.intellij.util.xml.Attribute (DEFAULT_NODE_GROUP)
 	GenericAttributeValue<String> getDefaultNodeGroup();