From 3bcf8861f2924d4d5d9a743e88842b27dc13387b Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 8 Nov 2023 23:38:07 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  12 +-
 .../Menus_2023/MainMenuBar/MainMenuBar.java   |   2 +-
 .../SapforTasksPackage.java                   | 140 ++++++++++++++++-
 .../SapforTasksPackageInterface.java          | 147 ------------------
 src/TestingSystem/TestingServer.java          |   5 +-
 .../Passes/All/DeleteSapforTasksPackage.java  |   3 +-
 .../All/DownloadSapforTasksPackage.java       |   3 +-
 .../Passes/All/ShowSapforTaskPackage.java     |   3 +-
 .../Passes/All/UnpackSapforTasksPackage.java  |   5 +-
 .../UI/Main/SapforPackagesComparisonForm.java |   5 +-
 10 files changed, 157 insertions(+), 168 deletions(-)
 delete mode 100644 src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4f74221f..6b9f8651 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,11 +8,15 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java b/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
index a9139f61..aeb03761 100644
--- a/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
+++ b/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java
@@ -62,7 +62,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 });
             }
         });
-        
+
  */
         //---
         ShowProject(false);
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
index 0fafc3fa..349b5823 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
@@ -2,11 +2,23 @@ package SapforTestingSystem.SapforTasksPackage;
 import Common.Constants;
 import Common.Database.DBObject;
 import Common.Database.nDBObject;
+import Common.Global;
+import Common.Utils.Utils;
+import GlobalData.Tasks.TaskState;
 import SapforTestingSystem.Json.SapforTasksResults_json;
+import SapforTestingSystem.SapforTask.SapforTask;
+import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationSummary;
+import SapforTestingSystem.SapforTasksPackage.UI.GroupSummary;
+import SapforTestingSystem.SapforTasksPackage.UI.PackageSummary;
+import SapforTestingSystem.SapforTasksPackage.UI.StateSummary;
 import TestingSystem.TasksPackage.TasksPackageState;
 import com.sun.org.glassfish.gmbal.Description;
 
 import javax.swing.tree.DefaultMutableTreeNode;
