From cd0bae262085f581045b28263b237ecb174928e1 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 14 Nov 2024 22:06:49 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B5=D1=85=D0=B0=D0=BD=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=BC=20=D0=BD=D0=B0=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0-=D1=8D=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=BD=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=83=D1=89=D0=B5=D0=B9=20=D0=BA=D0=BE=D0=BD=D1=84?=
 =?UTF-8?q?=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D1=82=D0=B5?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D1=81=D0=B0=D0=BF=D1=84=D0=BE=D1=80.=D1=81=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=20=D1=8D=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=BD=D0=BE=D0=BC=20=D0=BF=D0=BE=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 17 ++++----
 .../Passes/All/EditSapforConfiguration.java   |  1 +
 .../All/SetSapforConfigurationEthalon.java    | 40 +++++++++++++++++++
 src/_VisualDVM/Passes/PassCode.java           | 13 +++---
 .../Passes/Server/EditServerObject.java       |  6 ++-
 .../Common/Configuration/Configuration.java   |  5 +++
 .../SapforConfiguration.java                  |  2 +
 .../UI/SapforConfigurationsForm.java          |  7 ++++
 .../SapforPackage/UI/SapforPackagesForm.java  |  2 +-
 9 files changed, 77 insertions(+), 16 deletions(-)
 create mode 100644 src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 796c3521..d2665cfb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,16 +7,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererDate.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Visual/Tables/RendererDate.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/DirInfo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/FileObject/UI/DirInfosForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/CompilationTask/UI/CompilationTasksForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/Tasks/RunTask/UI/RunTasksForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ProjectData/SapforData/Variants/UI/ParallelVariantsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReport/UI/BugReportsForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.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/_VisualDVM/Passes/All/EditSapforConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/EditSapforConfiguration.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/EditServerObject.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/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/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/SapforPackage/UI/SapforPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/ServerSapfor/UI/ServerSapforsForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/EditSapforConfiguration.java b/src/_VisualDVM/Passes/All/EditSapforConfiguration.java
