diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e599098c..f8f8e70e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,9 +6,7 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetArrayLinks.java" afterDir="false" />
-    </list>
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/Common/Visual/DataControl_OLD.java b/src/Common/Visual/DataControl_OLD.java
deleted file mode 100644
index d38a5943..00000000
--- a/src/Common/Visual/DataControl_OLD.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package Common.Visual;
-import Common.Current_;
-public interface DataControl_OLD {
-    //todo скорее всего устареет.
-    default Current_ getCurrent() {
-        return null;
-    }
-    //-?
-    default void ShowCurrentObject() throws Exception {
-    }
-    default void ShowNoCurrentObject() throws Exception {
-    }
-}
diff --git a/src/Common/Visual/Trees/DataTree.java b/src/Common/Visual/Trees/DataTree.java
index dbb246c3..565010b4 100644
--- a/src/Common/Visual/Trees/DataTree.java
+++ b/src/Common/Visual/Trees/DataTree.java
@@ -1,22 +1,23 @@
 package Common.Visual.Trees;
+import Common.Current_;
 import Common.MainModule_;
 import Common.Utils.Utils_;
-import Common.Visual.DataControl_OLD;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;
-public class DataTree extends StyledTree implements DataControl_OLD {
+public class DataTree extends StyledTree{
     public DataTree(DefaultMutableTreeNode root_in) {
         super(root_in);
     }
     public void ChangeCurrentObject(DefaultMutableTreeNode node) {
-        if (getCurrent() != null)
-            MainModule_.instance.set(getCurrent(), node.getUserObject());
+        if (currentName() != null)
+            MainModule_.instance.set(currentName(), node.getUserObject());
+    }
+    public Current_ currentName() {
+        return null;
     }
-    @Override
     public void ShowCurrentObject() throws Exception {
     }
-    @Override
     public void ShowNoCurrentObject() throws Exception {
     }
     @Override
diff --git a/src/Common/Visual/Trees/SelectableTree.java b/src/Common/Visual/Trees/SelectableTree.java
index f1c098fa..c395216c 100644
--- a/src/Common/Visual/Trees/SelectableTree.java
+++ b/src/Common/Visual/Trees/SelectableTree.java
@@ -9,7 +9,7 @@ public class SelectableTree extends DataTree {
     }
     @Override
     public void LeftMouseAction1() {
-        Object element = MainModule_.instance.get(getCurrent());
+        Object element = MainModule_.instance.get(currentName());
         if ((element instanceof Selectable)) {
             ((Selectable) element).SwitchSelection();
             updateUI();
diff --git a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
index 8f1c3c8a..41163982 100644
--- a/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
+++ b/src/_VisualDVM/GlobalData/RemoteFile/UI/RemoteFilesTree.java
@@ -11,7 +11,7 @@ public class RemoteFilesTree extends DataTree {
         return RendererTreeRemoteFile.class;
     }
     @Override
-    public Current getCurrent() {
+    public Current currentName() {
         return Current.RemoteFile;
     }
     @Override
diff --git a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
index fd5e44f7..13d8207d 100644
--- a/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
+++ b/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
@@ -72,7 +72,7 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
                             });
                         }
                         @Override
-                        public Current getCurrent() {
+                        public Current currentName() {
                             return Current.ComponentServerBackup;
                         }
                     };
diff --git a/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java b/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
index f1c934b9..7b2493a2 100644
--- a/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
+++ b/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java
@@ -17,13 +17,13 @@ public class FileGraphTree extends DataTree {
         return GraphTreeCellRenderer.class;
     }
     @Override
-    public Current getCurrent() {
+    public Current currentName() {
         return Current.FileGraphElement;
     }
     @Override
     public void ShowCurrentObject() throws Exception {
         Global.mainModule.getFile().form.EventsOff();
-        Object o = Global.mainModule.get(getCurrent());
+        Object o = Global.mainModule.get(currentName());
         Global.mainModule.getFile().form.getEditor().gotoLine((o instanceof FileObjectWithMessages) ? (((FileObjectWithMessages) o).line) : 1);
         Global.mainModule.getFile().form.ShowMessages();
         Global.mainModule.getFile().form.EventsOn();
diff --git a/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java b/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
index 40aa8c72..7d8d8536 100644
--- a/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
+++ b/src/_VisualDVM/ProjectData/Project/UI/VersionsTree.java
@@ -34,7 +34,7 @@ public class VersionsTree extends DataTree {
         return RendererProjectVersion.class;
     }
     @Override
-    public Current getCurrent() {
+    public Current currentName() {
         return Current.Version;
     }
     public void SelectCurrentProject() {
@@ -48,7 +48,7 @@ public class VersionsTree extends DataTree {
     public void LeftMouseAction1() {
         if (Global.versions_multiselection) {
             // только если есть режим выбора версий.
-            Object element = Global.mainModule.get(getCurrent());
+            Object element = Global.mainModule.get(currentName());
             if ((element instanceof Selectable)) {
                 ((Selectable) element).SwitchSelection();
                 updateUI();
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
index 6ec6864b..eb3b205b 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree.java
@@ -14,12 +14,12 @@ public class InlineTree extends SelectableTree {
         return SelectionTreeCellRenderer.class;
     }
     @Override
-    public Current getCurrent() {
+    public Current currentName() {
         return Current.InlineGraphElement;
     }
     @Override
     public void ShowCurrentObject() {
-        Object o = Global.mainModule.get(getCurrent());
+        Object o = Global.mainModule.get(currentName());
         if (o instanceof FileObject) {
             ((FileObject) o).Show(false);
         }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
index c7b6e97f..37dd64de 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Functions/UI/InlineTree2.java
@@ -14,7 +14,7 @@ public class InlineTree2 extends SelectableTree {
         return SelectionTreeCellRenderer.class;
     }
     @Override
-    public Current getCurrent() {
+    public Current currentName() {
         return Current.InlineGraphElement2;
     }
     @Override
@@ -23,7 +23,7 @@ public class InlineTree2 extends SelectableTree {
     }
     @Override
     public void ShowCurrentObject() {
-        Object o = Global.mainModule.get(getCurrent());
+        Object o = Global.mainModule.get(currentName());
         if (o instanceof FileObject) {
             ((FileObject) o).Show(false);
         }
diff --git a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java
index e69ed63d..97ec42e8 100644
--- a/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java
+++ b/src/_VisualDVM/ProjectData/SapforData/Includes/UI/IncludesTree.java
@@ -9,7 +9,7 @@ public class IncludesTree extends SelectableTree {
         super(Global.mainModule.getProject().includes_root);
     }
     @Override
-    public Current getCurrent() {
+    public Current currentName() {
         return Current.IncludeGraphElement;
     }
     @Override
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
index ec5ecf31..7c492420 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java
@@ -26,7 +26,7 @@ public class SapforTasksPackageTree extends DataTree {
         return RendererTreeSapforVersions.class;
     }
     @Override
-    public Current getCurrent() {
+    public Current currentName() {
         return current;
     }
     public void selectSamePath_r(TreePath example, int index, DefaultMutableTreeNode node, Vector<DefaultMutableTreeNode> res) {
diff --git a/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java b/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
index 1fb278a1..80339f7d 100644
--- a/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
+++ b/src/_VisualDVM/Visual/Menus/SelectionTreeMenu.java
@@ -43,7 +43,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
         m_select_for_current.addActionListener(new AbstractAction() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                Object o = Global.mainModule.get(tree.getCurrent());
+                Object o = Global.mainModule.get(tree.currentName());
                 if (o instanceof Selectable) {
                     ((Selectable) o).SelectAllChildren(true);
                 }
@@ -56,7 +56,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
         m_unselect_for_current.addActionListener(new AbstractAction() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                Object o = Global.mainModule.get(tree.getCurrent());
+                Object o = Global.mainModule.get(tree.currentName());
                 if (o instanceof Selectable) {
                     ((Selectable) o).SelectAllChildren(false);
                 }
@@ -70,7 +70,7 @@ public abstract class SelectionTreeMenu extends GraphMenu<DataTree> {
     public abstract void SelectAll(boolean select);
     @Override
     public void CheckElementsVisibility() {
-        Object current = Global.mainModule.get(tree.getCurrent());
+        Object current = Global.mainModule.get(tree.currentName());
         if ((current != null) && (current.getClass().equals(getTargetClass()))) {
             String name = ((Selectable) current).getSelectionText();
             m_select_for_current.setText("Выбрать всё для " +