From 23891a0489d326aeaca9e07162d1f48f8c506e0a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 10 Oct 2024 15:03:12 +0300
Subject: [PATCH] =?UTF-8?q?fix.=20=D0=B1=D1=8B=D0=BB=20=D0=B2=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=B1=D0=B0=D0=B3=20?=
 =?UTF-8?q?=D1=81=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=BE=D0=B9?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D0=B9=20=D1=82=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D1=80?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BA=D1=82=D0=BD=D0=BE=D1=81=D1=82=D1=8C.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                             |  9 +++------
 src/Visual_DVM_2021/Passes/PassCode.java        | 17 ++++++++++++++---
 src/_VisualDVM/Constants.java                   |  8 --------
 .../SapforConfigurationCache.java               |  2 +-
 .../SapforConfiguration.java                    | 17 ++++++++++-------
 .../SAPFOR/SapforSettings/SapforSettings.java   |  1 +
 6 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 872050f0..102ed335 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,14 +7,11 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/Passes/PassCode_.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/Utils/Passes/PassCode_.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Passes/Pass_.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/PassStats/PassStats.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateComponent.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Pass.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode.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/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/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Visual_DVM_2021/Passes/PassCode.java b/src/Visual_DVM_2021/Passes/PassCode.java
index db5bd124..f7403b0e 100644
--- a/src/Visual_DVM_2021/Passes/PassCode.java
+++ b/src/Visual_DVM_2021/Passes/PassCode.java
@@ -1,6 +1,5 @@
 package Visual_DVM_2021.Passes;
 import Common.Passes.PassCode_;
-import _VisualDVM.Constants;
 public enum PassCode implements PassCode_ {
     //-
     UpdateProperty,
@@ -1049,10 +1048,22 @@ public enum PassCode implements PassCode_ {
         return p + " " + name;
     }
     public boolean isSapforStart(){
-        return Constants.startSapforCodes.contains(this);
+        switch (this){
+            case SPF_InsertIncludesPass:
+                return true;
+            default:
+                return false;
+        }
     }
     public boolean isSapforTerminal(){
-        return Constants.terminalSapforCodes.contains(this);
+        switch (this){
+            case CreateParallelVariants:
+            case SPF_SharedMemoryParallelization:
+            case SPF_InsertDvmhRegions:
+                return true;
+            default:
+                return false;
+        }
     }
 }
 
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index db8852f2..55e98e39 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -51,14 +51,6 @@ public class Constants {
     public static final String package_json = "package_json";
     public static final String results_json = "results_json";
     //--
-    public static final Vector<PassCode> startSapforCodes =
-            new Vector_<>(PassCode.SPF_InsertIncludesPass);
-
-    public static final Vector<PassCode> terminalSapforCodes =
-            new Vector_<>( PassCode.CreateParallelVariants,
-                    PassCode.SPF_SharedMemoryParallelization,
-                    PassCode.SPF_InsertDvmhRegions);
-    //---
     public static final int parser_group = -1;
     public static final int compiler_group = -2;
     //  DBProjectFile
diff --git a/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java b/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java
index a87328aa..ea4a5557 100644
--- a/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java
+++ b/src/_VisualDVM/ServerObjectsCache/SapforConfigurationCache.java
@@ -15,6 +15,6 @@ public class SapforConfigurationCache extends ConfigurationCache{
             if (Global.testingServer.db.sapforSettings.containsKey(settingsJson.id))
                 res.add(Global.testingServer.db.sapforSettings.get(settingsJson.id));
         }
-        return res;
+        return res;//System.out.println(
     }
 }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
index b938faaf..aa7f0b45 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -1,5 +1,7 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
+import Common.Visual.CommonUI;
 import _VisualDVM.ServerObjectsCache.ConfigurationCache;
+import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
 import _VisualDVM.ServerObjectsCache.VisualCaches;
 import Common.Utils.TextLog;
 import _VisualDVM.ProjectData.LanguageName;
@@ -16,21 +18,22 @@ public class SapforConfiguration extends Configuration {
     }
     @Override
     public boolean validate(TextLog Log) {
-        ConfigurationCache cache = (ConfigurationCache) VisualCaches.GetCache(this);
+        SapforConfigurationCache cache = (SapforConfigurationCache) VisualCaches.GetCache(this);
         //--
         Vector<Group> groups = cache.getGroups();
+        Vector<SapforSettings> settingsArray= cache.getSettings();
+        //--
         Vector<LanguageName> groupsLanguages = new Vector<>();
-        Vector<SapforSettings> settingsArray= new Vector<>();
-        //-
+        for (Group group : groups) {
+            if (!groupsLanguages.contains(group.language))
+                groupsLanguages.add(group.language);
+        }
+        //---
         //1. проверка цепочек команд на корректность
         for (SapforSettings sapforSettings: settingsArray){
             sapforSettings.validate(Log);
         }
         //2. Проверка входящих групп на единственный язык фортран
-        for (Group group : groups) {
-            if (!groupsLanguages.contains(group.language))
-                groupsLanguages.add(group.language);
-        }
         if (groupsLanguages.size()>1){
             Log.Writeln_("Запуск тестов на разных языках в рамках одного пакета запрещен!\n");
         }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
index aec51a98..35a1a09a 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java
@@ -1,6 +1,7 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforSettings;
 import Common.Database.Objects.DBObject;
 import Common.Utils.CommonUtils;
+import Common.Visual.CommonUI;
 import _VisualDVM.Global;
 import Common.Utils.TextLog;
 import _VisualDVM.TestingSystem.Common.Settings.Settings;