From 167ceb42a5032a5aa10a508f521b69afce609628 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 23 Mar 2025 15:44:52 +0300
Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D1=83=D0=B5=D0=BC=D1=8B=D1=85=20=D0=B4=D0=B6=D1=81=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=20=D1=82=D0=B5?=
 =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2=20=D0=B8=20=D0=BD=D0=B0=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 12 +++++++---
 .../Common/Group/Json/GroupJson.java          | 18 --------------
 .../Common/Group/Json/GroupsJson.java         | 19 ---------------
 .../Settings/Json/SettingsArrayJson.java      | 19 ---------------
 .../Common/Settings/Json/SettingsJson.java    | 15 ------------
 .../Common/Test/Json/TestFileJson.java        | 24 -------------------
 .../Common/Test/Json/TestFilesJson.java       |  9 -------
 .../Common/Test/Json/TestJson.java            | 14 -----------
 .../Common/Test/Json/TestsJson.java           | 19 ---------------
 .../TestingSystem/Common/TestingServer.java   |  8 -------
 .../TestingSystem/Common/TestsDatabase.java   |  6 -----
 11 files changed, 9 insertions(+), 154 deletions(-)
 delete mode 100644 src/_VisualDVM/TestingSystem/Common/Group/Json/GroupJson.java
 delete mode 100644 src/_VisualDVM/TestingSystem/Common/Group/Json/GroupsJson.java
 delete mode 100644 src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsArrayJson.java
 delete mode 100644 src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsJson.java
 delete mode 100644 src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java
 delete mode 100644 src/_VisualDVM/TestingSystem/Common/Test/Json/TestFilesJson.java
 delete mode 100644 src/_VisualDVM/TestingSystem/Common/Test/Json/TestJson.java
 delete mode 100644 src/_VisualDVM/TestingSystem/Common/Test/Json/TestsJson.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4f6f8bf9..7319b6d0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,9 +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/Visual/DataSetControlForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/DataSetControlForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupsJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsArrayJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFilesJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupJson.java b/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupJson.java
