From 57758c55976313055da769d5a726efcca6b0636c Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 31 Oct 2023 01:51:08 +0300
Subject: [PATCH] no message

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

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e44cb904..83030752 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/ProjectData/Files/ProjectFile.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/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Files/DBProjectFile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" 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/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/SapforTestingSystem/Json/SapforVersion_json.java b/src/SapforTestingSystem/Json/SapforVersion_json.java
index 54f2dbf7..3d6b9b92 100644
--- a/src/SapforTestingSystem/Json/SapforVersion_json.java
+++ b/src/SapforTestingSystem/Json/SapforVersion_json.java
@@ -1,8 +1,8 @@
 package SapforTestingSystem.Json;
 import Common.Global;
 import Common.Utils.Utils;
-import ProjectData.Files.DBProjectFile;
 import ProjectData.Files.FileType;
+import ProjectData.Files.ProjectFile;
 import com.google.gson.annotations.Expose;
 
 import java.io.File;
@@ -16,7 +16,7 @@ public class SapforVersion_json implements Serializable {
     public String description = "";
     //поля для отображения деревьев.
     public File Home = null;
-    public Vector<DBProjectFile> files = null;
+    public Vector<ProjectFile> files = null;
     //-
     public SapforVersion_json(String version_in, String description_in) {
         version = version_in;
@@ -39,11 +39,9 @@ public class SapforVersion_json implements Serializable {
         if (files_ != null) {
             for (File file: files_){
                 if (file.isFile()) {
-                    DBProjectFile dbProjectFile = new DBProjectFile();
-                    dbProjectFile.file = file;
-                    dbProjectFile.AutoDetectProperties();
-                    if (dbProjectFile.fileType.equals(FileType.forbidden)) {
-                        files.add(dbProjectFile);
+                    ProjectFile projectFile = new ProjectFile(file);
+                    if (!projectFile.fileType.equals(FileType.forbidden)) {
+                        files.add(projectFile);
                     }
                 }
             }
diff --git a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
index eee05b8d..c2f218b9 100644
--- a/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
+++ b/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java
@@ -1,6 +1,8 @@
 package SapforTestingSystem.SapforTasksPackage;
 import Common.Current;
 import Common.UI.Trees.DataTree;
+import Common.Utils.Utils;
+import ProjectData.Files.ProjectFile;
 import SapforTestingSystem.Json.SapforVersion_json;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -31,8 +33,15 @@ public class SapforTasksPackageTree extends DataTree {
        // Current.set(Current.ProjectNode, node);
         Object o = node.getUserObject();
         if (o instanceof SapforVersion_json) {
-            Current.set(current, o);
-            System.out.println(((SapforVersion_json)o).Home);
+            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("---");
+
         }
     }
 }
\ No newline at end of file