From bc1faa1a060667c2356ac90078546d6dce3949cf Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sun, 23 Mar 2025 13:06:44 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           | 33 +----------------
 properties                                    |  2 +-
 .../SAPFOR/Json/SapforPackage_json.java       | 12 ++++---
 .../SAPFOR/Json/SapforTestingSet_json.java    |  8 ++---
 .../SapforConfiguration.java                  | 36 ++++++++++---------
 5 files changed, 33 insertions(+), 58 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5876c915..f123a3b3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,41 +7,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationSettings/DVMConfigurationSettings.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationSettings/DVMConfigurationSettingsDBTable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationTest/DVMConfigurationTestsDBTable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationSettings/SapforConfigurationSettings.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationSettings/SapforConfigurationSettingsDBTable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationTest/SapforConfigurationTest.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationTest/SapforConfigurationTestsDBTable.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/Database/Tables/DBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Tables/DataSet.java" 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/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowCurrentSAPFORConfigurationTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/SaveCurrentConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Testing/ShowCurrentConfigurationTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/ConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/VisualCaches.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/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/Test/TestDBTable.java" afterDir="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" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfiguration/UI/DVMConfigurationsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroup.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMConfigurationGroup/DVMConfigurationGroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroup.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroup.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationGroup/SapforConfigurationGroupsDBTable.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 9f41f1a8..f79e7df7 100644
--- a/properties
+++ b/properties
@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\sadp111_1742724294\\sadp111\\v1\\v1\\v1",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
index 033b9113..22ece104 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforPackage_json.java
@@ -1,8 +1,10 @@
 package _VisualDVM.TestingSystem.SAPFOR.Json;
 import Common.CommonConstants;
+import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
+import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.ComparisonState;
@@ -42,12 +44,15 @@ public class SapforPackage_json implements Serializable {
     public SapforPackage_json() {
     }
     public SapforPackage_json(ServerSapfor serverSapfor, Vector<SapforConfiguration> configurations, int kernels_in) {
-        /*
+
         sapfor_drv = serverSapfor.call_command;
         kernels = kernels_in;
         for (SapforConfiguration sapforConfiguration : configurations) {
-            SapforTestingSet_json testingSet =
-                    new SapforTestingSet_json(((SapforConfigurationCache) VisualCaches.GetCache(sapforConfiguration)).getTests(), sapforConfiguration);
+            Vector<Test> tests  = new Vector<Test>();
+            for (int test_id: Global.testingServer.db.getSapforConfigurationTestsIds(sapforConfiguration)){
+                tests.add(Global.testingServer.db.tests.get(test_id));
+            }
+            SapforTestingSet_json testingSet = new SapforTestingSet_json(tests, sapforConfiguration);
             testingSet.id = getMaxSetId();
             testingSets.add(testingSet);
             // формирование задач
@@ -64,7 +69,6 @@ public class SapforPackage_json implements Serializable {
             }
             tasks.addAll(sortedTasks.values());
         }
-         */
     }
     public int getMaxSetId() {
         return max_set_id++;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
index c39111bb..0007cea4 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java
@@ -1,5 +1,6 @@
 package _VisualDVM.TestingSystem.SAPFOR.Json;
 import Common.CommonConstants;
+import _VisualDVM.Global;
 import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Test.Test;
@@ -24,9 +25,8 @@ public class SapforTestingSet_json implements Serializable {
     public SapforTestingSet_json(Vector<Test> tests_in, SapforConfiguration configuration) {
         for (Test test : tests_in)
             tests.add(new SapforTest_json(test));
-        /*
-        for (SapforSettings sapforSettings : ((SapforConfigurationCache) VisualCaches.GetCache(configuration)).getSettings())
-            configurations.add(new SapforConfiguration_json(sapforSettings));
-         */
+        for (int settings_id:Global.testingServer.db.getSapforConfigurationSettingsIds(configuration)) {
+            configurations.add(new SapforConfiguration_json(Global.testingServer.db.sapforSettings.get(settings_id)));
+        }
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
index 78071a59..1465c2b4 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -3,6 +3,7 @@ import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Utils.TextLog;
 import _VisualDVM.Global;
+import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.Common.Settings.Settings;
@@ -13,6 +14,7 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurati
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import com.sun.org.glassfish.gmbal.Description;
 
+import java.util.LinkedHashMap;
 import java.util.Vector;
 public class SapforConfiguration extends Configuration {
     @Description("DEFAULT -1")
@@ -57,22 +59,22 @@ public class SapforConfiguration extends Configuration {
     }
     @Override
     public boolean validate(TextLog Log) {
-        Vector<Integer> groups_ids = Global.testingServer.db.getSapforConfigurationGroupsIds();
-        Vector<Integer>tests_ids = ;
-        Vector<Group> groups = cache.getGroups();
-        Vector<SapforSettings> settingsArray = cache.getSettings();
-        Vector<Test> tests = cache.getTests();
+        Vector<Integer> groups_ids = Global.testingServer.db.getSapforConfigurationGroupsIds(this);
+        Vector<Integer> tests_ids = Global.testingServer.db.getSapforConfigurationTestsIds(this) ;
+        Vector<Integer> settings_ids = Global.testingServer.db.getSapforConfigurationSettingsIds(this);
 
-        //--
+        Vector<Group> groups = new Vector<>();
         Vector<LanguageName> groupsLanguages = new Vector<>();
-        for (Group group : groups) {
-            if (!groupsLanguages.contains(group.language))
-                groupsLanguages.add(group.language);
+
+        for (int group_id: groups_ids){
+            LanguageName languageName = Global.testingServer.db.groups.get(group_id).language;
+            if (!groupsLanguages.contains(languageName))
+                groupsLanguages.add(languageName);
         }
         //---
         //1. проверка цепочек команд на корректность
-        for (SapforSettings sapforSettings : settingsArray) {
-            sapforSettings.validate(Log);
+        for (int settings_id: settings_ids) {
+            Global.testingServer.db.sapforSettings.get(settings_id).validate(Log);
         }
         //2. Проверка входящих групп на единственный язык фортран
         if (groupsLanguages.size() > 1) {
@@ -82,13 +84,13 @@ public class SapforConfiguration extends Configuration {
             Log.Writeln_("Поддерживается пакетный режим только для языка Fortran");
         }
         //-
-        LinkedHashMap<String, Test> testsByDescriptions = new LinkedHashMap<>();
-        for (Test test : tests) {
-            String l_description = test.description.toLowerCase();
-            if (testsByDescriptions.containsKey(l_description)) {
-                Log.Writeln_("В конфигурацию тестирования SAPFOR не могут входить тесты с одинаковыми именами (без учета регистра):" + test.description.toLowerCase());
+        Vector<String> testsDescriptions = new Vector<>();
+        for (int test_id: tests_ids) {
+            String l_description = Global.testingServer.db.tests.get(test_id).description.toLowerCase();
+            if (testsDescriptions.contains(l_description)) {
+                Log.Writeln_("В конфигурацию тестирования SAPFOR не могут входить тесты с одинаковыми именами (без учета регистра):" + l_description);
             } else {
-                testsByDescriptions.put(l_description, test);
+                testsDescriptions.add(l_description);
             }
         }
         //-