From f51892a2510a42cc86231a6d8254927b556cd3fb Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 26 Oct 2023 23:56:39 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  3 +-
 .../PackageModeSupervisor.java                | 29 +++----------------
 .../SapforTask/SapforTask.java                | 11 ++-----
 .../SapforTasksPackageInterface.java          | 15 ++++++++--
 .../SapforTasksPackageSupervisor.java         |  4 ---
 5 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b1ac2266..011ed5cb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,8 @@
   <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/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/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java b/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
index 48d007bf..b2669c69 100644
--- a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
+++ b/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
@@ -2,9 +2,10 @@ package SapforTestingSystem.PackageModeSupervisor;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
-import ProjectData.Files.DBProjectFile;
-import ProjectData.Files.FileType;
-import SapforTestingSystem.Json.*;
+import SapforTestingSystem.Json.SapforConfiguration_json;
+import SapforTestingSystem.Json.SapforTasksPackage_json;
+import SapforTestingSystem.Json.SapforTasksResults_json;
+import SapforTestingSystem.Json.SapforTest_json;
 import SapforTestingSystem.PerformSapforTask;
 import SapforTestingSystem.SapforTask.SapforTask;
 import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
@@ -61,28 +62,6 @@ public class PackageModeSupervisor extends ThreadsPlanner {
         results_json.EndDate = new Date().getTime();
         //записать результаты всех задач.
         try {
-            for (SapforTask task : results_json.tasks) {
-                //--
-                task.filesList = new Vector<>();
-                //--
-                if (task.versions.size() > 1) {
-                    SapforVersion_json correctness = task.versions.get(1); //0 - исходная, 1 коррекция стиля кода.
-                    File home = new File(correctness.version);
-                    //задача, получить список файлов. нет вложенных папок.
-                    File[] files_ = home.listFiles();
-                    if (files_ != null) {
-                        for (File file : files_) {
-                            if (file.isFile()) {
-                                DBProjectFile pf = new DBProjectFile(); //только для определения типа файла.
-                                pf.file = file;
-                                pf.AutoDetectProperties();
-                                if (pf.fileType != FileType.forbidden)
-                                    task.filesList.add(pf.file.getName());
-                            }
-                        }
-                    }
-                }
-            }
             Utils.jsonToFile(results_json, new File(Global.Home, Constants.results_json));
             FileUtils.writeStringToFile(new File(Constants.DONE), "");
         } catch (Exception e) {
diff --git a/src/SapforTestingSystem/SapforTask/SapforTask.java b/src/SapforTestingSystem/SapforTask/SapforTask.java
index 2f8d72fd..908a1769 100644
--- a/src/SapforTestingSystem/SapforTask/SapforTask.java
+++ b/src/SapforTestingSystem/SapforTask/SapforTask.java
@@ -41,15 +41,8 @@ public class SapforTask extends DBObject {
     public TaskState state = TaskState.Inactive;
     //в json не выносить. это только для БД.
     @Description("DEFAULT ''")
-    public String files = "";
-    @Description("DEFAULT ''")
     public String versionsDescription = "";
     //------
-    //-----------
-    @Description("IGNORE")
-    @Expose
-    public List<String> filesList = new Vector<>(); //файлы проекта.Брать из коррекции стиля кода. есть первой версия
-    //-------------------------------------->>
     @Description("IGNORE")
     @Expose
     public Vector<SapforVersion_json> versions = new Vector<>();
@@ -62,7 +55,6 @@ public class SapforTask extends DBObject {
     }
     public void Reset() {
         state = TaskState.Inactive;
-        filesList.clear();
         versions.clear();
         variants.clear();
     }
@@ -85,7 +77,6 @@ public class SapforTask extends DBObject {
         group_description = t.group_description;
         versionsDescription = t.versionsDescription;
         //--
-        files = t.files;
         codes = t.codes;
         state = t.state;
         //--
@@ -120,6 +111,7 @@ public class SapforTask extends DBObject {
                 codes.equalsIgnoreCase(task.codes);
     }
     public boolean Compare(SapforTask task, Vector<String> comparisonLog) throws Exception {
+        /*
         //1. сравнить списки файлов. без учета порядка.
         if (filesList.size() != task.filesList.size())
             return false;
@@ -142,6 +134,7 @@ public class SapforTask extends DBObject {
             //--
             if (!compareVersionsFiles(version1, version2, filesList)) return false;
         }
+         */
         return false;
     }
     @Override
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index 36820c59..ad169834 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -1,9 +1,20 @@
 package SapforTestingSystem.SapforTasksPackage;
+import Common.Constants;
 import Common.Global;
+import Common.Utils.Utils;
+import SapforTestingSystem.Json.SapforTasksResults_json;
 
+import javax.swing.tree.DefaultMutableTreeNode;
 import java.io.File;
 public class SapforTasksPackageInterface {
-    public static File getPackageArchive(SapforTasksPackage package_in){
-        return new File(Global.SapforPackagesDirectory, package_in.id+".zip");
+    public static File getPackageArchive(SapforTasksPackage package_in) {
+        return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
+    }
+    public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) throws Exception {
+        File results_json_file = new File(package_in.workspace, Constants.results_json);
+        SapforTasksResults_json results_json =
+                (SapforTasksResults_json) Utils.jsonFromFile(results_json_file,
+                        SapforTasksResults_json.class);
+        return null;
     }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index 28daa863..842e2e46 100644
--- a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -253,10 +253,6 @@ public class SapforTasksPackageSupervisor {
             sapforTasksPackage.summary = String.join("\n", summary_lines);
             for (SapforTask task : results_json.tasks) {
                 //--
-                if (!task.filesList.isEmpty())
-                    task.files = String.join("\n", task.filesList);
-                //---
-                task.filesList = null;
                 task.versions = null;
                 task.variants = null;
             }