++

решение проблемы совместимости с java 1.8._4xx

.idea/workspace.xml

@@ -7,10 +7,77 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/LineInfo/FileMetrics.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Common/Utils/Pair.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/LineInfo/MetricsJson.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Новая папка/properties" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/SQLITE/SQLiteDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Editor/BaseEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Editor/BaseEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/ComponentsSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/ComponentsSet.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DeleteRemoteWorkspace.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshSapforPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshSapforPackageResults.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/UpdateBugReportField.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/CloneServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/DeleteServerObjects.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/DBProjectFile.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/GCOV/GCOV_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/GCOV/GCOV_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Messages/Message.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/Project/db_project_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/AlignRule.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/AlignRule.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/DataDirective.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/DataDirective.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateLink.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateLink.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/FileObject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionParameterJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionParameterJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUIGreed.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUIGreed.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/EmailChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/EmailChecker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforTasksPackageTree.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FunctionsWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Interface/FunctionsWindow.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererDiff.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererDiff.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/ComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FileForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/FunctionsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/SearchReplaceForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

properties

@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\1887",
+  "ProjectsSearchDirectory": "E:\\BUG",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",

src/Common/Database/SQLITE/SQLiteDatabase.java

@@ -4,9 +4,9 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Tables.DBTable;
 import Common.Database.Tables.DBTableColumn;
 import Common.Passes.PassException;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
-import javafx.util.Pair;
 
 import java.io.File;
 import java.sql.*;

src/Common/Utils/Pair.java

