From 3aeafc9ff5292d4e6e5e543c2e5182c51a660c1c Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Tue, 15 Sep 2015 20:41:59 +0300
Subject: [PATCH] [vcs-log] replace Simple:NODE with just Node text for
 NodePrintElement

---
 .../com/intellij/vcs/log/graph/StrUtils.kt    |  2 +-
 .../elementGenerator/longEdges_out.txt        | 26 +++++------
 .../elementGenerator/manyNodes_out.txt        | 16 +++----
 .../testData/elementGenerator/oneNode_out.txt |  2 +-
 .../elementGenerator/oneUpOneDown1_out.txt    | 32 ++++++-------
 .../elementGenerator/oneUpOneDown2_out.txt    | 46 +++++++++----------
 .../elementGenerator/specialElements_out.txt  | 10 ++--
 7 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/StrUtils.kt b/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/StrUtils.kt
index 195ebecf2976..7eca0a15420f 100644
--- a/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/StrUtils.kt
+++ b/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/StrUtils.kt
@@ -62,7 +62,7 @@ fun PrintElementWithGraphElement.asString(): String {
   val sel = if (isSelected()) "Select" else "Unselect"
   return when (this) {
     is NodePrintElement -> {
-      "Simple:NODE|-$row:${pos}|-$color:${sel}($element)"
+      "Node|-$row:${pos}|-$color:${sel}($element)"
     }
     is EdgePrintElement -> {
       val t = getType()
diff --git a/platform/vcs-log/graph/testData/elementGenerator/longEdges_out.txt b/platform/vcs-log/graph/testData/elementGenerator/longEdges_out.txt
index 50f72a31f891..63a813c133ad 100644
--- a/platform/vcs-log/graph/testData/elementGenerator/longEdges_out.txt
+++ b/platform/vcs-log/graph/testData/elementGenerator/longEdges_out.txt
@@ -1,4 +1,4 @@
-Simple:NODE|-0:0|-0:Unselect(0_U)
+Node|-0:0|-0:Unselect(0_U)
   Edge:DOWN:SOLID|-0:0:0|-12:Unselect(0:12:n_U)
   Edge:DOWN:SOLID|-0:0:1|-1:Unselect(0:1:n_U)
   Edge:DOWN:SOLID|-0:0:2|-2:Unselect(0:2:n_U)
@@ -13,7 +13,7 @@ Simple:NODE|-0:0|-0:Unselect(0_U)
   Edge:DOWN:SOLID|-0:0:11|-11:Unselect(0:11:n_U)
 Edge:UP:SOLID|-1:0:0|-12:Unselect(0:12:n_U)
   Edge:DOWN_ARROW:SOLID|-1:0:0|-12:Unselect(0:12:n_U)
-  Simple:NODE|-1:1|-1:Unselect(1_U)
+  Node|-1:1|-1:Unselect(1_U)
   Edge:UP:SOLID|-1:1:0|-1:Unselect(0:1:n_U)
   Edge:DOWN:SOLID|-1:1:1|-13:Unselect(1:12:n_U)
   Edge:UP:SOLID|-1:2:0|-2:Unselect(0:2:n_U)
@@ -40,7 +40,7 @@ Edge:UP:SOLID|-2:0:0|-12:Unselect(0:12:n_U)
   Edge:DOWN_ARROW:SOLID|-2:0:0|-12:Unselect(0:12:n_U)
   Edge:UP:SOLID|-2:1:1|-13:Unselect(1:12:n_U)
   Edge:DOWN_ARROW:SOLID|-2:1:0|-13:Unselect(1:12:n_U)
-  Simple:NODE|-2:2|-2:Unselect(2_U)
+  Node|-2:2|-2:Unselect(2_U)
   Edge:UP:SOLID|-2:2:2|-2:Unselect(0:2:n_U)
   Edge:DOWN:SOLID|-2:2:1|-14:Unselect(2:12:n_U)
   Edge:UP:SOLID|-2:3:3|-3:Unselect(0:3:n_U)
@@ -65,7 +65,7 @@ Edge:UP:SOLID|-3:0:1|-13:Unselect(1:12:n_U)
   Edge:DOWN_ARROW:SOLID|-3:0:0|-13:Unselect(1:12:n_U)
   Edge:UP:SOLID|-3:1:2|-14:Unselect(2:12:n_U)
   Edge:DOWN_ARROW:SOLID|-3:1:0|-14:Unselect(2:12:n_U)
-  Simple:NODE|-3:2|-3:Unselect(3_U)
+  Node|-3:2|-3:Unselect(3_U)
   Edge:UP:SOLID|-3:2:3|-3:Unselect(0:3:n_U)
   Edge:DOWN:SOLID|-3:2:1|-15:Unselect(3:12:n_U)
   Edge:UP:SOLID|-3:3:4|-4:Unselect(0:4:n_U)
@@ -78,7 +78,7 @@ Edge:UP:SOLID|-4:0:1|-14:Unselect(2:12:n_U)
   Edge:DOWN_ARROW:SOLID|-4:0:0|-14:Unselect(2:12:n_U)
   Edge:UP:SOLID|-4:1:2|-15:Unselect(3:12:n_U)
   Edge:DOWN:SOLID|-4:1:0|-15:Unselect(3:12:n_U)
-  Simple:NODE|-4:2|-4:Unselect(4_U)
+  Node|-4:2|-4:Unselect(4_U)
   Edge:UP:SOLID|-4:2:3|-4:Unselect(0:4:n_U)
   Edge:DOWN:SOLID|-4:2:1|-16:Unselect(4:12:n_U)
   Edge:UP:SOLID|-4:3:4|-5:Unselect(0:5:n_U)
@@ -89,7 +89,7 @@ Edge:UP:SOLID|-5:0:1|-15:Unselect(3:12:n_U)
   Edge:DOWN_ARROW:SOLID|-5:0:0|-15:Unselect(3:12:n_U)
   Edge:UP:SOLID|-5:1:2|-16:Unselect(4:12:n_U)
   Edge:DOWN:SOLID|-5:1:0|-16:Unselect(4:12:n_U)
-  Simple:NODE|-5:2|-5:Unselect(5_U)
+  Node|-5:2|-5:Unselect(5_U)
   Edge:UP:SOLID|-5:2:3|-5:Unselect(0:5:n_U)
   Edge:DOWN:SOLID|-5:2:1|-17:Unselect(5:12:n_U)
   Edge:UP:SOLID|-5:3:4|-6:Unselect(0:6:n_U)
@@ -100,7 +100,7 @@ Edge:UP:SOLID|-6:0:1|-16:Unselect(4:12:n_U)
   Edge:DOWN_ARROW:SOLID|-6:0:0|-16:Unselect(4:12:n_U)
   Edge:UP:SOLID|-6:1:2|-17:Unselect(5:12:n_U)
   Edge:DOWN:SOLID|-6:1:0|-17:Unselect(5:12:n_U)
-  Simple:NODE|-6:2|-6:Unselect(6_U)
+  Node|-6:2|-6:Unselect(6_U)
   Edge:UP:SOLID|-6:2:3|-6:Unselect(0:6:n_U)
   Edge:DOWN:SOLID|-6:2:1|-18:Unselect(6:12:n_U)
   Edge:UP:SOLID|-6:3:4|-7:Unselect(0:7:n_U)
@@ -111,7 +111,7 @@ Edge:UP:SOLID|-7:0:1|-17:Unselect(5:12:n_U)
   Edge:DOWN_ARROW:SOLID|-7:0:0|-17:Unselect(5:12:n_U)
   Edge:UP:SOLID|-7:1:2|-18:Unselect(6:12:n_U)
   Edge:DOWN:SOLID|-7:1:0|-18:Unselect(6:12:n_U)
-  Simple:NODE|-7:2|-7:Unselect(7_U)
+  Node|-7:2|-7:Unselect(7_U)
   Edge:UP:SOLID|-7:2:3|-7:Unselect(0:7:n_U)
   Edge:DOWN:SOLID|-7:2:1|-19:Unselect(7:12:n_U)
   Edge:UP:SOLID|-7:3:4|-8:Unselect(0:8:n_U)
@@ -122,7 +122,7 @@ Edge:UP:SOLID|-8:0:1|-18:Unselect(6:12:n_U)
   Edge:DOWN:SOLID|-8:0:0|-18:Unselect(6:12:n_U)
   Edge:UP:SOLID|-8:1:2|-19:Unselect(7:12:n_U)
   Edge:DOWN:SOLID|-8:1:1|-19:Unselect(7:12:n_U)
-  Simple:NODE|-8:2|-8:Unselect(8_U)
+  Node|-8:2|-8:Unselect(8_U)
   Edge:UP:SOLID|-8:2:3|-8:Unselect(0:8:n_U)
   Edge:DOWN:SOLID|-8:2:2|-20:Unselect(8:12:n_U)
   Edge:UP:SOLID|-8:3:4|-9:Unselect(0:9:n_U)
@@ -135,7 +135,7 @@ Edge:UP:SOLID|-9:0:0|-18:Unselect(6:12:n_U)
   Edge:DOWN:SOLID|-9:1:7|-19:Unselect(7:12:n_U)
   Edge:UP:SOLID|-9:2:2|-20:Unselect(8:12:n_U)
   Edge:DOWN:SOLID|-9:2:8|-20:Unselect(8:12:n_U)
-  Simple:NODE|-9:3|-9:Unselect(9_U)
+  Node|-9:3|-9:Unselect(9_U)
   Edge:UP:SOLID|-9:3:3|-9:Unselect(0:9:n_U)
   Edge:DOWN:SOLID|-9:3:9|-21:Unselect(9:12:n_U)
   Edge:UP_ARROW:SOLID|-9:4:4|-10:Unselect(0:10:n_U)
@@ -162,7 +162,7 @@ Edge:UP_ARROW:SOLID|-10:0:0|-12:Unselect(0:12:n_U)
   Edge:DOWN:SOLID|-10:8:8|-20:Unselect(8:12:n_U)
   Edge:UP:SOLID|-10:9:3|-21:Unselect(9:12:n_U)
   Edge:DOWN:SOLID|-10:9:9|-21:Unselect(9:12:n_U)
-  Simple:NODE|-10:10|-10:Unselect(10_U)
+  Node|-10:10|-10:Unselect(10_U)
   Edge:UP:SOLID|-10:10:4|-10:Unselect(0:10:n_U)
   Edge:DOWN:SOLID|-10:10:10|-22:Unselect(10:12:n_U)
   Edge:UP_ARROW:SOLID|-10:11:5|-11:Unselect(0:11:n_U)
@@ -189,10 +189,10 @@ Edge:UP_ARROW:SOLID|-11:0:0|-12:Unselect(0:12:n_U)
   Edge:DOWN:SOLID|-11:9:0|-21:Unselect(9:12:n_U)
   Edge:UP:SOLID|-11:10:10|-22:Unselect(10:12:n_U)
   Edge:DOWN:SOLID|-11:10:0|-22:Unselect(10:12:n_U)
-  Simple:NODE|-11:11|-11:Unselect(11_U)
+  Node|-11:11|-11:Unselect(11_U)
   Edge:UP:SOLID|-11:11:11|-11:Unselect(0:11:n_U)
   Edge:DOWN:SOLID|-11:11:0|-23:Unselect(11:12:n_U)
-Simple:NODE|-12:0|-12:Unselect(12_U)
+Node|-12:0|-12:Unselect(12_U)
   Edge:UP:SOLID|-12:0:0|-12:Unselect(0:12:n_U)
   Edge:UP:SOLID|-12:0:1|-13:Unselect(1:12:n_U)
   Edge:UP:SOLID|-12:0:2|-14:Unselect(2:12:n_U)
diff --git a/platform/vcs-log/graph/testData/elementGenerator/manyNodes_out.txt b/platform/vcs-log/graph/testData/elementGenerator/manyNodes_out.txt
index 2e9974476555..7899a7e78541 100644
--- a/platform/vcs-log/graph/testData/elementGenerator/manyNodes_out.txt
+++ b/platform/vcs-log/graph/testData/elementGenerator/manyNodes_out.txt
@@ -1,10 +1,10 @@
-Simple:NODE|-0:0|-0:Unselect(0_U)
+Node|-0:0|-0:Unselect(0_U)
   Edge:DOWN:SOLID|-0:0:0|-6:Unselect(0:6:n_U)
   Edge:DOWN:SOLID|-0:0:1|-1:Unselect(0:1:n_U)
   Edge:DOWN:SOLID|-0:0:2|-3:Unselect(0:3:n_U)
 Edge:UP:SOLID|-1:0:0|-6:Unselect(0:6:n_U)
   Edge:DOWN:SOLID|-1:0:0|-6:Unselect(0:6:n_U)
-  Simple:NODE|-1:1|-1:Unselect(1_U)
+  Node|-1:1|-1:Unselect(1_U)
   Edge:UP:SOLID|-1:1:0|-1:Unselect(0:1:n_U)
   Edge:DOWN:DASHED|-1:1:1|-7:Unselect(1:6:n_D)
   Edge:UP:SOLID|-1:2:0|-3:Unselect(0:3:n_U)
@@ -15,30 +15,30 @@ Edge:UP:SOLID|-2:0:0|-6:Unselect(0:6:n_U)
   Edge:DOWN:DASHED|-2:1:1|-7:Unselect(1:6:n_D)
   Edge:UP:SOLID|-2:2:2|-3:Unselect(0:3:n_U)
   Edge:DOWN:SOLID|-2:2:2|-3:Unselect(0:3:n_U)
-  Simple:NODE|-2:3|-2:Unselect(2_U)
+  Node|-2:3|-2:Unselect(2_U)
   Edge:DOWN:SOLID|-2:3:2|-5:Unselect(2:3:n_U)
 Edge:UP:SOLID|-3:0:0|-6:Unselect(0:6:n_U)
   Edge:DOWN:SOLID|-3:0:0|-6:Unselect(0:6:n_U)
   Edge:UP:DASHED|-3:1:1|-7:Unselect(1:6:n_D)
   Edge:DOWN:DASHED|-3:1:1|-7:Unselect(1:6:n_D)
-  Simple:NODE|-3:2|-3:Unselect(3_U)
+  Node|-3:2|-3:Unselect(3_U)
   Edge:UP:SOLID|-3:2:2|-3:Unselect(0:3:n_U)
   Edge:UP:SOLID|-3:2:3|-5:Unselect(2:3:n_U)
 Edge:UP:SOLID|-4:0:0|-6:Unselect(0:6:n_U)
   Edge:DOWN:SOLID|-4:0:0|-6:Unselect(0:6:n_U)
   Edge:UP:DASHED|-4:1:1|-7:Unselect(1:6:n_D)
   Edge:DOWN:DASHED|-4:1:1|-7:Unselect(1:6:n_D)
-  Simple:NODE|-4:2|-4:Unselect(4_U)
+  Node|-4:2|-4:Unselect(4_U)
   Edge:DOWN:SOLID|-4:2:2|-9:Unselect(4:5:n_U)
 Edge:UP:SOLID|-5:0:0|-6:Unselect(0:6:n_U)
   Edge:DOWN:SOLID|-5:0:0|-6:Unselect(0:6:n_U)
   Edge:UP:DASHED|-5:1:1|-7:Unselect(1:6:n_D)
   Edge:DOWN:DASHED|-5:1:0|-7:Unselect(1:6:n_D)
-  Simple:NODE|-5:2|-5:Unselect(5_U)
+  Node|-5:2|-5:Unselect(5_U)
   Edge:UP:SOLID|-5:2:2|-9:Unselect(4:5:n_U)
-Simple:NODE|-6:0|-6:Unselect(6_U)
+Node|-6:0|-6:Unselect(6_U)
   Edge:UP:SOLID|-6:0:0|-6:Unselect(0:6:n_U)
   Edge:UP:DASHED|-6:0:1|-7:Unselect(1:6:n_D)
   Edge:DOWN:SOLID|-6:0:0|-13:Unselect(6:7:n_U)
-Simple:NODE|-7:0|-7:Unselect(7_U)
+Node|-7:0|-7:Unselect(7_U)
   Edge:UP:SOLID|-7:0:0|-13:Unselect(6:7:n_U)
\ No newline at end of file
diff --git a/platform/vcs-log/graph/testData/elementGenerator/oneNode_out.txt b/platform/vcs-log/graph/testData/elementGenerator/oneNode_out.txt
index b996a7b77d29..a3948e221818 100644
--- a/platform/vcs-log/graph/testData/elementGenerator/oneNode_out.txt
+++ b/platform/vcs-log/graph/testData/elementGenerator/oneNode_out.txt
@@ -1 +1 @@
-Simple:NODE|-0:0|-0:Unselect(0_U)
\ No newline at end of file
+Node|-0:0|-0:Unselect(0_U)
\ No newline at end of file
diff --git a/platform/vcs-log/graph/testData/elementGenerator/oneUpOneDown1_out.txt b/platform/vcs-log/graph/testData/elementGenerator/oneUpOneDown1_out.txt
index 15f61d66f2eb..dcc00f81f0d6 100644
--- a/platform/vcs-log/graph/testData/elementGenerator/oneUpOneDown1_out.txt
+++ b/platform/vcs-log/graph/testData/elementGenerator/oneUpOneDown1_out.txt
@@ -1,32 +1,32 @@
-Simple:NODE|-0:0|-0:Unselect(0_U)
+Node|-0:0|-0:Unselect(0_U)
   Edge:DOWN:SOLID|-0:0:0|-1:Unselect(0:1:n_U)
   Edge:DOWN:SOLID|-0:0:1|-7:Unselect(0:7:n_U)
-Simple:NODE|-1:0|-1:Unselect(1_U)
+Node|-1:0|-1:Unselect(1_U)
   Edge:UP:SOLID|-1:0:0|-1:Unselect(0:1:n_U)
   Edge:DOWN:SOLID|-1:0:0|-3:Unselect(1:2:n_U)
   Edge:UP:SOLID|-1:1:0|-7:Unselect(0:7:n_U)
   Edge:DOWN_ARROW:SOLID|-1:1:1|-7:Unselect(0:7:n_U)
-Simple:NODE|-2:0|-2:Unselect(2_U)
+Node|-2:0|-2:Unselect(2_U)
   Edge:UP:SOLID|-2:0:0|-3:Unselect(1:2:n_U)
   Edge:DOWN:SOLID|-2:0:0|-5:Unselect(2:3:n_U)
-Simple:NODE|-3:0|-3:Unselect(3_U)
+Node|-3:0|-3:Unselect(3_U)
   Edge:UP:SOLID|-3:0:0|-5:Unselect(2:3:n_U)
   Edge:DOWN:SOLID|-3:0:0|-15:Unselect(3:12:n_U)
   Edge:DOWN:SOLID|-3:0:1|-7:Unselect(3:4:n_U)
 Edge:UP:SOLID|-4:0:0|-15:Unselect(3:12:n_U)
   Edge:DOWN_ARROW:SOLID|-4:0:0|-15:Unselect(3:12:n_U)
-  Simple:NODE|-4:1|-4:Unselect(4_U)
+  Node|-4:1|-4:Unselect(4_U)
   Edge:UP:SOLID|-4:1:0|-7:Unselect(3:4:n_U)
   Edge:DOWN:SOLID|-4:1:0|-9:Unselect(4:5:n_U)
   Edge:DOWN:SOLID|-4:1:1|-10:Unselect(4:6:n_U)
-Simple:NODE|-5:0|-5:Unselect(5_U)
+Node|-5:0|-5:Unselect(5_U)
   Edge:UP:SOLID|-5:0:1|-9:Unselect(4:5:n_U)
   Edge:DOWN:SOLID|-5:0:0|-13:Unselect(5:8:n_U)
   Edge:UP:SOLID|-5:1:1|-10:Unselect(4:6:n_U)
   Edge:DOWN:SOLID|-5:1:1|-10:Unselect(4:6:n_U)
 Edge:UP:SOLID|-6:0:0|-13:Unselect(5:8:n_U)
   Edge:DOWN:SOLID|-6:0:0|-13:Unselect(5:8:n_U)
-  Simple:NODE|-6:1|-6:Unselect(6_U)
+  Node|-6:1|-6:Unselect(6_U)
   Edge:UP:SOLID|-6:1:1|-10:Unselect(4:6:n_U)
   Edge:DOWN:SOLID|-6:1:1|-14:Unselect(6:8:n_U)
   Edge:UP_ARROW:SOLID|-6:2:2|-7:Unselect(0:7:n_U)
@@ -35,44 +35,44 @@ Edge:UP:SOLID|-7:0:0|-13:Unselect(5:8:n_U)
   Edge:DOWN:SOLID|-7:0:0|-13:Unselect(5:8:n_U)
   Edge:UP:SOLID|-7:1:1|-14:Unselect(6:8:n_U)
   Edge:DOWN:SOLID|-7:1:0|-14:Unselect(6:8:n_U)
-  Simple:NODE|-7:2|-7:Unselect(7_U)
+  Node|-7:2|-7:Unselect(7_U)
   Edge:UP:SOLID|-7:2:2|-7:Unselect(0:7:n_U)
   Edge:DOWN:SOLID|-7:2:1|-22:Unselect(7:15:n_U)
-Simple:NODE|-8:0|-8:Unselect(8_U)
+Node|-8:0|-8:Unselect(8_U)
   Edge:UP:SOLID|-8:0:0|-13:Unselect(5:8:n_U)
   Edge:UP:SOLID|-8:0:1|-14:Unselect(6:8:n_U)
   Edge:DOWN:SOLID|-8:0:0|-17:Unselect(8:9:n_U)
   Edge:DOWN:SOLID|-8:0:1|-18:Unselect(8:10:n_U)
   Edge:UP:SOLID|-8:1:2|-22:Unselect(7:15:n_U)
   Edge:DOWN_ARROW:SOLID|-8:1:1|-22:Unselect(7:15:n_U)
-Simple:NODE|-9:0|-9:Unselect(9_U)
+Node|-9:0|-9:Unselect(9_U)
   Edge:UP:SOLID|-9:0:0|-17:Unselect(8:9:n_U)
   Edge:DOWN:SOLID|-9:0:0|-20:Unselect(9:11:n_U)
   Edge:UP:SOLID|-9:1:0|-18:Unselect(8:10:n_U)
   Edge:DOWN:SOLID|-9:1:1|-18:Unselect(8:10:n_U)
 Edge:UP:SOLID|-10:0:0|-20:Unselect(9:11:n_U)
   Edge:DOWN:SOLID|-10:0:1|-20:Unselect(9:11:n_U)
-  Simple:NODE|-10:1|-10:Unselect(10_U)
+  Node|-10:1|-10:Unselect(10_U)
   Edge:UP:SOLID|-10:1:1|-18:Unselect(8:10:n_U)
   Edge:DOWN:SOLID|-10:1:1|-21:Unselect(10:11:n_U)
 Edge:UP_ARROW:SOLID|-11:0:0|-15:Unselect(3:12:n_U)
   Edge:DOWN:SOLID|-11:0:0|-15:Unselect(3:12:n_U)
-  Simple:NODE|-11:1|-11:Unselect(11_U)
+  Node|-11:1|-11:Unselect(11_U)
   Edge:UP:SOLID|-11:1:0|-20:Unselect(9:11:n_U)
   Edge:UP:SOLID|-11:1:1|-21:Unselect(10:11:n_U)
   Edge:DOWN:SOLID|-11:1:0|-23:Unselect(11:12:n_U)
-Simple:NODE|-12:0|-12:Unselect(12_U)
+Node|-12:0|-12:Unselect(12_U)
   Edge:UP:SOLID|-12:0:0|-15:Unselect(3:12:n_U)
   Edge:UP:SOLID|-12:0:1|-23:Unselect(11:12:n_U)
   Edge:DOWN:SOLID|-12:0:0|-25:Unselect(12:13:n_U)
-Simple:NODE|-13:0|-13:Unselect(13_U)
+Node|-13:0|-13:Unselect(13_U)
   Edge:UP:SOLID|-13:0:0|-25:Unselect(12:13:n_U)
   Edge:DOWN:SOLID|-13:0:0|-27:Unselect(13:14:n_U)
-Simple:NODE|-14:0|-14:Unselect(14_U)
+Node|-14:0|-14:Unselect(14_U)
   Edge:UP:SOLID|-14:0:0|-27:Unselect(13:14:n_U)
   Edge:DOWN:SOLID|-14:0:0|-29:Unselect(14:15:n_U)
   Edge:UP_ARROW:SOLID|-14:1:1|-22:Unselect(7:15:n_U)
   Edge:DOWN:SOLID|-14:1:0|-22:Unselect(7:15:n_U)
-Simple:NODE|-15:0|-15:Unselect(15_U)
+Node|-15:0|-15:Unselect(15_U)
   Edge:UP:SOLID|-15:0:0|-29:Unselect(14:15:n_U)
   Edge:UP:SOLID|-15:0:1|-22:Unselect(7:15:n_U)
\ No newline at end of file
diff --git a/platform/vcs-log/graph/testData/elementGenerator/oneUpOneDown2_out.txt b/platform/vcs-log/graph/testData/elementGenerator/oneUpOneDown2_out.txt
index ee2033927bce..432b7f54ecfb 100644
--- a/platform/vcs-log/graph/testData/elementGenerator/oneUpOneDown2_out.txt
+++ b/platform/vcs-log/graph/testData/elementGenerator/oneUpOneDown2_out.txt
@@ -1,36 +1,36 @@
-Simple:NODE|-0:0|-0:Unselect(0_U)
+Node|-0:0|-0:Unselect(0_U)
   Edge:DOWN:SOLID|-0:0:0|-1:Unselect(0:1:n_U)
   Edge:DOWN:SOLID|-0:0:1|-10:Unselect(0:10:n_U)
-Simple:NODE|-1:0|-1:Unselect(1_U)
+Node|-1:0|-1:Unselect(1_U)
   Edge:UP:SOLID|-1:0:0|-1:Unselect(0:1:n_U)
   Edge:DOWN:SOLID|-1:0:0|-3:Unselect(1:2:n_U)
   Edge:UP:SOLID|-1:1:0|-10:Unselect(0:10:n_U)
   Edge:DOWN_ARROW:SOLID|-1:1:1|-10:Unselect(0:10:n_U)
-Simple:NODE|-2:0|-2:Unselect(2_U)
+Node|-2:0|-2:Unselect(2_U)
   Edge:UP:SOLID|-2:0:0|-3:Unselect(1:2:n_U)
   Edge:DOWN:SOLID|-2:0:0|-5:Unselect(2:3:n_U)
-Simple:NODE|-3:0|-3:Unselect(3_U)
+Node|-3:0|-3:Unselect(3_U)
   Edge:UP:SOLID|-3:0:0|-5:Unselect(2:3:n_U)
   Edge:DOWN:SOLID|-3:0:0|-7:Unselect(3:4:n_U)
-Simple:NODE|-4:0|-4:Unselect(4_U)
+Node|-4:0|-4:Unselect(4_U)
   Edge:UP:SOLID|-4:0:0|-7:Unselect(3:4:n_U)
   Edge:DOWN:SOLID|-4:0:0|-9:Unselect(4:5:n_U)
-Simple:NODE|-5:0|-5:Unselect(5_U)
+Node|-5:0|-5:Unselect(5_U)
   Edge:UP:SOLID|-5:0:0|-9:Unselect(4:5:n_U)
   Edge:DOWN:SOLID|-5:0:0|-12:Unselect(5:7:n_U)
   Edge:DOWN:SOLID|-5:0:1|-11:Unselect(5:6:n_U)
 Edge:UP:SOLID|-6:0:0|-12:Unselect(5:7:n_U)
   Edge:DOWN:SOLID|-6:0:0|-12:Unselect(5:7:n_U)
-  Simple:NODE|-6:1|-6:Unselect(6_U)
+  Node|-6:1|-6:Unselect(6_U)
   Edge:UP:SOLID|-6:1:0|-11:Unselect(5:6:n_U)
   Edge:DOWN:SOLID|-6:1:1|-21:Unselect(6:15:n_U)
-Simple:NODE|-7:0|-7:Unselect(7_U)
+Node|-7:0|-7:Unselect(7_U)
   Edge:UP:SOLID|-7:0:0|-12:Unselect(5:7:n_U)
   Edge:DOWN:SOLID|-7:0:0|-15:Unselect(7:8:n_U)
   Edge:DOWN:SOLID|-7:0:1|-16:Unselect(7:9:n_U)
   Edge:UP:SOLID|-7:1:1|-21:Unselect(6:15:n_U)
   Edge:DOWN:SOLID|-7:1:2|-21:Unselect(6:15:n_U)
-Simple:NODE|-8:0|-8:Unselect(8_U)
+Node|-8:0|-8:Unselect(8_U)
   Edge:UP:SOLID|-8:0:0|-15:Unselect(7:8:n_U)
   Edge:DOWN:SOLID|-8:0:0|-19:Unselect(8:11:n_U)
   Edge:UP:SOLID|-8:1:0|-16:Unselect(7:9:n_U)
@@ -39,7 +39,7 @@ Simple:NODE|-8:0|-8:Unselect(8_U)
   Edge:DOWN:SOLID|-8:2:2|-21:Unselect(6:15:n_U)
 Edge:UP:SOLID|-9:0:0|-19:Unselect(8:11:n_U)
   Edge:DOWN:SOLID|-9:0:0|-19:Unselect(8:11:n_U)
-  Simple:NODE|-9:1|-9:Unselect(9_U)
+  Node|-9:1|-9:Unselect(9_U)
   Edge:UP:SOLID|-9:1:1|-16:Unselect(7:9:n_U)
   Edge:DOWN:SOLID|-9:1:1|-20:Unselect(9:11:n_U)
   Edge:UP:SOLID|-9:2:2|-21:Unselect(6:15:n_U)
@@ -52,10 +52,10 @@ Edge:UP:SOLID|-10:0:0|-19:Unselect(8:11:n_U)
   Edge:DOWN:SOLID|-10:1:0|-20:Unselect(9:11:n_U)
   Edge:UP:SOLID|-10:2:2|-21:Unselect(6:15:n_U)
   Edge:DOWN:SOLID|-10:2:1|-21:Unselect(6:15:n_U)
-  Simple:NODE|-10:3|-10:Unselect(10_U)
+  Node|-10:3|-10:Unselect(10_U)
   Edge:UP:SOLID|-10:3:3|-10:Unselect(0:10:n_U)
   Edge:DOWN:SOLID|-10:3:2|-32:Unselect(10:22:n_U)
-Simple:NODE|-11:0|-11:Unselect(11_U)
+Node|-11:0|-11:Unselect(11_U)
   Edge:UP:SOLID|-11:0:0|-19:Unselect(8:11:n_U)
   Edge:UP:SOLID|-11:0:1|-20:Unselect(9:11:n_U)
   Edge:DOWN:SOLID|-11:0:0|-23:Unselect(11:12:n_U)
@@ -64,7 +64,7 @@ Simple:NODE|-11:0|-11:Unselect(11_U)
   Edge:DOWN:SOLID|-11:1:2|-21:Unselect(6:15:n_U)
   Edge:UP:SOLID|-11:2:3|-32:Unselect(10:22:n_U)
   Edge:DOWN_ARROW:SOLID|-11:2:2|-32:Unselect(10:22:n_U)
-Simple:NODE|-12:0|-12:Unselect(12_U)
+Node|-12:0|-12:Unselect(12_U)
   Edge:UP:SOLID|-12:0:0|-23:Unselect(11:12:n_U)
   Edge:DOWN:SOLID|-12:0:0|-26:Unselect(12:14:n_U)
   Edge:UP:SOLID|-12:1:0|-24:Unselect(11:13:n_U)
@@ -73,12 +73,12 @@ Simple:NODE|-12:0|-12:Unselect(12_U)
   Edge:DOWN:SOLID|-12:2:2|-21:Unselect(6:15:n_U)
 Edge:UP:SOLID|-13:0:0|-26:Unselect(12:14:n_U)
   Edge:DOWN:SOLID|-13:0:0|-26:Unselect(12:14:n_U)
-  Simple:NODE|-13:1|-13:Unselect(13_U)
+  Node|-13:1|-13:Unselect(13_U)
   Edge:UP:SOLID|-13:1:1|-24:Unselect(11:13:n_U)
   Edge:DOWN:SOLID|-13:1:0|-27:Unselect(13:14:n_U)
   Edge:UP:SOLID|-13:2:2|-21:Unselect(6:15:n_U)
   Edge:DOWN:SOLID|-13:2:1|-21:Unselect(6:15:n_U)
-Simple:NODE|-14:0|-14:Unselect(14_U)
+Node|-14:0|-14:Unselect(14_U)
   Edge:UP:SOLID|-14:0:0|-26:Unselect(12:14:n_U)
   Edge:UP:SOLID|-14:0:1|-27:Unselect(13:14:n_U)
   Edge:DOWN:SOLID|-14:0:0|-30:Unselect(14:16:n_U)
@@ -86,30 +86,30 @@ Simple:NODE|-14:0|-14:Unselect(14_U)
   Edge:DOWN:SOLID|-14:1:1|-21:Unselect(6:15:n_U)
 Edge:UP:SOLID|-15:0:0|-30:Unselect(14:16:n_U)
   Edge:DOWN:SOLID|-15:0:0|-30:Unselect(14:16:n_U)
-  Simple:NODE|-15:1|-15:Unselect(15_U)
+  Node|-15:1|-15:Unselect(15_U)
   Edge:UP:SOLID|-15:1:1|-21:Unselect(6:15:n_U)
   Edge:DOWN:SOLID|-15:1:0|-31:Unselect(15:16:n_U)
-Simple:NODE|-16:0|-16:Unselect(16_U)
+Node|-16:0|-16:Unselect(16_U)
   Edge:UP:SOLID|-16:0:0|-30:Unselect(14:16:n_U)
   Edge:UP:SOLID|-16:0:1|-31:Unselect(15:16:n_U)
   Edge:DOWN:SOLID|-16:0:0|-33:Unselect(16:17:n_U)
-Simple:NODE|-17:0|-17:Unselect(17_U)
+Node|-17:0|-17:Unselect(17_U)
   Edge:UP:SOLID|-17:0:0|-33:Unselect(16:17:n_U)
   Edge:DOWN:SOLID|-17:0:0|-35:Unselect(17:18:n_U)
-Simple:NODE|-18:0|-18:Unselect(18_U)
+Node|-18:0|-18:Unselect(18_U)
   Edge:UP:SOLID|-18:0:0|-35:Unselect(17:18:n_U)
   Edge:DOWN:SOLID|-18:0:0|-37:Unselect(18:19:n_U)
-Simple:NODE|-19:0|-19:Unselect(19_U)
+Node|-19:0|-19:Unselect(19_U)
   Edge:UP:SOLID|-19:0:0|-37:Unselect(18:19:n_U)
   Edge:DOWN:SOLID|-19:0:0|-39:Unselect(19:20:n_U)
-Simple:NODE|-20:0|-20:Unselect(20_U)
+Node|-20:0|-20:Unselect(20_U)
   Edge:UP:SOLID|-20:0:0|-39:Unselect(19:20:n_U)
   Edge:DOWN:SOLID|-20:0:0|-41:Unselect(20:21:n_U)
-Simple:NODE|-21:0|-21:Unselect(21_U)
+Node|-21:0|-21:Unselect(21_U)
   Edge:UP:SOLID|-21:0:0|-41:Unselect(20:21:n_U)
   Edge:DOWN:SOLID|-21:0:0|-43:Unselect(21:22:n_U)
   Edge:UP_ARROW:SOLID|-21:1:1|-32:Unselect(10:22:n_U)
   Edge:DOWN:SOLID|-21:1:0|-32:Unselect(10:22:n_U)
-Simple:NODE|-22:0|-22:Unselect(22_U)
+Node|-22:0|-22:Unselect(22_U)
   Edge:UP:SOLID|-22:0:0|-43:Unselect(21:22:n_U)
   Edge:UP:SOLID|-22:0:1|-32:Unselect(10:22:n_U)
\ No newline at end of file
diff --git a/platform/vcs-log/graph/testData/elementGenerator/specialElements_out.txt b/platform/vcs-log/graph/testData/elementGenerator/specialElements_out.txt
index 1943c201a48d..a22b542c33c5 100644
--- a/platform/vcs-log/graph/testData/elementGenerator/specialElements_out.txt
+++ b/platform/vcs-log/graph/testData/elementGenerator/specialElements_out.txt
@@ -1,4 +1,4 @@
-Simple:NODE|-0:0|-0:Unselect(0_G)
+Node|-0:0|-0:Unselect(0_G)
   Edge:DOWN:DASHED|-0:0:0|-4:Unselect(0:4:n_D)
   Edge:DOWN:SOLID|-0:0:1|-0:Unselect(0:n:10_N)
   Edge:DOWN:DASHED|-0:0:2|-0:Unselect(0:n:11_O)
@@ -10,13 +10,13 @@ Edge:UP:DASHED|-1:0:0|-4:Unselect(0:4:n_D)
   Edge:DOWN_ARROW:SOLID|-1:1:1|-0:Unselect(0:n:10_N)
   Edge:UP:DASHED|-1:2:0|-0:Unselect(0:n:11_O)
   Edge:DOWN_ARROW:DASHED|-1:2:2|-0:Unselect(0:n:11_O)
-  Simple:NODE|-1:3|-1:Unselect(1_U)
+  Node|-1:3|-1:Unselect(1_U)
   Edge:UP:DASHED|-1:3:1|-1:Unselect(n:1:0_P)
   Edge:UP_ARROW:DASHED|-1:4:4|-2:Unselect(n:2:0_P)
   Edge:DOWN:DASHED|-1:4:1|-2:Unselect(n:2:0_P)
 Edge:UP:DASHED|-2:0:0|-4:Unselect(0:4:n_D)
   Edge:DOWN:DASHED|-2:0:0|-4:Unselect(0:4:n_D)
-  Simple:NODE|-2:1|-2:Unselect(2_U)
+  Node|-2:1|-2:Unselect(2_U)
   Edge:UP:DASHED|-2:1:4|-2:Unselect(n:2:0_P)
   Edge:DOWN:DASHED|-2:1:1|-2:Unselect(2:n:3_O)
   Edge:DOWN:SOLID|-2:1:2|-2:Unselect(2:n:12_N)
@@ -26,6 +26,6 @@ Edge:UP:DASHED|-3:0:0|-4:Unselect(0:4:n_D)
   Edge:DOWN_ARROW:DASHED|-3:1:1|-2:Unselect(2:n:3_O)
   Edge:UP:SOLID|-3:2:1|-2:Unselect(2:n:12_N)
   Edge:DOWN_ARROW:SOLID|-3:2:2|-2:Unselect(2:n:12_N)
-  Simple:NODE|-3:3|-3:Unselect(3_G)
-Simple:NODE|-4:0|-4:Unselect(4_U)
+  Node|-3:3|-3:Unselect(3_G)
+Node|-4:0|-4:Unselect(4_U)
   Edge:UP:DASHED|-4:0:0|-4:Unselect(0:4:n_D)
\ No newline at end of file