клонирование параметров тестирования двм/сапфора

.idea/workspace.xml

@@ -7,51 +7,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Common/UI/VisualCache/DVMConfigurationCache.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/Server/CloneServerObject.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.form" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DeleteDVMSettings.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/EditDVMSettings.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishDVMSettings.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" 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/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/ConfigurationCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/VisualCache/ConfigurationCache.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/VisualCache/VisualCaches.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/VisualCache/VisualCaches.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Configuration/Configuration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfiguration.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/DVMConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMConfiguration/UI/ConfigurationFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackage_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMSettings/DVMSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMCompilationTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTasks/DVMRunTask.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforPackage_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTest_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTest_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/Json/SapforTestingSet_json.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTask/SapforTask.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowCurrentDVMConfigurationTests.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartSelectedDVMConfigurations.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SynchronizeTests.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/TestingForm.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/buffer_.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

properties

@@ -35,7 +35,7 @@
   "PerformanceAnalyzerPath": "",
   "ComponentsBackUpsCount": 10,
   "TestingKernels": 64,
-  "AutoCheckTesting": true,
+  "AutoCheckTesting": false,
   "CheckTestingIntervalSeconds": 10,
   "EmailOnTestingProgress": true,
   "eraseTestingWorkspaces": true

src/TestingSystem/DVM/DVMSettings/UI/DVMSettingsBar.java