+import java.io.File;
+import java.nio.file.Paths;
+import java.util.LinkedHashMap;
+import java.util.Vector;
 public class SapforTasksPackage extends nDBObject {
     @Description("DEFAULT ''")
     public String testsNames = "";//имена тестов через ; для отображения
@@ -53,10 +65,136 @@ public class SapforTasksPackage extends nDBObject {
     }
     //---
     @Description("IGNORE")
-    public DefaultMutableTreeNode root = null;
+    public PackageSummary root = null;
     @Description("IGNORE")
     public DefaultMutableTreeNode comparison_root = null;
     //---
     @Description("IGNORE")
     public SapforTasksResults_json results = null;
+    ///---
+    public File getArchive() {
+        return new File(Global.SapforPackagesDirectory, id + ".zip");
+    }
+    public File getLocalWorkspace() {
+        return new File(Global.SapforPackagesDirectory, id);
+    }
+    public File getLoadedSign() {
+        return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), id, Constants.LOADED).toFile();
+    }
+    public boolean isLoaded() {
+        return getLoadedSign().exists();
+    }
+    public void getLocalResults() {
+        File json_file = new File(getLocalWorkspace(), Constants.results_json);
+        results = null;
+        try {
+            results = (SapforTasksResults_json) Utils.jsonFromFile(json_file,
+                    SapforTasksResults_json.class);
+            results.SortTasks();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+    public void buildTree() {
+        //--
+        if (results == null) {
+            getLocalResults();
+        }
+        //--
+        root = new PackageSummary();
+        LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> task_states =
+                results.sortTasksForTree();
+        //---
+        for (TaskState state : task_states.keySet()) {
+            //--
+            StateSummary stateSummary = new StateSummary(state);
+            //--
+            LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = task_states.get(state);
+            for (String configuration_id : tasksByConfigurations.keySet()) {
+                //--
+                DefaultMutableTreeNode configurationNode = null;
+                //--
+                LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
+                for (String group : groups_tasks.keySet()) {
+                    //--
+                    GroupSummary groupSummary = new GroupSummary(group);
+                    //--
+                    for (SapforTask task : groups_tasks.get(group)) {
+                        //--
+                        stateSummary.count++;
+                        root.count++;
+                        //--
+                        if (configurationNode == null) {
+                            configurationNode = new ConfigurationSummary(configuration_id, task);
+                        }
+                        //--
+                        groupSummary.add(task.getVersionsTree(new File(getLocalWorkspace(), configuration_id)));
+                    }
+                    if (configurationNode != null)
+                        configurationNode.add(groupSummary);
+                }
+                stateSummary.add(configurationNode);
+            }
+            if (stateSummary.count > 0) {
+                root.add(stateSummary);
+            }
+        }
+    }
+    /*
+    public static DefaultMutableTreeNode buildTree_old(SapforTasksPackage package_in) {
+        PackageSummary root = new PackageSummary();
+
+        SapforTasksResults_json results_json = getLocalResults(package_in);
+        LinkedHashMap<MatchState, LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>>> sortedTasks =
+                results_json.sortTasksForComparisonTree();
+        //--
+        for (MatchState match_state : sortedTasks.keySet()) {
+            //--
+            MatchesSummary matchesSummary = new MatchesSummary(match_state);
+            //---
+            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> task_states = sortedTasks.get(match_state);
+            //---
+            for (TaskState state : task_states.keySet()) {
+                //--
+                StateSummary stateSummary = new StateSummary(state);
+                //--
+                LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = task_states.get(state);
+                for (String configuration_id : tasksByConfigurations.keySet()) {
+                    //--
+                    DefaultMutableTreeNode configurationNode = null;
+                    //--
+                    LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
+                    for (String group : groups_tasks.keySet()) {
+                        //--
+                        GroupSummary groupSummary = new GroupSummary(group);
+                        //--
+                        for (SapforTask task : groups_tasks.get(group)) {
+                            //--
+                            stateSummary.count++;
+                            matchesSummary.count++;
+                            root.count++;
+                            //--
+                            if (configurationNode == null) {
+                                configurationNode = new ConfigurationSummary(configuration_id, task);
+                            }
+                            //--
+                            groupSummary.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
+                        }
+                        if (configurationNode != null)
+                            configurationNode.add(groupSummary);
+                    }
+                    stateSummary.add(configurationNode);
+                }
+                if (stateSummary.count > 0) {
+                    matchesSummary.add(stateSummary);
+                }
+            }
+            //---
+            if (matchesSummary.count > 0) {
+                root.add(matchesSummary);
+            }
+        }
+        return root;
+    }
+    */
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
deleted file mode 100644
index 66228088..00000000
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package SapforTestingSystem.SapforTasksPackage;
-import Common.Constants;
-import Common.Global;
-import Common.Utils.Utils;
-import GlobalData.Tasks.TaskState;
-import SapforTestingSystem.Json.SapforTasksResults_json;
-import SapforTestingSystem.SapforTask.SapforTask;
-import SapforTestingSystem.SapforTasksPackage.UI.ConfigurationSummary;
-import SapforTestingSystem.SapforTasksPackage.UI.GroupSummary;
-import SapforTestingSystem.SapforTasksPackage.UI.PackageSummary;
-import SapforTestingSystem.SapforTasksPackage.UI.StateSummary;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import java.io.File;
-import java.nio.file.Paths;
-import java.util.LinkedHashMap;
-import java.util.Vector;
-public class SapforTasksPackageInterface {
-    public static File getPackageArchive(SapforTasksPackage package_in) {
-        return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
-    }
-    public static SapforTasksResults_json getLocalResults(SapforTasksPackage package_in) {
-        File json_file = new File(getLocalWorkspace(package_in), Constants.results_json);
-        SapforTasksResults_json res = null;
-        try {
-            res = (SapforTasksResults_json) Utils.jsonFromFile(json_file,
-                    SapforTasksResults_json.class);
-            res.SortTasks();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        return res;
-    }
-    public static File getLocalWorkspace(SapforTasksPackage package_in) {
-        return new File(Global.SapforPackagesDirectory, package_in.id);
-    }
-    public static File getLoadedSign(SapforTasksPackage package_in) {
-        return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), package_in.id, Constants.LOADED).toFile();
-    }
-    public static boolean isLoaded(SapforTasksPackage package_in) {
-        return getLoadedSign(package_in).exists();
-    }
-    //--
-    public static DefaultMutableTreeNode buildTree_old(SapforTasksPackage package_in) {
-        PackageSummary root = new PackageSummary();
-        /*
-        SapforTasksResults_json results_json = getLocalResults(package_in);
-        LinkedHashMap<MatchState, LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>>> sortedTasks =
-                results_json.sortTasksForComparisonTree();
-        //--
-        for (MatchState match_state : sortedTasks.keySet()) {
-            //--
-            MatchesSummary matchesSummary = new MatchesSummary(match_state);
-            //---
-            LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> task_states = sortedTasks.get(match_state);
-            //---
-            for (TaskState state : task_states.keySet()) {
-                //--
-                StateSummary stateSummary = new StateSummary(state);
-                //--
-                LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = task_states.get(state);
-                for (String configuration_id : tasksByConfigurations.keySet()) {
-                    //--
-                    DefaultMutableTreeNode configurationNode = null;
-                    //--
-                    LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
-                    for (String group : groups_tasks.keySet()) {
-                        //--
-                        GroupSummary groupSummary = new GroupSummary(group);
-                        //--
-                        for (SapforTask task : groups_tasks.get(group)) {
-                            //--
-                            stateSummary.count++;
-                            matchesSummary.count++;
-                            root.count++;
-                            //--
-                            if (configurationNode == null) {
-                                configurationNode = new ConfigurationSummary(configuration_id, task);
-                            }
-                            //--
-                            groupSummary.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
-                        }
-                        if (configurationNode != null)
-                            configurationNode.add(groupSummary);
-                    }
-                    stateSummary.add(configurationNode);
-                }
-                if (stateSummary.count > 0) {
-                    matchesSummary.add(stateSummary);
-                }
-            }
-            //---
-            if (matchesSummary.count > 0) {
-                root.add(matchesSummary);
-            }
-        }
-         */
-        return root;
-    }
-    //--
-    public static DefaultMutableTreeNode buildTree(SapforTasksPackage package_in) {
-        //--
-        if (package_in.results == null) {
-            package_in.results = getLocalResults(package_in);
-        }
-        //--
-        PackageSummary root = new PackageSummary();
-        LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> task_states =
-                package_in.results.sortTasksForTree();
-        //---
-        for (TaskState state : task_states.keySet()) {
-            //--
-            StateSummary stateSummary = new StateSummary(state);
-            //--
-            LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>> tasksByConfigurations = task_states.get(state);
-            for (String configuration_id : tasksByConfigurations.keySet()) {
-                //--
-                DefaultMutableTreeNode configurationNode = null;
-                //--
-                LinkedHashMap<String, Vector<SapforTask>> groups_tasks = tasksByConfigurations.get(configuration_id);
-                for (String group : groups_tasks.keySet()) {
-                    //--
-                    GroupSummary groupSummary = new GroupSummary(group);
-                    //--
-                    for (SapforTask task : groups_tasks.get(group)) {
-                        //--
-                        stateSummary.count++;
-                        root.count++;
-                        //--
-                        if (configurationNode == null) {
-                            configurationNode = new ConfigurationSummary(configuration_id, task);
-                        }
-                        //--
-                        groupSummary.add(task.getVersionsTree(new File(getLocalWorkspace(package_in), configuration_id)));
-                    }
-                    if (configurationNode != null)
-                        configurationNode.add(groupSummary);
-                }
-                stateSummary.add(configurationNode);
-            }
-            if (stateSummary.count > 0) {
-                root.add(stateSummary);
-            }
-        }
-        return root;
-    }
-}
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index 67c863ab..65195322 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -17,7 +17,6 @@ import Repository.Server.ServerExchangeUnit_2021;
 import SapforTestingSystem.Json.SapforTasksResults_json;
 import SapforTestingSystem.SapforTask.SapforTask;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import SapforTestingSystem.ServerSapfor.ServerSapfor;
 import TestingSystem.Group.Group;
 import TestingSystem.Group.GroupInterface;
@@ -192,7 +191,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             );
             System.out.println(Utils.Brackets(workspace.getAbsolutePath()));
             Utils.forceDeleteWithCheck(workspace);