@@ -0,0 +1,95 @@
+package Common.Utils;
+import java.io.Serializable;
+public class Pair<K, V> implements Serializable {
+    /**
+     * Key of this <code>Pair</code>.
+     */
+    private K key;
+    /**
+     * Value of this this <code>Pair</code>.
+     */
+    private V value;
+    /**
+     * Creates a new pair
+     *
+     * @param key   The key for this pair
+     * @param value The value to use for this pair
+     */
+    public Pair(K key, V value) {
+        this.key = key;
+        this.value = value;
+    }
+    /**
+     * Gets the key for this pair.
+     *
+     * @return key for this pair
+     */
+    public K getKey() {
+        return key;
+    }
+    /**
+     * Gets the value for this pair.
+     *
+     * @return value for this pair
+     */
+    public V getValue() {
+        return value;
+    }
+    /**
+     * <p><code>String</code> representation of this
+     * <code>Pair</code>.</p>
+     *
+     * <p>The default name/value delimiter '=' is always used.</p>
+     *
+     * @return <code>String</code> representation of this <code>Pair</code>
+     */
+    @Override
+    public String toString() {
+        return key + "=" + value;
+    }
+    /**
+     * <p>Generate a hash code for this <code>Pair</code>.</p>
+     *
+     * <p>The hash code is calculated using both the name and
+     * the value of the <code>Pair</code>.</p>
+     *
+     * @return hash code for this <code>Pair</code>
+     */
+    @Override
+    public int hashCode() {
+        // name's hashCode is multiplied by an arbitrary prime number (13)
+        // in order to make sure there is a difference in the hashCode between
+        // these two parameters:
+        //  name: a  value: aa
+        //  name: aa value: a
+        return key.hashCode() * 13 + (value == null ? 0 : value.hashCode());
+    }
+    /**
+     * <p>Test this <code>Pair</code> for equality with another
+     * <code>Object</code>.</p>
+     *
+     * <p>If the <code>Object</code> to be tested is not a
+     * <code>Pair</code> or is <code>null</code>, then this method
+     * returns <code>false</code>.</p>
+     *
+     * <p>Two <code>Pair</code>s are considered equal if and only if
+     * both the names and values are equal.</p>
+     *
+     * @param o the <code>Object</code> to test for
+     *          equality with this <code>Pair</code>
+     * @return <code>true</code> if the given <code>Object</code> is
+     * equal to this <code>Pair</code> else <code>false</code>
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o instanceof Pair) {
+            Pair pair = (Pair) o;
+            if (key != null ? !key.equals(pair.key) : pair.key != null) return false;
+            if (value != null ? !value.equals(pair.value) : pair.value != null) return false;
+            return true;
+        }
+        return false;
+    }
+}
+

src/Common/Visual/Editor/BaseEditor.java

@@ -1,11 +1,13 @@
 package Common.Visual.Editor;
 import Common.MainModule_;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import Common.Visual.Menus.StyledPopupMenu;
 import Common.Visual.Menus.TextEditorMenu;
 import Common.Visual.Themes.ThemeElement;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.DialogFields;
+import _VisualDVM.Utils;
 import _VisualDVM.Visual.Syntax.SPFEditorTheme;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 
@@ -15,6 +17,7 @@ import java.awt.*;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.net.URI;
+import java.util.Vector;
 public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogFields {
     protected final StyledPopupMenu menu;
     //  protected int changesCount = 0;
@@ -153,4 +156,20 @@ public class BaseEditor extends RSyntaxTextArea implements ThemeElement, DialogF
         menu.applyTheme();
         //меню связано с редактором. поэтому тема меняется только вместе с ним.
     }
+    //--
+    public Vector<Pair<Integer, Integer>> getErrorsForHightlight() {
+        Vector<Pair<Integer, Integer>> res = new Vector<>();
+        for (int i = 0; i < this.getLineCount(); ++i) {
+            try {
+                int start = getLineStartOffset(i);
+                int end = getLineEndOffset(i);
+                String line = this.getText(start, end);
+                if (Utils.isCrushedLine(line))
+                    res.add(new Pair<>(start, end));
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+        return res;
+    }
 }

src/_VisualDVM/ComponentsServer/Component/ComponentsSet.java

@@ -2,7 +2,6 @@ package _VisualDVM.ComponentsServer.Component;
 import Common.Database.Tables.DataSet;
 import Common.MainModule_;
 import Common.Visual.DataSetControlForm;
-import _VisualDVM.ComponentsServer.Component.PerformanceAnalyzer.PerformanceAnalyzer;
 import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor_F;
 import _VisualDVM.ComponentsServer.Component.UI.ComponentsForm;
 import _VisualDVM.Current;
@@ -18,7 +17,7 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
         put(ComponentType.Visualiser, Global.visualiser = new Visualiser());
         put(ComponentType.Sapfor_F, (Component) MainModule_.instance.set(Current.Sapfor, new Sapfor_F()));
         put(ComponentType.Visualizer_2, Global.visualizer_2);
-        put(ComponentType.PerformanceAnalyzer, Global.performanceAnalyzer = new PerformanceAnalyzer());
+        //   put(ComponentType.PerformanceAnalyzer, Global.performanceAnalyzer = new PerformanceAnalyzer());
         put(ComponentType.Instruction, new Instruction());
     }
     public boolean needChanges() {
@@ -75,7 +74,10 @@ public class ComponentsSet extends DataSet<ComponentType, Component> {
         return !bad_state;
     }
     public void initialVersionsCheck() {
-        for (Component component : Data.values())
+        for (Component component : Data.values()) {
+            System.out.println(component.getComponentType() + " initial version checking...");
             component.InitialVersionCheck();
+            System.out.println("done");
+        }
     }
 }

src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java

@@ -1,6 +1,7 @@
 package _VisualDVM.ComponentsServer.Component.Sapfor;
 import Common.CommonConstants;
 import Common.Passes.PassException;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
 import _VisualDVM.ComponentsServer.Component.OSDComponent;
@@ -14,7 +15,6 @@ import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.Utils;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/_VisualDVM/ComponentsServer/ComponentsServer.java

@@ -2,6 +2,7 @@ package _VisualDVM.ComponentsServer;
 import Common.Database.Database;
 import Common.Database.Objects.DBObject;
 import Common.Database.RepositoryRefuseException;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.ComponentsServer.BugReport.Json.BugReportAdditionJson;
@@ -20,7 +21,6 @@ import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.RepositoryServer;
 import _VisualDVM.Utils;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import java.io.BufferedWriter;

src/_VisualDVM/Constants.java

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1241;
+    public static final int version = 1242;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--

src/_VisualDVM/Global.java

@@ -158,13 +158,17 @@ public class Global {
     public static void NormalMode(int port) throws Exception {
         //-------------------------------->>
         mainModule = new MainModule();
+        System.out.println("main module initialization..");
         mainModule.Init();
+        System.out.println("DONE");
         //--
         CheckVisualiserDirectories();
         CreateLogAtComponentsPath();
         //-
+        System.out.println("connection to visualiser_2..");
         visualizer_2 = new Visualizer_2(port);
         visualizer_2.Connect();
+        System.out.println("DONE");
         visualizer_2.refreshPid();
         //если делать раньше, то не удастся убить сервер.
         if (Utils_.ContainsCyrillic(Utils_.getHomePath())) {
@@ -173,16 +177,27 @@ public class Global {
                     "Визуализатор завершает работу."); //
             FinishApplication();
         }
+        System.out.println("messages server starting..");
         messagesServer = new MessagesServer();
         messagesServer.Start();
+        System.out.println("DONE");
         components = new ComponentsSet();
+        System.out.println("component initial versions checking..");
         components.initialVersionsCheck();
+        System.out.println("DONE");
+        System.out.println("geting component actual versions..");
         Global.mainModule.getPass(PassCode.GetComponentsActualVersions).Do();
+        System.out.println("DONE");
+        System.out.println("validation component actual versions..");
         components.validateStates();
+        System.out.println("DONE");
         if (components.needChanges()) {
+            System.out.println("components need changes!!");
             boolean flag = true;
             do {
+                System.out.println("Show components window...");
                 Global.mainModule.getUI().getComponentsWindow().ShowDialog("");
+                System.out.println("DONE");
                 if (flag = (!components.validateStates())) {
                     if (!UI.Question("Обнаружены некорректные компоненты.Работа визуализатора невозможна.\n" +
                             "Вернуться к окну компонент"
@@ -278,6 +293,10 @@ public class Global {
     public static void Init(String... args) {
         System.out.println("VisualSapfor.jar started..");
         System.out.println("home directory is" + Utils_.Brackets(Utils_.getHomePath()));
+        System.out.println("args size = " + args.length);
+        for (int i = 0; i < args.length; ++i)
+            System.out.println("args[" + i + "]=" + Utils_.DQuotes(args[i]));
+        System.out.println("====");
         //--->
         try {
             SynchronizeProperties();

src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java

@@ -1,9 +1,9 @@
 package _VisualDVM.Passes.All;
+import Common.Utils.Pair;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.ComponentsServer.BugReport.BugReportState;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
-import javafx.util.Pair;
 public class DeleteBugReportFromServer extends ComponentsServerPass<BugReport> {
     @Override
     protected boolean canStart(Object... args) {

src/_VisualDVM/Passes/All/DeleteRemoteWorkspace.java

@@ -1,9 +1,9 @@
 package _VisualDVM.Passes.All;
+import Common.Utils.Pair;
 import _VisualDVM.ComponentsServer.SubscriberWorkspace.SubscriberWorkspace;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
-import javafx.util.Pair;
 public class DeleteRemoteWorkspace extends ComponentsServerPass<SubscriberWorkspace> {
     @Override
     public String getIconPath() {

src/_VisualDVM/Passes/All/DownloadDVMPackages.java

@@ -1,12 +1,12 @@
 package _VisualDVM.Passes.All;
 import Common.CommonConstants;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java

@@ -1,12 +1,12 @@
 package _VisualDVM.Passes.All;
 import Common.CommonConstants;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
-import javafx.util.Pair;
 
 import java.io.File;
 public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {

src/_VisualDVM/Passes/All/RefreshSapforPackageResults.java

@@ -1,12 +1,12 @@
 package _VisualDVM.Passes.All;
 import Common.CommonConstants;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
-import javafx.util.Pair;
 
 import java.io.File;
 public class RefreshSapforPackageResults extends TestingServerPass<SapforPackage> {

src/_VisualDVM/Passes/All/SPF_GetFileLineInfo.java

@@ -23,6 +23,25 @@ public class SPF_GetFileLineInfo extends SapforAnalysis {
     }
     @Override
     protected void unpack(String packed) throws Exception {
+
+                //----------------------------------------
+        String[] data_ = packed.split("@");
+        DBProjectFile file_ = null;
+        for (int i = 0; i < data_.length; ++i) {
+            String s = data_[i];
+            if (i % 2 == 0) {
+                file_ = target.db.files.Data.get(Utils_.toW(s));
+            } else {
+                String[] local = s.split("_");
+                int num = Integer.parseInt(local[0]);
+                target.numSPF += Integer.parseInt(local[1]);
+                target.numDVM += Integer.parseInt(local[2]);
+                if (file_ != null)
+                    file_.lines_count = num;
+                target.numLines += num;
+            }
+        }
+        /*
         MetricsJson metricsJson = Utils_.gson.fromJson(packed, MetricsJson.class);
         for (FileMetrics fileMetrics : metricsJson.allMetrics) {
             fileMetrics.file = Utils_.toW(fileMetrics.file);
@@ -30,7 +49,7 @@ public class SPF_GetFileLineInfo extends SapforAnalysis {
             DBProjectFile file = target.db.files.Data.get(fileMetrics.file);
             file.lines_count = fileMetrics.linesCount;
             //--
-            target.numLines+= fileMetrics.linesCount;
+            target.numLines += fileMetrics.linesCount;
             target.numSPF += fileMetrics.numSPF;
             target.numDVM += fileMetrics.numDVM;
             //--
@@ -38,6 +57,7 @@ public class SPF_GetFileLineInfo extends SapforAnalysis {
         target.UpdateDVMCount();
         target.UpdateSPFCount();
         target.UpdateLinesCount();
+         */
     }
     @Override
     protected void showDone() throws Exception {

src/_VisualDVM/Passes/All/SPF_GetGraphFunctionPositions.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Passes.All;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
@@ -9,7 +10,6 @@ import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
 import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
 import _VisualDVM.ProjectData.SapforData.Functions.Json.FunctionGraphPositionJson;
 import _VisualDVM.ProjectData.SapforData.Functions.Json.FunctionsGraphPositionsJson;
-import javafx.util.Pair;
 
 import java.util.Vector;
 public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
@@ -213,7 +213,7 @@ public class SPF_GetGraphFunctionPositions extends SilentSapforPass {
      */
     protected void unpack(String packed) throws Exception {
         FunctionsGraphPositionsJson positionsJson = Utils_.gson.fromJson(packed, FunctionsGraphPositionsJson.class);
-        for (FunctionGraphPositionJson positionJson: positionsJson.allPositions) {
+        for (FunctionGraphPositionJson positionJson : positionsJson.allPositions) {
             target.functionsGraph.addVertex(positionJson.functionName);
             target.functionsGraph.vertexCoordinates.put(positionJson.functionName, new Pair<>(positionJson.x, positionJson.y));
         }

src/_VisualDVM/Passes/All/SPF_GetGraphFunctions.java

@@ -1,6 +1,5 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
-import Common.Visual.UI;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
@@ -55,7 +54,7 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
             DBProjectFile projectFile = target.db.files.get(fileFunctionsJson.file);
             projectFile.saveFunctions(fileFunctionsJson.functions);
             //--
-            for (FuncInfo funcInfo: projectFile.function_decls.values()){
+            for (FuncInfo funcInfo : projectFile.function_decls.values()) {
                 if (!declarated_functions.containsKey(funcInfo.funcName))
                     declarated_functions.put(funcInfo.funcName, funcInfo);
             }
@@ -115,8 +114,8 @@ public class SPF_GetGraphFunctions extends SapforAnalysis {
             Global.mainModule.getFile().form.ShowFunctions();
         Global.mainModule.getPass(PassCode.SPF_GetGraphFunctionPositions).Do();
         //--
-        DBProjectFile main=target.getMainProgramUnit();
+        DBProjectFile main = target.getMainProgramUnit();
-        if (main!=null)
+        if (main != null)
             Global.mainModule.getUI().getMainWindow().getProjectWindow().getFilesTreeForm().getTree().RefreshNode(main.node);
     }
 }

src/_VisualDVM/Passes/All/SPF_InsertIncludesPass.java

@@ -4,8 +4,8 @@ import Common.Visual.Selectable;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforTransformation;
-import _VisualDVM.ProjectData.SapforData.Includes.Include;
 import _VisualDVM.ProjectData.SapforData.Includes.FileInfo;
+import _VisualDVM.ProjectData.SapforData.Includes.Include;
 
 import java.util.Vector;
 import java.util.stream.Collectors;

src/_VisualDVM/Passes/All/UpdateBugReportField.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Passes.All;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.ComponentsServer.BugReport.BugReportState;
@@ -8,7 +9,6 @@ import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Utils;
-import javafx.util.Pair;
 
 import java.io.Serializable;
 import java.util.Date;

src/_VisualDVM/Passes/Server/CloneServerObject.java

@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.Server;
 import Common.Database.Objects.riDBObject;
+import Common.Utils.Pair;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.Server.RepositoryServer;
 import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
 import _VisualDVM.Repository.Server.ServerCode;
-import javafx.util.Pair;
 public abstract class CloneServerObject<S extends RepositoryServer, D extends riDBObject> extends PublishServerObject<S, D> {
     public D src;
     public CloneServerObject(S server_in, Class<D> d_in) {

src/_VisualDVM/Passes/Server/DeleteServerObject.java

@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.Server;
 import Common.Database.Objects.DBObject;
+import Common.Utils.Pair;
 import _VisualDVM.Repository.Server.RepositoryServer;
 import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
-import javafx.util.Pair;
 public class DeleteServerObject<S extends RepositoryServer, D extends DBObject> extends ServerObjectPass<S, D> {
     public DeleteServerObject(S server_in, Class<D> d_in) {
         super(server_in, d_in);

src/_VisualDVM/Passes/Server/DeleteServerObjects.java

@@ -3,12 +3,12 @@ import Common.Database.Database;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import Common.Database.Tables.DBTable;
+import Common.Utils.Pair;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.Server.RepositoryServer;
 import _VisualDVM.Repository.Server.SafeServerExchangeUnit;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
-import javafx.util.Pair;
 
 import java.util.Vector;
 public class DeleteServerObjects<S extends RepositoryServer, D extends DBObject> extends RepositoryPass<S, Vector<Object>> {

src/_VisualDVM/Passes/Testing/ActualizeTestingPackages.java

@@ -1,12 +1,12 @@
 package _VisualDVM.Passes.Testing;
 import Common.Database.Tables.iDBTable;
+import Common.Utils.Pair;
 import _VisualDVM.ComponentsServer.UserAccount.AccountRole;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.TestingServerPass;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
-import javafx.util.Pair;
 
 import java.util.Vector;
 public abstract class ActualizeTestingPackages<P extends TestingPackage> extends TestingServerPass<Vector<Pair<Integer, Long>>> {

src/_VisualDVM/ProjectData/Files/DBProjectFile.java

@@ -1,4 +1,5 @@
 package _VisualDVM.ProjectData.Files;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
@@ -14,12 +15,10 @@ import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncCall;
 import _VisualDVM.ProjectData.SapforData.Functions.FuncInfo;
 import _VisualDVM.ProjectData.SapforData.Functions.FunctionType;
-import _VisualDVM.ProjectData.SapforData.Includes.Include;
 import _VisualDVM.ProjectData.SapforData.Loops.Loop;
 import _VisualDVM.Utils;
 import _VisualDVM.Visual.Windows.FileForm;
 import com.sun.org.glassfish.gmbal.Description;
-import javafx.util.Pair;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
@@ -477,44 +476,43 @@ public class DBProjectFile extends ProjectFile {
         return res;
     }
     //---
-    public void saveLoops(List<Loop> loopNests_in){
+    public void saveLoops(List<Loop> loopNests_in) {
         AllLoops.clear();
         LoopNests.clear();
         //--
         LoopNests.addAll(loopNests_in);
-        for (Loop loop: LoopNests){
+        for (Loop loop : LoopNests) {
             loop.setFile(this.name);
             loop.toMap_r(AllLoops);
         }
-        LoopGraphTitle = "Всего циклов: " +AllLoops.size();
+        LoopGraphTitle = "Всего циклов: " + AllLoops.size();
     }
-    public void saveFunctions(List<FuncInfo> funcInfos_in) throws Exception{
+    public void saveFunctions(List<FuncInfo> funcInfos_in) throws Exception {
         function_decls.clear();
         int call_count = 0;
         //--
-        for (FuncInfo funcInfo: funcInfos_in){
+        for (FuncInfo funcInfo : funcInfos_in) {
             //--
             funcInfo.file = this.name;
             funcInfo.ownCalls = new LinkedHashMap<>();
             funcInfo.CheckMessagesPresence();
             //--
-            for (FuncCall call: funcInfo.callsFrom){
+            for (FuncCall call : funcInfo.callsFrom) {
                 call.file = this.name;
                 call.parentLineOffset = funcInfo.line - call.line;
                 call.CheckMessagesPresence();
             }
-            if (funcInfo.isMain!=0){
+            if (funcInfo.isMain != 0) {
                 isMain = 1;
                 funcInfo.type = FunctionType.Main;
                 father.main_function = funcInfo;
                 father.db.Update(this);
-            }else {
+            } else {
                 funcInfo.type = FunctionType.Default;
             }
             //--
             function_decls.put(funcInfo.funcName, funcInfo);
-            call_count+=funcInfo.callsFrom.size();
+            call_count += funcInfo.callsFrom.size();
-
         }
         //--
         CallGraphTitle = "Объявлений : " + function_decls.size() + "; Вызовов : " + call_count;

src/_VisualDVM/ProjectData/Files/UI/Editor/SPFEditor.java

@@ -1,4 +1,5 @@
 package _VisualDVM.ProjectData.Files.UI.Editor;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import Common.Visual.Editor.BaseEditor;
 import Common.Visual.Menus.StyledPopupMenu;
@@ -12,7 +13,6 @@ import _VisualDVM.Utils;
 import _VisualDVM.Visual.Editor.CaretInfo;
 import _VisualDVM.Visual.Interface.SPFEditorInterface;
 import _VisualDVM.Visual.Menus.MainEditorMenu;
-import javafx.util.Pair;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaHighlighter;
 
 import javax.swing.event.DocumentEvent;

src/_VisualDVM/ProjectData/Files/UI/FileGraphTree.java

@@ -24,11 +24,11 @@ public class FileGraphTree extends DataTree {
     public void ShowCurrentObject() throws Exception {
         Global.mainModule.getFile().form.EventsOff();
         Object o = Global.mainModule.get(currentName());
-        if (o instanceof FileObjectWithMessages){
+        if (o instanceof FileObjectWithMessages) {
             FileObjectWithMessages f = (FileObjectWithMessages) o;
             Global.mainModule.getFile().form.getEditor().gotoLine(f.line);
             Global.mainModule.getFile().form.ShowMessages(f);
-        }else {
+        } else {
             Global.mainModule.getFile().form.getEditor().gotoLine(1);
             Global.mainModule.getFile().form.ShowMessages();
         }

src/_VisualDVM/ProjectData/GCOV/GCOV_info.java

@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.GCOV;
-import javafx.util.Pair;
+import Common.Utils.Pair;
 
 import java.util.LinkedHashMap;
 public class GCOV_info {

src/_VisualDVM/ProjectData/Messages/Message.java

@@ -39,7 +39,7 @@ public class Message extends iDBObject {
         } else {
             if (Global.mainModule.HasProject()) {
                 value = !Global.mainModule.getProject().sapforProperties.TRANSLATE_MESSAGES ? value_in : decodeRussianMessage(value_in);
-            }else {
+            } else {
                 value = decodeRussianMessage(value_in);
             }
         }

src/_VisualDVM/ProjectData/Project/db_project_info.java

@@ -3,10 +3,7 @@ import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.MainModule_;
 import Common.Passes.PassException;
-import Common.Utils.Index;
+import Common.Utils.*;
-import Common.Utils.TextLog;
-import Common.Utils.Utils_;
-import Common.Utils.Vector_;
 import Common.Visual.UI;
 import _VisualDVM.Constants;
 import _VisualDVM.Current;
@@ -41,7 +38,6 @@ import _VisualDVM.ProjectData.SapforData.Variants.ParallelVariantsSet;
 import _VisualDVM.Utils;
 import com.mxgraph.swing.mxGraphComponent;
 import com.sun.org.glassfish.gmbal.Description;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -777,8 +773,8 @@ public class db_project_info extends DBObject {
                         if (call.funcName.equals(decl1.funcName)) {
                             if (!decl1.ownCalls.containsKey(call.file))
                                 decl1.ownCalls.put(call.file, new Vector<>());
-                            if (decl1.needToInline==1) call.Select(true);
+                            if (decl1.needToInline == 1) call.Select(true);
-                            call.canBeInlined = decl1.doNotInline==0;
+                            call.canBeInlined = decl1.doNotInline == 0;
                             decl1.ownCalls.get(call.file).add(call);
                             node.add(new DefaultMutableTreeNode(call));
                         }

src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/AlignRule.java

@@ -1,8 +1,8 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.Distribution;
 import Common.Utils.Index;
+import Common.Utils.Pair;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
-import javafx.util.Pair;
 
 import java.math.BigInteger;
 import java.util.Vector;

src/_VisualDVM/ProjectData/SapforData/Arrays/Distribution/DataDirective.java

@@ -1,7 +1,7 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.Distribution;
+import Common.Utils.Pair;
 import _VisualDVM.ProjectData.SapforData.Arrays.ArrayLocation;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
-import javafx.util.Pair;
 
 import java.math.BigInteger;
 import java.util.LinkedHashMap;

src/_VisualDVM/ProjectData/SapforData/Arrays/ProjectArray.java

@@ -1,6 +1,7 @@
 package _VisualDVM.ProjectData.SapforData.Arrays;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
@@ -12,7 +13,6 @@ import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateDimensionState
 import _VisualDVM.ProjectData.SapforData.Arrays.Templates.TemplateLink;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
 import _VisualDVM.ProjectData.SapforData.Regions.UI.ArrayAlignmentBar;
-import javafx.util.Pair;
 
 import javax.swing.*;
 import java.math.BigInteger;

src/_VisualDVM/ProjectData/SapforData/Arrays/Templates/TemplateLink.java

@@ -1,6 +1,6 @@
 package _VisualDVM.ProjectData.SapforData.Arrays.Templates;
 import Common.Utils.Index;
-import javafx.util.Pair;
+import Common.Utils.Pair;
 
 import java.util.Vector;
 public class TemplateLink {

src/_VisualDVM/ProjectData/SapforData/FileObject.java

@@ -1,5 +1,4 @@
 package _VisualDVM.ProjectData.SapforData;
-import Common.Database.Objects.iDBObject;
 import Common.Utils.Utils_;
 import Common.Visual.Selectable;
 import _VisualDVM.Global;
@@ -11,6 +10,9 @@ public class FileObject implements Selectable {
     public String file = "";
     @Expose
     public int line = 1;
+    //Selectable----
+    @Description("IGNORE")
+    boolean selected = false;
     public FileObject() {
     }
     public FileObject(String file_in) {
@@ -22,9 +24,6 @@ public class FileObject implements Selectable {
     public void Show(boolean focus) {
         Global.mainModule.getUI().getMainWindow().getProjectWindow().GotoFile(file, line, focus);
     }
-    //Selectable----
-    @Description("IGNORE")
-    boolean selected=false;
     public String getSelectionText() {
         return "файл " + Utils_.Brackets(file) + " строка: " + line;
     }
@@ -37,7 +36,7 @@ public class FileObject implements Selectable {
         selected = flag;
     }
     //-------
-    public void setFile(String file_in){
+    public void setFile(String file_in) {
         file = file_in;
     }
 }

src/_VisualDVM/ProjectData/SapforData/Functions/FuncCall.java

@@ -7,7 +7,7 @@ import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.FileObjectWithMessages;
 import com.google.gson.annotations.Expose;
 import com.sun.org.glassfish.gmbal.Description;
-public class FuncCall extends FileObjectWithMessages{
+public class FuncCall extends FileObjectWithMessages {
     //JSON------------------------------------------
     @Expose
     public String funcName = "";

src/_VisualDVM/ProjectData/SapforData/Functions/FuncInfo.java

@@ -26,7 +26,6 @@ public class FuncInfo extends FileObjectWithMessages {
     @Expose
     public List<FunctionParameterJson> params = new Vector<>();
     //END OF JSON-----------------------------------------
-
     public FunctionType type = FunctionType.Default;
     //вызовы функций в теле этой функции
     @Expose

src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionParameterJson.java

@@ -1,7 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Functions.Json;
 import com.google.gson.annotations.Expose;
-
-import java.util.List;
 public class FunctionParameterJson {
     @Expose
     public Integer inoutType;

src/_VisualDVM/ProjectData/SapforData/Functions/Json/FunctionsJson.java

@@ -1,5 +1,4 @@
 package _VisualDVM.ProjectData.SapforData.Functions.Json;
-import _VisualDVM.ProjectData.SapforData.Loops.Json.FileLoopsJson;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;

src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/FunctionsGraphUIGreed.java

@@ -1,5 +1,5 @@
 package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
-import javafx.util.Pair;
+import Common.Utils.Pair;
 
 import java.util.LinkedHashMap;
 import java.util.Vector;

src/_VisualDVM/ProjectData/SapforData/Functions/UI/Graph/GraphInfo.java

@@ -1,7 +1,7 @@
 package _VisualDVM.ProjectData.SapforData.Functions.UI.Graph;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import com.mxgraph.swing.mxGraphComponent;
-import javafx.util.Pair;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;

src/_VisualDVM/ProjectData/SapforData/Loops/Loop.java

@@ -10,24 +10,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Vector;
 public class Loop extends FileObjectWithMessages {
-    @Expose
-    private int lineNumAfterLoop;
-    @Expose
-    private int perfectLoop;
-    @Expose
-    private int hasNonRectangularBounds;
-    @Expose
-    private int loopState;
-    public LoopState getLoopState(){
-        switch (loopState){
-            case 1:
-                return LoopState.GoodLoop;
-            case 2:
-                return LoopState.BadLoop;
-            default:
-                return LoopState.Loop;
-        }
-    }
     //---
     @Expose
     public List<Integer> extGotos = new Vector<>();
@@ -42,28 +24,45 @@ public class Loop extends FileObjectWithMessages {
     public List<FuncCall> funcCalls = new Vector<>();
     @Expose
     public List<Loop> children = new Vector<>();
+    @Expose
+    private int lineNumAfterLoop;
+    @Expose
+    private int perfectLoop;
+    @Expose
+    private int hasNonRectangularBounds;
+    @Expose
+    private int loopState;
+    public LoopState getLoopState() {
+        switch (loopState) {
+            case 1:
+                return LoopState.GoodLoop;
+            case 2:
+                return LoopState.BadLoop;
+            default:
+                return LoopState.Loop;
+        }
+    }
     //--
-    public List<FileObjectWithMessages> getGraphNodes(DBProjectFile dbProjectFile){
+    public List<FileObjectWithMessages> getGraphNodes(DBProjectFile dbProjectFile) {
         List<FileObjectWithMessages> all_children = new Vector<>();
         //-
-        if (hasNonRectangularBounds!=0)
+        if (hasNonRectangularBounds != 0)
             all_children.add(new NonRectIter(dbProjectFile, line));
         //-
         all_children.addAll(funcCalls);
         //-
-        for (int line_: extGotos)
+        for (int line_ : extGotos)
             all_children.add(new EGoto(dbProjectFile, line_));
-        for (int line_: intGotos)
+        for (int line_ : intGotos)
             all_children.add(new IGoto(dbProjectFile, line_));
-        for (int line_: ios)
+        for (int line_ : ios)
             all_children.add(new IO(dbProjectFile, line_));
-        for (int line_: stops)
+        for (int line_ : stops)
             all_children.add(new Stop(dbProjectFile, line_));
         //-
-        for (FileObjectWithMessages fileObjectWithMessages: all_children){
+        for (FileObjectWithMessages fileObjectWithMessages : all_children) {
             fileObjectWithMessages.CheckMessagesPresence();
         }
-
         all_children.addAll(children); //у них уже проверено. (?)
         return all_children;
     }
@@ -87,18 +86,18 @@ public class Loop extends FileObjectWithMessages {
     public VisualiserFonts getFont() {
         return getLoopState().getFont();
     }
-    public void toMap_r(LinkedHashMap<Integer, Loop> loops_map){
+    public void toMap_r(LinkedHashMap<Integer, Loop> loops_map) {
         CheckMessagesPresence();
         loops_map.put(line, this);
-        for (Loop loop: children)
+        for (Loop loop : children)
             loop.toMap_r(loops_map);
     }
     @Override
     public void setFile(String file_in) {
         super.setFile(file_in);
-        for (FuncCall funcCall: funcCalls)
+        for (FuncCall funcCall : funcCalls)
             funcCall.setFile(file_in);
-        for (Loop child: children)
+        for (Loop child : children)
             child.setFile(file_in);
     }
 }

src/_VisualDVM/ProjectData/SapforData/Regions/ParallelRegion.java

@@ -1,13 +1,13 @@
 package _VisualDVM.ProjectData.SapforData.Regions;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.AlignRule;
 import _VisualDVM.ProjectData.SapforData.Arrays.Distribution.DataDirective;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
-import javafx.util.Pair;
 
 import java.math.BigInteger;
 import java.util.LinkedHashMap;

src/_VisualDVM/ProjectData/SapforData/Regions/UI/ArrayAlignmentBar.java

@@ -1,10 +1,10 @@
 package _VisualDVM.ProjectData.SapforData.Regions.UI;
 import Common.MainModule_;
+import Common.Utils.Pair;
 import Common.Visual.Tables.StyledCellLabel;
 import _VisualDVM.Global;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
-import javafx.util.Pair;
 
 import javax.swing.*;
 import javax.swing.event.ChangeListener;

src/_VisualDVM/ProjectData/SapforData/Variants/ParallelVariant.java

@@ -1,10 +1,10 @@
 package _VisualDVM.ProjectData.SapforData.Variants;
 import Common.Database.Objects.DBObject;
+import Common.Utils.Pair;
 import _VisualDVM.ProjectData.PredictorStatistic.PredictorStatistics_2021;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.ProjectData.SapforData.Arrays.ProjectArray;
 import _VisualDVM.ProjectData.SapforData.Regions.ParallelRegion;
-import javafx.util.Pair;
 
 import java.io.File;
 import java.math.BigInteger;

src/_VisualDVM/Repository/Server/EmailChecker.java

@@ -1,9 +1,9 @@
 package _VisualDVM.Repository.Server;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Utils;
-import javafx.util.Pair;
 
 import javax.activation.DataHandler;
 import javax.activation.DataSource;

src/_VisualDVM/Repository/Server/RepositoryServer.java

@@ -4,6 +4,7 @@ import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import Common.Database.RepositoryRefuseException;
 import Common.Utils.InterruptThread;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
@@ -13,7 +14,6 @@ import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.Passes.Server.RepositoryPass;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Utils;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 import sun.misc.SignalHandler;
 

src/_VisualDVM/TestingSystem/Common/TestingPlanner.java

@@ -1,6 +1,7 @@
 package _VisualDVM.TestingSystem.Common;
 import Common.CommonConstants;
 import Common.Utils.Loggable;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Machine.Machine;
@@ -11,7 +12,6 @@ import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.Common.TestingPackage.TestingPackage;
 import _VisualDVM.TestingSystem.Common.TestingPackageToKill.TestingPackageToKill;
 import _VisualDVM.Utils;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/_VisualDVM/TestingSystem/Common/TestingServer.java

@@ -3,6 +3,7 @@ import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import Common.Database.RepositoryRefuseException;
+import Common.Utils.Pair;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import Common.Utils.Vector_;
@@ -48,7 +49,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTestingPlanner;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
 import _VisualDVM.Utils;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.*;

src/_VisualDVM/TestingSystem/Common/TestsDatabase.java

@@ -1,6 +1,7 @@
 package _VisualDVM.TestingSystem.Common;
 import Common.CommonConstants;
 import Common.Database.SQLITE.SQLiteDatabase;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
@@ -63,7 +64,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsComma
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforsDBTable;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -692,5 +692,6 @@ public class TestsDatabase extends SQLiteDatabase {
         }
         return res;
     }
-    public void Patch() throws Exception {}
+    public void Patch() throws Exception {
+    }
 }

src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java

@@ -2,6 +2,7 @@ package _VisualDVM.TestingSystem.DVM.DVMPackage;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Utils.Index;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.UserAccount.UserAccount;
 import _VisualDVM.Constants;
@@ -25,7 +26,6 @@ import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMTask;
 import _VisualDVM.Utils;
 import com.sun.org.glassfish.gmbal.Description;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/_VisualDVM/TestingSystem/DVM/UserConnection.java

@@ -1,6 +1,7 @@
 package _VisualDVM.TestingSystem.DVM;
 import Common.CommonConstants;
 import Common.Passes.PassException;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.GlobalData.Machine.Machine;
@@ -9,7 +10,6 @@ import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.Utils;
 import com.jcraft.jsch.*;
-import javafx.util.Pair;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;

src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java

@@ -177,7 +177,6 @@ public class SapforPackage_json implements Serializable {
         }
         return comparison_root.mismatches_count;
     }
-
     public void getVersionsFiles(SapforPackage package_in) {
         //---
         //---

src/_VisualDVM/TestingSystem/SAPFOR/PackageModeSupervisor.java

@@ -54,7 +54,7 @@ public class PackageModeSupervisor extends ThreadsPlanner {
                     "proj", "dep", "jar"
                     //  ,"sh", "exe", "bat"
             );
-            //удаление сапфора
+            //удаление сапфора exception
             if (sapfor_drv.exists())
                 FileUtils.forceDelete(sapfor_drv);
         } catch (Exception e) {

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java

@@ -18,7 +18,6 @@ import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.File;
-import java.nio.file.Paths;
 import java.util.Vector;
 public class SapforPackage extends TestingPackage<SapforPackage_json> {
     public int sapforId = CommonConstants.Nan; // так как сапфор на машине.
@@ -109,10 +108,10 @@ public class SapforPackage extends TestingPackage<SapforPackage_json> {
                 bad++;
             else good++;
             //--
-            Vector<SapforVersion_json> all_versions= new Vector<>();
+            Vector<SapforVersion_json> all_versions = new Vector<>();
             all_versions.addAll(task.versions);
             all_versions.addAll(task.variants);
-            for (SapforVersion_json version_json: all_versions){
+            for (SapforVersion_json version_json : all_versions) {
                 File configurationRoot = Utils_.getFile(
                         getLocalWorkspace().getAbsolutePath(),
                         String.valueOf(task.set_id),

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/SapforPackageDatabase.java

@@ -4,7 +4,6 @@ import Common.Passes.PassCode_;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTasksDBTable;
 
-import java.io.EOFException;
 import java.io.File;
 public class SapforPackageDatabase extends SQLiteDatabase {
     public SapforTasksDBTable tasks;
@@ -12,10 +11,10 @@ public class SapforPackageDatabase extends SQLiteDatabase {
     public SapforPackageDatabase(SapforPackage sapforPackage) {
         super(new File(sapforPackage.getLocalWorkspace(), "sapfor_package.db"));
     }
-    public void convertFromJson(SapforPackage sapforPackage) throws Exception{
+    public void convertFromJson(SapforPackage sapforPackage) throws Exception {
         sapforPackage.readJson();
         BeginTransaction();
-        for (SapforTask sapforTask: sapforPackage.package_json.tasks)
+        for (SapforTask sapforTask : sapforPackage.package_json.tasks)
             Insert(sapforTask);
         Commit();
     }

src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java

@@ -4,7 +4,10 @@ import Common.Passes.PassCode_;
 import Common.Visual.Controls.MenuBarButton;
 import Common.Visual.FilterFlag;
 import Common.Visual.Menus.DataMenuBar;
-import Common.Visual.Tables.*;
+import Common.Visual.Tables.ColumnInfo;
+import Common.Visual.Tables.RendererDate;
+import Common.Visual.Tables.RendererMilliseconds;
+import Common.Visual.Tables.RendererProgressBar;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.SapforPackageCache;

src/_VisualDVM/TestingSystem/SAPFOR/SapforTasksPackage/UI/SapforPackageTreeNode.java

@@ -1,6 +1,4 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforTasksPackage.UI;
-import Common.Utils.Utils_;
-
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 public abstract class SapforPackageTreeNode extends DefaultMutableTreeNode {

src/_VisualDVM/TestingSystem/SAPFOR/SapforTestingPlanner.java

@@ -1,5 +1,6 @@
 package _VisualDVM.TestingSystem.SAPFOR;
 import Common.CommonConstants;
+import Common.Utils.Pair;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.Component.Sapfor.Sapfor;
@@ -18,7 +19,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforTask.ComparisonState;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

src/_VisualDVM/Utils.java

@@ -1,13 +1,9 @@
 package _VisualDVM;
 import Common.Passes.PassException;
-import Common.Utils.Index;
+import Common.Utils.*;
-import Common.Utils.StringTemplate;
-import Common.Utils.TextLog;
-import Common.Utils.Utils_;
 import Common.Visual.UI;
 import Common.Visual.Windows.Dialog.VFileChooser_;
 import _VisualDVM.GlobalData.Tasks.TaskState;
-import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -286,14 +282,14 @@ public class Utils {
     }
     //</editor-fold>
     public static String extractHeaderName(String line) {
-        String res =null;
+        String res = null;
         String tline = line.trim().toLowerCase();
         if (tline.startsWith("include")) {
             String[] data = tline.split("'");
             res = data.length > 1 ? Utils_.toW(data[1]) : null;
-            if (res!=null){
+            if (res != null) {
-                if (res.startsWith("\\")){
+                if (res.startsWith("\\")) {
-                    res= res.substring(1);
+                    res = res.substring(1);
                 }
             }
         }

src/_VisualDVM/Visual/Interface/FunctionsWindow.java

@@ -1,8 +1,8 @@
 package _VisualDVM.Visual.Interface;
+import Common.Utils.Pair;
 import Common.Visual.FormWithSplitters;
 import Common.Visual.VisualizerForm;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
-import javafx.util.Pair;
 public interface FunctionsWindow extends VisualizerForm, FormWithSplitters {
     void ShowFunctions();
     void ShowNoFunctions();

src/_VisualDVM/Visual/Menus/MainMenuBar/MainMenuBar.java

@@ -16,6 +16,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.LinkedHashMap;
 public class MainMenuBar extends VisualiserMenuBar {
     public MenuBarButton MachineButton;
     public MenuBarButton UserButton;
@@ -53,6 +54,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 });
             }
         });
+        /*
         add(new MenuBarButton() {
             {
                 setIcon("/icons/Comparsion.png");
@@ -62,8 +64,10 @@ public class MainMenuBar extends VisualiserMenuBar {
                 });
             }
         });
+         */
         addPasses(PassCode.ShowInstruction);
-        //-
+        //- javafx
+        LinkedHashMap<Integer, Integer> test = new LinkedHashMap<>();
         setPreferredSize(new Dimension(0, 30));
         //--
 

src/_VisualDVM/Visual/Tables/RendererDiff.java

@@ -11,11 +11,11 @@ public class RendererDiff extends RendererCell<Integer> {
         return (Integer) value;
     }
     public void Display() {
-        if (value != null){
+        if (value != null) {
             Font font_ = MainModule_.instance.getUI().getTheme().Fonts.get(
-                    value>0? VisualiserFonts.BadState: VisualiserFonts.TreePlain
+                    value > 0 ? VisualiserFonts.BadState : VisualiserFonts.TreePlain
             );
-            setFont(font_ );
+            setFont(font_);
             setText(String.valueOf(value));
         }
     }

src/_VisualDVM/Visual/Windows/ComparisonForm.java

@@ -2,6 +2,7 @@ package _VisualDVM.Visual.Windows;
 import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Passes.Pass;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.ShortLabel;
 import Common.Visual.Editor.BaseEditor;
@@ -11,7 +12,6 @@ import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.Utils;
 import com.github.difflib.text.DiffRow;
 import com.github.difflib.text.DiffRowGenerator;
-import javafx.util.Pair;
 import org.fife.ui.rtextarea.RTextScrollPane;
 
 import javax.swing.*;

src/_VisualDVM/Visual/Windows/FileForm.java

@@ -226,7 +226,7 @@ public class FileForm implements FileWindow, FormWithSplitters {
         ShowErrorsCount();
         ShowRecommendationsCount();
         //-
-        FocusMessagesPriority(graphElement==null? file.state.toString(): graphElement.messages_presence);
+        FocusMessagesPriority(graphElement == null ? file.state.toString() : graphElement.messages_presence);
     }
     @Override
     public void ShowNoMessages() {

src/_VisualDVM/Visual/Windows/FunctionsForm.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Windows;
+import Common.Utils.Pair;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.UI;
 import _VisualDVM.Global;
@@ -7,7 +8,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphForm;
 import _VisualDVM.ProjectData.SapforData.Functions.UI.Graph.FunctionsGraphUI;
 import _VisualDVM.Visual.Interface.FunctionsWindow;
-import javafx.util.Pair;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;

src/_VisualDVM/Visual/Windows/SapforPackagesComparisonForm.java

@@ -2,7 +2,6 @@ package _VisualDVM.Visual.Windows;
 import Common.Database.Objects.DBObject;
 import Common.Passes.Pass;
 import Common.Utils.TextLog;
-import Common.Utils.Utils_;
 import Common.Visual.Controls.ShortLabel;
 import Common.Visual.Menus.VisualiserMenuBar;
 import Common.Visual.UI;
@@ -153,13 +152,13 @@ public class SapforPackagesComparisonForm {
         //--
         if (object.package_json == null) {
             try {
-                System.out.println(object.getPK()+" reading json");
+                System.out.println(object.getPK() + " reading json");
                 object.readJson();
                 System.out.println("done");
-                System.out.println(object.getPK()+" reading files");
+                System.out.println(object.getPK() + " reading files");
                 object.package_json.getVersionsFiles(object);
                 object.package_json.buildTree(object);
-                System.out.println(object.getPK()+" done");
+                System.out.println(object.getPK() + " done");
                 //---
             } catch (Exception ex) {
                 ex.printStackTrace();

src/_VisualDVM/Visual/Windows/SearchReplaceForm.java

@@ -1,4 +1,5 @@
 package _VisualDVM.Visual.Windows;
+import Common.Utils.Pair;
 import Common.Utils.Utils_;
 import Common.Visual.TextField.StyledTextField;
 import Common.Visual.Trees.StyledTree;
@@ -6,7 +7,6 @@ import Common.Visual.UI;
 import Common.Visual.Windows.Form;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import javafx.util.Pair;
 import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
 import org.fife.ui.rtextarea.SearchContext;
 import org.fife.ui.rtextarea.SearchEngine;