index da4d6d9f..b9ebe2de 100644
--- a/src/_VisualDVM/Passes/All/EditSapforConfiguration.java
+++ b/src/_VisualDVM/Passes/All/EditSapforConfiguration.java
@@ -3,6 +3,7 @@ import _VisualDVM.Global;
 import _VisualDVM.Passes.Server.EditServerObject;
 import _VisualDVM.TestingSystem.Common.TestingServer;
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 public class EditSapforConfiguration extends EditServerObject<TestingServer, SapforConfiguration> {
     public EditSapforConfiguration() {
         super(Global.testingServer, SapforConfiguration.class);
diff --git a/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java b/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java
new file mode 100644
index 00000000..22d5638a
--- /dev/null
+++ b/src/_VisualDVM/Passes/All/SetSapforConfigurationEthalon.java
@@ -0,0 +1,40 @@
+package _VisualDVM.Passes.All;
+import Common.Utils.Utils_;
+import _VisualDVM.ServerObjectsCache.PackageCache;
+import _VisualDVM.ServerObjectsCache.VisualCaches;
+import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
+import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
+public class SetSapforConfigurationEthalon extends EditSapforConfiguration {
+    @Override
+    public String getIconPath() {
+        return "/icons/Back.png";
+    }
+    @Override
+    public String getDescription_() {
+        return "Назначить пакет эталоном для конфигурации";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (getDb().CheckCurrent(Log, d, SapforPackage.class)) {
+            target = getDb().getTable(d).getUI().getCurrent();
+            SapforPackage sapforPackage = getDb().getTable(SapforPackage.class).getUI().getCurrent();
+            //-
+            PackageCache cache = (PackageCache) VisualCaches.GetCache(sapforPackage);
+            if (cache.configurationsJson.array.size() != 1) {
+                Log.Writeln_("В текущем пакете присутствует несколько конфигураций!");
+                return false;
+            }
+            ConfigurationJson configurationJson = cache.configurationsJson.array.get(0);
+            if (configurationJson.id != target.id) {
+                Log.Writeln_(
+                        "Конфигурация пакета " + Utils_.Brackets(configurationJson.description) +
+                        "\nне совпадает с текущей конфигурацией " + Utils_.Brackets(target.description) + "!");
+                return false;
+            }
+            //-
+            target.ethalon_id = sapforPackage.id;
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/src/_VisualDVM/Passes/PassCode.java b/src/_VisualDVM/Passes/PassCode.java
index f79415d9..16f54254 100644
--- a/src/_VisualDVM/Passes/PassCode.java
+++ b/src/_VisualDVM/Passes/PassCode.java
@@ -349,19 +349,22 @@ public enum PassCode implements PassCode_ {
     EditDVMSettings,
     DeleteDVMSettings,
     CloneDVMSettings,
-    CloneSapforSettings;
+    CloneSapforSettings,
+    SetSapforConfigurationEthalon
+    ;
+    //--
     //--
     @Override
     public String getDescription() {
         switch (this) {
             case StartSelectedSAPFORConfigurations:
-                return "Запустить отмеченные конфигурации тестирования SAPFOR";
+                return "Запустить отмеченные конфигурации";
             case ShowCurrentSAPFORConfigurationTests:
-                return "Отметить группы и тесты, участвующие в текущей конфигурации SAPFOR";
+                return "Отметить группы и тесты, участвующие в текущей конфигурации";
             case StartSelectedDVMConfigurations:
-                return "Запустить отмеченные конфигурации тестирования DVM";
+                return "Запустить отмеченные конфигурации";
             case ShowCurrentDVMConfigurationTests:
-                return "Отметить группы и тесты, участвующие в текущей конфигурации DVM";
+                return "Отметить группы и тесты, участвующие в текущей конфигурации";
             case GetOldBugReports:
                 return "Получить неиспользуемые баг репорты";
             case SPF_RenameIncludes:
diff --git a/src/_VisualDVM/Passes/Server/EditServerObject.java b/src/_VisualDVM/Passes/Server/EditServerObject.java
index 756001f2..327476d7 100644
--- a/src/_VisualDVM/Passes/Server/EditServerObject.java
+++ b/src/_VisualDVM/Passes/Server/EditServerObject.java
@@ -17,9 +17,13 @@ public class EditServerObject<S extends RepositoryServer, D extends DBObject> ex
     }
     //--
     @Override
+    public boolean fillObjectFields() throws Exception {
+        return getDb().getTable(d).getUI().ShowEditObjectDialog(target);
+    }
+    @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (D) getDb().getTable(d).getUI().getCurrent();
-        return getDb().getTable(d).getUI().CheckCurrent(Log) && getDb().getTable(d).getUI().ShowEditObjectDialog(target);
+        return getDb().getTable(d).getUI().CheckCurrent(Log) && fillObjectFields();
     }
     //--
     @Override
diff --git a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
index 05ad66db..d3bc06f3 100644
--- a/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
+++ b/src/_VisualDVM/TestingSystem/Common/Configuration/Configuration.java
@@ -1,4 +1,5 @@
 package _VisualDVM.TestingSystem.Common.Configuration;
+import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.riDBObject;
 import Common.Utils.TextLog;
@@ -32,10 +33,13 @@ public class Configuration extends riDBObject {
     public String packedTestsJson = "";
     @Description("DEFAULT ''")
     public String packedSettingsJson = "";
+    @Description("DEFAULT -1")
+    public int ethalon_id = CommonConstants.Nan; //пакет-эталон
     //----
     public String printAuto() {
         return autoTesting > 0 ? "Да" : "Нет";
     }
+    public String printEthalon(){return (ethalon_id == CommonConstants.Nan) ? "—" : String.valueOf(ethalon_id);}
     public void SwitchAuto() {
         autoTesting = (autoTesting == 0) ? 1 : 0;
     }
@@ -58,6 +62,7 @@ public class Configuration extends riDBObject {
         super.SynchronizeFields(src);
         Configuration c = (Configuration) src;
         //--
+        ethalon_id=c.ethalon_id;
         maxtime = c.maxtime;
         autoTesting = c.autoTesting;
         kernels = c.kernels;
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
index 0b709a88..de0aa8cd 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/SapforConfiguration.java
@@ -1,4 +1,5 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration;
+import Common.CommonConstants;
 import Common.Utils.TextLog;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.ServerObjectsCache.SapforConfigurationCache;
@@ -6,6 +7,7 @@ import _VisualDVM.ServerObjectsCache.VisualCaches;
 import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
 import _VisualDVM.TestingSystem.Common.Group.Group;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
+import com.sun.org.glassfish.gmbal.Description;
 
 import java.util.Vector;
 public class SapforConfiguration extends Configuration {
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
index cc216564..7f932a80 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfiguration/UI/SapforConfigurationsForm.java
@@ -1,4 +1,5 @@
 package _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.UI;
+import Common.CommonConstants;
 import Common.Database.Tables.DataSet;
 import Common.Passes.PassCode_;
 import Common.Visual.DataSetControlForm;
@@ -90,6 +91,12 @@ public class SapforConfigurationsForm extends DataSetControlForm<SapforConfigura
                     public Object getFieldAt(SapforConfiguration object) {
                         return ((ConfigurationCache) VisualCaches.GetCache(object)).getTestsCount();
                     }
+                },
+                new ColumnInfo<SapforConfiguration>("эталон") {
+                    @Override
+                    public Object getFieldAt(SapforConfiguration object) {
+                        return object.printEthalon();
+                    }
                 }
         );
     }
diff --git a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
index 882a7007..2224a789 100644
--- a/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackage/UI/SapforPackagesForm.java
@@ -113,7 +113,7 @@ public class SapforPackagesForm extends DataSetControlForm<SapforPackage> {
                 addSeparator();
                 addPasses(PassCode.AbortSapforPackage);
                 addSeparator();
-                addPasses(PassCode.CompareSapforPackages);
+                addPasses(PassCode.SetSapforConfigurationEthalon,PassCode.CompareSapforPackages);
                 addSeparator();
                 addPasses(PassCode.DeleteSapforPackage);
             }