deleted file mode 100644
index 1e0c8733..00000000
--- a/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupJson.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Group.Json;
-import _VisualDVM.TestingSystem.Common.Group.Group;
-import com.google.gson.annotations.Expose;
-public class GroupJson {
-    @Expose
-    public int id;
-    @Expose
-    public String description;
-    @Expose
-    public String language;
-    public GroupJson(Group group) {
-        id = group.id;
-        language = group.language.toString();
-        description = group.description;
-    }
-    public GroupJson() {
-    }
-}
diff --git a/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupsJson.java b/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupsJson.java
deleted file mode 100644
index 6bd4cda8..00000000
--- a/src/_VisualDVM/TestingSystem/Common/Group/Json/GroupsJson.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Group.Json;
-import _VisualDVM.TestingSystem.Common.Group.Group;
-import com.google.gson.annotations.Expose;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Vector;
-public class GroupsJson implements Serializable {
-    @Expose
-    public List<GroupJson> array = new Vector<>();
-    public GroupsJson() {
-    }
-    //при создании пакета.
-    public GroupsJson(Vector<Group> groups) {
-        array = new Vector<>();
-        for (Group group : groups)
-            array.add(new GroupJson(group));
-    }
-}
diff --git a/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsArrayJson.java b/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsArrayJson.java
deleted file mode 100644
index 1f4e0baa..00000000
--- a/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsArrayJson.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Settings.Json;
-import _VisualDVM.TestingSystem.Common.Settings.Settings;
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Vector;
-public class SettingsArrayJson {
-    @Expose
-    public List<SettingsJson> array = new Vector<>();
-    public SettingsArrayJson() {
-    }
-    //при создании пакета.
-    public SettingsArrayJson(Vector<? extends Settings> settings_in) {
-        array = new Vector<>();
-        for (Settings settings : settings_in)
-            array.add(new SettingsJson(settings));
-    }
-}
-
diff --git a/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsJson.java b/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsJson.java
deleted file mode 100644
index ce9f5e78..00000000
--- a/src/_VisualDVM/TestingSystem/Common/Settings/Json/SettingsJson.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Settings.Json;
-import _VisualDVM.TestingSystem.Common.Settings.Settings;
-import com.google.gson.annotations.Expose;
-public class SettingsJson {
-    @Expose
-    public int id;
-    @Expose
-    public String description;
-    public SettingsJson(Settings settings) {
-        id = settings.id;
-        description = settings.description;
-    }
-    public SettingsJson() {
-    }
-}
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java b/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java
deleted file mode 100644
index aee9dc27..00000000
--- a/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFileJson.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Test.Json;
-import _VisualDVM.ProjectData.Files.FileType;
-import _VisualDVM.ProjectData.Files.LanguageStyle;
-import _VisualDVM.ProjectData.Files.ProjectFile;
-import _VisualDVM.ProjectData.LanguageName;
-import com.google.gson.annotations.Expose;
-public class TestFileJson {
-    @Expose
-    public String name = "";
-    @Expose
-    public FileType type = FileType.none;
-    @Expose
-    public LanguageName language = LanguageName.n;
-    @Expose
-    public LanguageStyle style = LanguageStyle.none;
-    public TestFileJson() {
-    }
-    public TestFileJson(ProjectFile src) {
-        name = src.file.getName();
-        type = src.fileType;
-        language = src.languageName;
-        style = src.style;
-    }
-}
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFilesJson.java b/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFilesJson.java
deleted file mode 100644
index 5eb4a05f..00000000
--- a/src/_VisualDVM/TestingSystem/Common/Test/Json/TestFilesJson.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Test.Json;
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Vector;
-public class TestFilesJson {
-    @Expose
-    public List<TestFileJson> values = new Vector<>();
-}
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Json/TestJson.java b/src/_VisualDVM/TestingSystem/Common/Test/Json/TestJson.java
deleted file mode 100644
index cb85fb9f..00000000
--- a/src/_VisualDVM/TestingSystem/Common/Test/Json/TestJson.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Test.Json;
-import _VisualDVM.TestingSystem.Common.Test.Test;
-import com.google.gson.annotations.Expose;
-
-import java.io.Serializable;
-public class TestJson implements Serializable {
-    @Expose
-    public int id;
-    public TestJson(Test test) {
-        id = test.id;
-    }
-    public TestJson() {
-    }
-}
diff --git a/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsJson.java b/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsJson.java
deleted file mode 100644
index e4bcb627..00000000
--- a/src/_VisualDVM/TestingSystem/Common/Test/Json/TestsJson.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package _VisualDVM.TestingSystem.Common.Test.Json;
-import _VisualDVM.TestingSystem.Common.Test.Test;
-import com.google.gson.annotations.Expose;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Vector;
-public class TestsJson implements Serializable {
-    @Expose
-    public List<TestJson> array = new Vector<>();
-    public TestsJson() {
-    }
-    //при создании пакета.
-    public TestsJson(Vector<Test> tests) {
-        array = new Vector<>();
-        for (Test test : tests)
-            array.add(new TestJson(test));
-    }
-}
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 661fd355..938f6a23 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -15,7 +15,6 @@ import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Passes.All.DownloadDvmTestsRepository;
 import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.ProjectData.Files.ProjectFile;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.RepositoryServer;
@@ -24,8 +23,6 @@ import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.MachineProcess.MachineProcess;
 import _VisualDVM.TestingSystem.Common.MachineProcess.MachineProcessSet;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestFileJson;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestFilesJson;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.Test.TestType;
 import _VisualDVM.TestingSystem.Common.TestFile.TestFile;
@@ -636,11 +633,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             File src = versions.get(name);
             File[] files = src.listFiles(pathname -> !pathname.isDirectory());
             if (files != null && files.length > 0) {
-                //--
-                TestFilesJson filesJson = new TestFilesJson();
-                for (File file : files) {
-                    filesJson.values.add(new TestFileJson(new ProjectFile(file)));
-                }
                 //--
                 Test test = new Test();
                 test.group_id = group.id;
diff --git a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
index d5bf5ce0..9593c7a5 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java
@@ -10,12 +10,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Group.GroupsDBTable;
-import _VisualDVM.TestingSystem.Common.Group.Json.GroupJson;
-import _VisualDVM.TestingSystem.Common.Group.Json.GroupsJson;
-import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsArrayJson;
-import _VisualDVM.TestingSystem.Common.Settings.Json.SettingsJson;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestJson;
-import _VisualDVM.TestingSystem.Common.Test.Json.TestsJson;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.Common.Test.TestDBTable;
 import _VisualDVM.TestingSystem.Common.TestFile.TestFile;