-            Utils.forceDeleteWithCheck(SapforTasksPackageInterface.getPackageArchive(sapforTasksPackage));
+            Utils.forceDeleteWithCheck(sapforTasksPackage.getArchive());
             //внешние ключи не работают
             Vector<SapforTask> tasks = new Vector<>();
             for (SapforTask task : account_db.sapforTasks.Data.values()) {
@@ -396,7 +395,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 SapforTasksPackage sapforTasksPackage = account_db.sapforTasksPackages.get(request.object);
                 //---
                 //1 - архивировать пакет.
-                File packageArchive = SapforTasksPackageInterface.getPackageArchive(sapforTasksPackage);
+                File packageArchive = sapforTasksPackage.getArchive();
                 Utils.forceDeleteWithCheck(packageArchive);
                 System.out.println("src = "+Utils.Brackets(sapforTasksPackage.workspace));
                 System.out.println("dst="+Utils.Brackets(packageArchive.getAbsolutePath()));
diff --git a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
index aac50eff..844d4824 100644
--- a/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DeleteSapforTasksPackage.java
@@ -5,7 +5,6 @@ import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import TestingSystem.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
@@ -44,7 +43,7 @@ public class DeleteSapforTasksPackage extends TestingSystemPass<SapforTasksPacka
     @Override
     protected void performDone() throws Exception {
         super.performDone();
-        Utils.delete_with_check(SapforTasksPackageInterface.getLocalWorkspace(target));
+        Utils.delete_with_check(target.getLocalWorkspace());
         passes.get(PassCode_2021.SynchronizeTestsTasks).Do();
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
index e6c2f1f6..55d77bbb 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
@@ -4,7 +4,6 @@ import Common.Utils.Utils;
 import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import TestingSystem.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
@@ -34,7 +33,7 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
             Log.Writeln_("Пакет не завершен.");
             return false;
         }
-        if (SapforTasksPackageInterface.isLoaded(target)) {
+        if (target.isLoaded()) {
             System.out.println("Пакет уже загружен");
             return false;
         }
diff --git a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
index f1ab6cbc..4dba71e6 100644
--- a/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java
@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes.All;
 import Common.Current;
 import Common.UI.UI;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import TestingSystem.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
@@ -23,7 +22,7 @@ public class ShowSapforTaskPackage extends Pass_2021<SapforTasksPackage> {
                 Log.Writeln_("Пакет не завершен!");
                 return false;
             }
-            return SapforTasksPackageInterface.isLoaded(target) || passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(target);
+            return target.isLoaded() || passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(target);
         }
         return false;
     }
