From 2f83a1854dcfcb85fb519742bd696a5780ad48c3 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 5 Nov 2023 19:01:03 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  5 +++
 .../SapforTasksPackage.java                   |  5 ++-
 .../SapforTasksPackageInterface.java          | 45 ++++++++++---------
 .../SapforTasksPackage/UI/StateSummary.java   | 13 ++++++
 .../SapforTasksPackage/UI/TreeSummary.java    |  9 ++++
 .../Main/PackageVersionsComparisonForm.java   | 11 -----
 .../UI/Main/SapforPackagesComparisonForm.java |  8 +++-
 7 files changed, 63 insertions(+), 33 deletions(-)
 create mode 100644 src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
 create mode 100644 src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java
 delete mode 100644 src/Visual_DVM_2021/UI/Main/PackageVersionsComparisonForm.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 79721966..369bec7c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/PackageVersionsComparisonForm.java" beforeDir="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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
index abe2d9d6..ec8a0e20 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java
@@ -4,6 +4,8 @@ import Common.Database.DBObject;
 import Common.Database.nDBObject;
 import TestingSystem.TasksPackage.TasksPackageState;
 import com.sun.org.glassfish.gmbal.Description;
+
+import javax.swing.tree.DefaultMutableTreeNode;
 public class SapforTasksPackage extends nDBObject {
     @Description("DEFAULT ''")
     public String testsNames = "";//имена тестов через ; для отображения
@@ -25,7 +27,6 @@ public class SapforTasksPackage extends nDBObject {
     public int kernels = 1; //количество потоков.
     @Description("DEFAULT 'TestsSynchronize'")
     public TasksPackageState state = TasksPackageState.TestsSynchronize;
-
     @Description("DEFAULT ''")
     public String testsIds = "";
     @Description("DEFAULT ''")
@@ -38,6 +39,8 @@ public class SapforTasksPackage extends nDBObject {
     //RunningExecution
     //Done
     //Aborted
+    @Description("IGNORE")
+    public DefaultMutableTreeNode root = null;
     @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
index b9cb97e6..0b864f43 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java
@@ -16,7 +16,27 @@ public class SapforTasksPackageInterface {
     public static File getPackageArchive(SapforTasksPackage package_in) {
         return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
     }
-    public static DefaultMutableTreeNode getTreeRoot(SapforTasksPackage package_in) {
+    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);
+        } 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(SapforTasksPackage package_in) {
         SapforTasksResults_json results_json = getLocalResults(package_in);
         //--  флаги                 группы
         LinkedHashMap<TaskState, LinkedHashMap<String, LinkedHashMap<String, Vector<SapforTask>>>> sortedTasks = results_json.sortTasksByStatesConfigurationsAndGroups();
@@ -53,24 +73,9 @@ public class SapforTasksPackageInterface {
         }
         return root;
     }
-    public static File getLocalWorkspace(SapforTasksPackage package_in) {
-        return new File(Global.SapforPackagesDirectory, package_in.id);
-    }
-    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);
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        return res;
-    }
-    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 getTree(SapforTasksPackage package_in) {
+        if (package_in.root == null)
+            package_in.root = buildTree(package_in);
+        return package_in.root;
     }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
new file mode 100644
index 00000000..10fa995c
--- /dev/null
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/StateSummary.java
@@ -0,0 +1,13 @@
+package SapforTestingSystem.SapforTasksPackage.UI;
+import GlobalData.Tasks.TaskState;
+public class StateSummary extends TreeSummary{
+    public TaskState state;
+    public int count = 0;
+    public StateSummary(TaskState state_in){
+        state = state_in;
+    }
+    @Override
+    public void refreshText(){
+        text = state.getDescription()+" : "+count;
+    }
+}
diff --git a/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java b/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java
new file mode 100644
index 00000000..c3639932
--- /dev/null
+++ b/src/SapforTestingSystem/SapforTasksPackage/UI/TreeSummary.java
@@ -0,0 +1,9 @@
+package SapforTestingSystem.SapforTasksPackage.UI;
+public abstract class TreeSummary {
+    public String text="";
+    public abstract void refreshText();
+    @Override
+    public String toString() {
+        return text;
+    }
+}
diff --git a/src/Visual_DVM_2021/UI/Main/PackageVersionsComparisonForm.java b/src/Visual_DVM_2021/UI/Main/PackageVersionsComparisonForm.java
deleted file mode 100644
index 7add78cf..00000000
--- a/src/Visual_DVM_2021/UI/Main/PackageVersionsComparisonForm.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package Visual_DVM_2021.UI.Main;
-import Common.Current;
-public class PackageVersionsComparisonForm extends VersionsComparisonForm{
-    public PackageVersionsComparisonForm(PackageVersionsComparisonForm slave_in) {
-        super(slave_in);
-    }
-    @Override
-    protected Current getCurrentObjectName() {
-        return Current.PackageVersion;
-    }
-}
diff --git a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
index a2144cdc..ae23597d 100644
--- a/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
+++ b/src/Visual_DVM_2021/UI/Main/SapforPackagesComparisonForm.java
@@ -90,7 +90,13 @@ public class SapforPackagesComparisonForm {
     protected void showObject() {
         lObjectName.setText(object.getPK().toString() + (isMaster() ? "(эталон)" : ""));
         lObjectName.setToolTipText(object.getPK().toString());
-        treePanel.add(new JScrollPane(new SapforTasksPackageTree(SapforTasksPackageInterface.getTreeRoot(object),
+        treePanel.add(new JScrollPane(
+                new SapforTasksPackageTree(
+
+
+                        SapforTasksPackageInterface.buildTree(object),
+
+
         isMaster()? Current.SapforEtalonVersion: Current.SapforVersion
         )));
     }