@@ -4,8 +4,8 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 public class DVMSettingsBar extends DataMenuBar {
     public DVMSettingsBar() {
         super("параметры тестированя",
-
                 PassCode_2021.PublishDVMSettings,
+                PassCode_2021.CloneDVMSettings,
                 PassCode_2021.EditDVMSettings,
                 PassCode_2021.DeleteDVMSettings
         );

src/TestingSystem/SAPFOR/Json/SapforConfiguration_json.java

@@ -7,7 +7,7 @@ import com.google.gson.annotations.Expose;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Vector;
-//на самом деле уже settings. конфиграция = группы + настройки
+//на самом деле уже settings. конфиграция = группы + параметры
 public class SapforConfiguration_json implements Serializable {
     @Expose
     public int id = Constants.Nan;

src/TestingSystem/SAPFOR/SapforSettings/SapforSettings.java

@@ -17,6 +17,7 @@ public class SapforSettings extends Settings {
     public int KEEP_SPF_DIRECTIVES = 0; //"Сохранять SPF директивы при построении параллельных вариантов"; -keepSPF
     public int KEEP_DVM_DIRECTIVES = 0;// "Учитывать DVM директивы"; -keepDVM
     //----
+    //----
     public void packFlags() {
         Vector<String> res = new Vector<>();
         //--

src/TestingSystem/SAPFOR/SapforSettings/SapforSettingsBar.java

@@ -5,6 +5,7 @@ public class SapforSettingsBar extends DataMenuBar {
     public SapforSettingsBar() {
         super("параметры тестирования",
                 PassCode_2021.PublishSapforSettings,
+                PassCode_2021.CloneSapforSettings,
                 PassCode_2021.EditSapforSettings,
                 PassCode_2021.DeleteSapforSettings
         );

src/Visual_DVM_2021/Passes/All/CloneDVMSettings.java

@@ -0,0 +1,15 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Common.Global;
+import TestingSystem.Common.TestingServer;
+import TestingSystem.DVM.DVMSettings.DVMSettings;
+import Visual_DVM_2021.Passes.Server.CloneServerObject;
+public class CloneDVMSettings extends CloneServerObject<TestingServer, DVMSettings> {
+    public CloneDVMSettings() {
+        super(Global.testingServer, DVMSettings.class);
+    }
+    @Override
+    protected Current currentName() {
+        return Current.DVMSettings;
+    }
+}

src/Visual_DVM_2021/Passes/All/CloneSapforSettings.java

@@ -0,0 +1,36 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Common.Database.DBObject;
+import Common.Global;
+import Common.Utils.Vector_;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+import TestingSystem.Common.TestingServer;
+import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
+import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Server.CloneServerObject;
+
+import java.util.Vector;
+public class CloneSapforSettings extends CloneServerObject<TestingServer, SapforSettings> {
+    public CloneSapforSettings() {
+        super(Global.testingServer, SapforSettings.class);
+    }
+    @Override
+    protected Current currentName() {
+        return Current.SapforSettings;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        super.ServerAction();
+        Vector<PassCode_2021> codes = src.getCodes();
+        Vector<DBObject> new_commands = new Vector<>();
+        for (PassCode_2021 code : codes) {
+            SapforSettingsCommand command = new SapforSettingsCommand();
+            command.sapforsettings_id = (int) pk;
+            command.passCode = code;
+            new_commands.add(command);
+        }
+        Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects,null, new_commands));
+    }
+}

src/Visual_DVM_2021/Passes/PassCode_2021.java

@@ -351,19 +351,25 @@ public enum PassCode_2021 {
     DeleteSapforSettingsCommand,
     PublishDVMSettings,
     EditDVMSettings,
-    DeleteDVMSettings
+    DeleteDVMSettings,
+    CloneDVMSettings,
+    CloneSapforSettings,
     ;
     //--
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case CloneSapforSettings:
+                return "Клонировать параметры тестирования SAPFOR";
+            case CloneDVMSettings:
+                return "Клонировать параметры тестирования DVM";
             case PublishDVMSettings:
-                return "Опубликовать параметры тестирования ";
+                return "Опубликовать параметры тестирования DVM";
             case EditDVMSettings:
-                return "Редактировать параметры тестирования ";
+                return "Редактировать параметры тестирования DVM";
             case DeleteDVMSettings:
-                return "Удалить параметры тестирования";
+                return "Удалить параметры тестирования DVM";
             case PublishSapforSettingsCommand:
                 return "Опубликовать команду SAPFOR";
             case EditSapforSettingsCommand:
@@ -377,19 +383,19 @@ public enum PassCode_2021 {
             case DeleteSapforSettings:
                 return "Удалить параметры тестирования SAPFOR";
             case CloneCurrentDVMConfiguration:
-                return "Дублировать текущую конфигурацию тестирования DVM системы";
+                return "Дублировать текущую конфигурацию тестирования DVM";
             case StartSelectedSAPFORConfigurations:
-                return "Запустить отмеченные конфигурации тестирования системы SAPFOR";
+                return "Запустить отмеченные конфигурации тестирования SAPFOR";
             case SaveCurrentSAPFORConfiguration:
-                return "Сохранить тесты текущей конфигурации системы SAPFOR";
+                return "Сохранить тесты текущей конфигурации SAPFOR";
             case ShowCurrentSAPFORConfigurationTests:
-                return "Отметить группы и тесты, участвующие в текущей конфигурации системы SAPFOR";
+                return "Отметить группы и тесты, участвующие в текущей конфигурации SAPFOR";
             case StartSelectedDVMConfigurations:
-                return "Запустить отмеченные конфигурации тестирования DVM системы";
+                return "Запустить отмеченные конфигурации тестирования DVM";
             case ShowCurrentDVMConfigurationTests:
-                return "Отметить группы и тесты, участвующие в текущей конфигурации DVM системы";
+                return "Отметить группы и тесты, участвующие в текущей конфигурации DVM";
             case SaveCurrentDVMConfiguration:
-                return "Сохранить тесты текущей конфигурации DVM системы";
+                return "Сохранить тесты текущей конфигурации DVM";
             case GetOldBugReports:
                 return "Получить неиспользуемые баг репорты";
             case SPF_RenameIncludes:

src/Visual_DVM_2021/Passes/Server/CloneServerObject.java

@@ -0,0 +1,35 @@
+package Visual_DVM_2021.Passes.Server;
+import Common.Current;
+import Common.Database.DBObject;
+import Common.Database.riDBObject;
+import Repository.RepositoryServer;
+public abstract class CloneServerObject<S extends RepositoryServer, D extends riDBObject> extends PublishServerObject<S, D> {
+    public D src;
+    @Override
+    public String getIconPath() {
+        return "/icons/MultiFiles.png";
+    }
+    public CloneServerObject(S server_in, Class<D> d_in) {
+        super(server_in, d_in);
+    }
+    protected abstract Current currentName();
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        src=null;
+        if (!Current.Check(Log, currentName()))
+            return false;
+
+        //---------
+        pk = null;
+        if (Current.getAccount().CheckRegistered(Log)) {
+            target = d.newInstance();
+            target.SynchronizeFields(src=(D) Current.get(currentName()));
+            //единственное отличие клона - текущий автор
+            target.description+=" копия";
+            target.sender_name = Current.getAccount().name;
+            target.sender_address = Current.getAccount().email;
+            return true;
+        }
+        return false;
+    }
+}