diff --git a/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java
index 88c85c77..4a97292b 100644
--- a/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/UnpackSapforTasksPackage.java
@@ -2,7 +2,6 @@ package Visual_DVM_2021.Passes.All;
 import Common.Global;
 import Common.Utils.Utils;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -21,12 +20,12 @@ public class UnpackSapforTasksPackage extends UnzipFolderPass<SapforTasksPackage
     @Override
     protected void performPreparation() throws Exception {
         super.performPreparation();
-        File packageWorkspace = SapforTasksPackageInterface.getLocalWorkspace(target);
+        File packageWorkspace = target.getLocalWorkspace();
         Utils.forceDeleteWithCheck(packageWorkspace);
     }
     @Override
     protected void body() throws Exception {
         super.body();
-        FileUtils.writeStringToFile(SapforTasksPackageInterface.getLoadedSign(target), new Date().toString());
+        FileUtils.writeStringToFile(target.getLoadedSign(), new Date().toString());
     }
 }
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index 6010f2d6..118aa033 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -8,7 +8,6 @@ import Common.Utils.TextLog;
 import SapforTestingSystem.SapforTask.MatchState;
 import SapforTestingSystem.SapforTask.SapforTask;
 import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
-import SapforTestingSystem.SapforTasksPackage.SapforTasksPackageInterface;
 import SapforTestingSystem.SapforTasksPackage.UI.SapforTasksPackageTree;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.Pass_2021;
@@ -55,7 +54,7 @@ public class SapforPackagesComparisonForm {
         TextLog log = new TextLog();
         if (Current.Check(log, Current.SapforTasksPackage)) {
             object = Current.getSapforTasksPackage();
-            if (SapforTasksPackageInterface.isLoaded(object) || (Pass_2021.passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(object)))
+            if (object.isLoaded() || (Pass_2021.passes.get(PassCode_2021.DownloadSapforTasksPackage).Do(object)))
                 showObject();
             else UI.Info("Пакет не закружен");
         } else
@@ -76,7 +75,7 @@ public class SapforPackagesComparisonForm {
     //---
     public void showCommonTree() {
         if (object.root == null) {
-            object.root = SapforTasksPackageInterface.buildTree(object);
+            object.buildTree();
         }
         treePanel.add(new JScrollPane(
                 new SapforTasksPackageTree(object.root,