From 6dbece2d9265641963d531aa92f9eae9343d2f69 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 2 Nov 2023 23:27:38 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?=
 =?UTF-8?q?=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B0=20(=D0=BF=D0=B0=D1=80?=
 =?UTF-8?q?=D1=81=D0=B0=20=D0=B8=20=D0=BF=D1=80=D0=B5=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             |  3 +--
 .../Json/SapforVersion_json.java                | 17 ++++++++++++++++-
 .../SapforTasksPackageTree.java                 | 12 ------------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 121db274..83030752 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +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/SapforTestingSystem/Json/SapforVersion_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforVersion_json.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforVersionsComparisonForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/VersionsComparisonForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/Json/SapforVersion_json.java b/src/SapforTestingSystem/Json/SapforVersion_json.java
index 3d6b9b92..5183523d 100644
--- a/src/SapforTestingSystem/Json/SapforVersion_json.java
+++ b/src/SapforTestingSystem/Json/SapforVersion_json.java
@@ -1,4 +1,5 @@
 package SapforTestingSystem.Json;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import ProjectData.Files.FileType;
@@ -37,7 +38,7 @@ public class SapforVersion_json implements Serializable {
         //--
         File[] files_ = Home.listFiles();
         if (files_ != null) {
-            for (File file: files_){
+            for (File file : files_) {
                 if (file.isFile()) {
                     ProjectFile projectFile = new ProjectFile(file);
                     if (!projectFile.fileType.equals(FileType.forbidden)) {
@@ -46,5 +47,19 @@ public class SapforVersion_json implements Serializable {
                 }
             }
         }
+        //теперь файлы вывода.
+        Vector<File> out_files = new Vector<>();
+        out_files.add(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.parse_out_file).toFile());
+        out_files.add(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.parse_err_file).toFile());
+        out_files.add(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.out_file).toFile());
+        out_files.add(Paths.get(Home.getAbsolutePath(), Constants.data, Constants.err_file).toFile());
+        //--
+        for (File file : out_files) {
+            if (file.exists()) {
+               // System.out.println(file.getAbsolutePath());
+                ProjectFile projectFile = new ProjectFile(file);
+                files.add(projectFile);
+            }
+        }
     }
 }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
index 266a364e..948439b1 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
@@ -11,8 +11,6 @@ public class SapforTasksPackageTree extends DataTree {
     public SapforTasksPackageTree(DefaultMutableTreeNode root_in, Current current_in) {
         super(root_in);
         current = current_in;
-        //   setRootVisible(false);
-        //  CollapseAll();
     }
     @Override
     protected int getStartLine() {
@@ -27,21 +25,11 @@ public class SapforTasksPackageTree extends DataTree {
     }
     @Override
     public void SelectionAction(TreePath e) {
-       // System.out.println("Select " + current);
         DefaultMutableTreeNode node = (DefaultMutableTreeNode) e.getLastPathComponent();
-        // Current.set(Current.ProjectNode, node);
         Object o = node.getUserObject();
         if (o instanceof SapforVersion_json) {
             SapforVersion_json version = (SapforVersion_json) o;
             Current.set(current, version);
-
-            /*
-            System.out.println(version.version+" files: "+version.files.size());
-            for (ProjectFile file: version.files){
-                System.out.println(Utils.Brackets(file));
-            }
-            System.out.println("---");
-             */
             if (current.equals(Current.SapforEtalonVersion))
                 UI.getMainWindow().getTestingWindow().ShowCurrentSapforPackageVersionEtalon();
             else