no message

.idea/workspace.xml

@@ -7,30 +7,15 @@
   </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/DVMCompilationOption/DVMCompilationOption.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMCompilationOption/DVMCompilationOptionsDBTable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMCompilationOptionsSet/DVMCompilationOptionsSet.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMCompilationOptionsSet/DVMCompilationOptionsSetsDBTable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMEnvironment/DVMEnvironment.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMEnvironment/DVMEnvironmentsDBTable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMEnvironmentsSet/DVMEnvironmentsSet.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMEnvironmentsSet/DVMEnvironmentsSetsDBTable.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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerEnvironment/Json/EnvironmentJson.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ServerObjectsCache/DVMSettingsCache.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.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/DVMPackage/DVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/DVMPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackageConfiguration/DVMPackageConfiguration.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettingsDBTable.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsDialog.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationSettings/SapforConfigurationSettings.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforConfigurationSettings/SapforConfigurationSettings.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/SAPFOR/SapforPackageConfiguration/SapforPackageConfiguration.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

properties

@@ -4,7 +4,7 @@
   "ServerUserPassword": "mprit_2011",
   "OfferRegistrationOnStart": true,
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "C:\\Users\\misha\\Documents",
+  "ProjectsSearchDirectory": "E:\\BUG\\JAC",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",

src/_VisualDVM/GlobalData/CompilerOption/Json/OptionJson.java

@@ -1,6 +1,8 @@
 package _VisualDVM.GlobalData.CompilerOption.Json;
 import _VisualDVM.GlobalData.CompilerOption.CompilerOption;
 import com.google.gson.annotations.Expose;
+
+import java.io.Serializable;
 public class OptionJson {
     @Expose
     public String name; //в том числе и с разделителем если есть. поиск по startswith

src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsJson.java

@@ -2,6 +2,7 @@ package _VisualDVM.GlobalData.CompilerOption.Json;
 import Common.Utils.Utils_;
 import com.google.gson.annotations.Expose;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Vector;
 public class OptionsJson {

src/_VisualDVM/GlobalData/CompilerOption/Json/OptionsSetJson.java

@@ -1,6 +1,7 @@
 package _VisualDVM.GlobalData.CompilerOption.Json;
 import com.google.gson.annotations.Expose;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Vector;
 public class OptionsSetJson  {

src/_VisualDVM/TestingSystem/Common/TestingServer.java

@@ -43,7 +43,6 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationSettings.SapforConfigu
 import _VisualDVM.TestingSystem.SAPFOR.SapforConfigurationTest.SapforConfigurationTest;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
-import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTask.SapforTask;
 import _VisualDVM.TestingSystem.SAPFOR.SapforTestingPlanner;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
@@ -155,13 +154,9 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     @Override
     protected void afterCloneAction(riDBObject src, riDBObject dst) throws Exception {
         if (src instanceof SapforSettings) {
-            SapforSettings sapforSettings = (SapforSettings) src;
+            db.CloneSapforSettings((SapforSettings) src, (SapforSettings) dst);
-            for (SapforSettingsCommand src_command : db.getVectorByFK(sapforSettings, SapforSettingsCommand.class)) {
+        } else if (src instanceof DVMSettings) {
-                SapforSettingsCommand dst_command = new SapforSettingsCommand();
+            db.CloneDVMSettings((DVMSettings) src, (DVMSettings) dst);
-                dst_command.sapforsettings_id = dst.id;
-                dst_command.passCode = src_command.passCode;
-                db.Insert(dst_command);
-            }
         }
     }
     @Override

src/_VisualDVM/TestingSystem/Common/TestsDatabase.java

@@ -56,7 +56,9 @@ import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackage;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackage.SapforPackageDBTable;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfiguration;
 import _VisualDVM.TestingSystem.SAPFOR.SapforPackageConfiguration.SapforPackageConfigurationsDBTable;
+import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettings;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettings.SapforSettingsDBTable;
+import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
 import _VisualDVM.TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommandsDBTable;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import _VisualDVM.TestingSystem.SAPFOR.ServerSapfor.ServerSapforState;
@@ -550,6 +552,21 @@ public class TestsDatabase extends SQLiteDatabase {
         }
         return res;
     }
+    public EnvironmentsSetJson convertEnvironmentsToJson(DVMSettings dvmSettings_in) {
+        EnvironmentsSetJson res = new EnvironmentsSetJson();
+        if (dvmSettings_in.id != CommonConstants.Nan) {
+            Vector<DVMEnvironmentsSet> environmentsSets = getVectorByFK(dvmSettings_in, DVMEnvironmentsSet.class);
+            for (DVMEnvironmentsSet environmentsSet : environmentsSets) {
+                Vector<DVMEnvironment> environments = getVectorByFK(environmentsSet, DVMEnvironment.class);
+                EnvironmentsJson environmentsJson = new EnvironmentsJson();
+                for (DVMEnvironment option : environments) {
+                    environmentsJson.values.add(new EnvironmentJson(option.name, option.value));
+                }
+                res.values.add(environmentsJson);
+            }
+        }
+        return res;
+    }
     public void DeleteDVMSettingsOptions(DVMSettings dvmSettings) throws Exception {
         Vector<DVMCompilationOptionsSet> optionsSets = getVectorByFK(dvmSettings, DVMCompilationOptionsSet.class);
         for (DVMCompilationOptionsSet optionsSet : optionsSets) {
@@ -593,6 +610,51 @@ public class TestsDatabase extends SQLiteDatabase {
         }
     }
     //--
+    public void CloneDVMSettings(DVMSettings dvmSettings_src, DVMSettings dvmSettings_dst) throws Exception {
+        //--
+        Vector<DVMCompilationOptionsSet> optionsSets_src = getVectorByFK(dvmSettings_src, DVMCompilationOptionsSet.class);
+        for (DVMCompilationOptionsSet optionsSet_src : optionsSets_src) {
+            DVMCompilationOptionsSet optionsSet_dst = new DVMCompilationOptionsSet(dvmSettings_dst);
+            Insert(optionsSet_dst);
+            //--
+            Vector<DVMCompilationOption> options_src = getVectorByFK(optionsSet_src, DVMCompilationOption.class);
+            Vector<DVMCompilationOption> options_dst = new Vector<>();
+            //--
+            for (DVMCompilationOption option_src : options_src) {
+                DVMCompilationOption option_dst = new DVMCompilationOption();
+                option_dst.dvmcompilationoptionsset_id = optionsSet_dst.id;
+                option_dst.name = option_src.name;
+                option_dst.value = option_src.value;
+                Insert(option_dst);
+            }
+        }
+        //--
+        Vector<DVMEnvironmentsSet> environmentsSets_src = getVectorByFK(dvmSettings_src, DVMEnvironmentsSet.class);
+        for (DVMEnvironmentsSet environmentsSet_src : environmentsSets_src) {
+            DVMEnvironmentsSet environmentsSet_dst = new DVMEnvironmentsSet(dvmSettings_dst);
+            Insert(environmentsSet_dst);
+            //--
+            Vector<DVMEnvironment> environments_src = getVectorByFK(environmentsSet_src, DVMEnvironment.class);
+            Vector<DVMEnvironment> environments_dst = new Vector<>();
+            //--
+            for (DVMEnvironment environment_src : environments_src) {
+                DVMEnvironment environment_dst = new DVMEnvironment();
+                environment_dst.dvmenvironmentsset_id = environmentsSet_dst.id;
+                environment_dst.name = environment_src.name;
+                environment_dst.value = environment_src.value;
+                Insert(environment_dst);
+            }
+        }
+    }
+    public void CloneSapforSettings(SapforSettings src, SapforSettings dst) throws Exception {
+        for (SapforSettingsCommand src_command : getVectorByFK(src, SapforSettingsCommand.class)) {
+            SapforSettingsCommand dst_command = new SapforSettingsCommand();
+            dst_command.sapforsettings_id = dst.id;
+            dst_command.passCode = src_command.passCode;
+            Insert(dst_command);
+        }
+    }
+    //--
     public void Patch() throws Exception {
         /*
         Vector<DVMCompilationOptionsSet> sets = new Vector<>();
@@ -642,7 +704,6 @@ public class TestsDatabase extends SQLiteDatabase {
         Commit();
         */
     }
-
     public static String printOptionsLine(Vector<DVMCompilationOption> options) {
         Vector<String> res = new Vector<>();
         for (DVMCompilationOption option : options)
@@ -664,7 +725,6 @@ public class TestsDatabase extends SQLiteDatabase {
         for (int i = 0; i < optionsSets.size(); ++i) {
             Vector<DVMCompilationOption> options = getVectorByFK(optionsSets.get(i), DVMCompilationOption.class);
             Vector<DVMEnvironment> environments = getVectorByFK(environmentsSets.get(i), DVMEnvironment.class);
-
             String optionsLine = printOptionsLine(options);
             String environmentsLine = (i < environmentsSets.size()) ? printEnvironmentsLine(environments) : "";
             res.add(new Pair<>(
@@ -681,19 +741,4 @@ public class TestsDatabase extends SQLiteDatabase {
         }
         return res;
     }
-    public EnvironmentsSetJson convertEnvironmentsToJson(DVMSettings dvmSettings_in) {
-        EnvironmentsSetJson res = new EnvironmentsSetJson();
-        if (dvmSettings_in.id != CommonConstants.Nan) {
-            Vector<DVMEnvironmentsSet> environmentsSets = getVectorByFK(dvmSettings_in, DVMEnvironmentsSet.class);
-            for (DVMEnvironmentsSet environmentsSet: environmentsSets){
-                Vector<DVMEnvironment> environments = getVectorByFK(environmentsSet, DVMEnvironment.class);
-                EnvironmentsJson environmentsJson = new EnvironmentsJson();
-                for (DVMEnvironment option:environments){
-                    environmentsJson.values.add(new EnvironmentJson(option.name,option.value));
-                }
-                res.values.add(environmentsJson);
-            }
-        }
-        return res;
-    }
 }

src/_VisualDVM/TestingSystem/DVM/DVMSettings/DVMSettings.java

@@ -1,5 +1,7 @@
 package _VisualDVM.TestingSystem.DVM.DVMSettings;
 import Common.Database.Objects.DBObject;
+import _VisualDVM.GlobalData.CompilerEnvironment.Json.EnvironmentsSetJson;
+import _VisualDVM.GlobalData.CompilerOption.Json.OptionsSetJson;
 import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
 import _VisualDVM.TestingSystem.Common.Settings.Settings;
 import com.sun.org.glassfish.gmbal.Description;
@@ -18,6 +20,7 @@ public class DVMSettings extends Settings {
     public String packedCompilationOptionsJson = "";
     @Description("IGNORE")
     public String packedRunEnvironmentValuesJson = "";
+    //--
     public DVMSettings() {
     }
     public DVMSettings(DVMSettings src) {

src/_VisualDVM/TestingSystem/DVM/DVMSettings/UI/DVMSettingsFields.java

@@ -40,13 +40,12 @@ public class DVMSettingsFields implements DialogFields {
     }
     //
     public void fillOptionsLines(OptionsSetJson optionsSetJson) {
+        optionsLines = new OptionsLinesSet(optionsSetJson);
         //-Это нужно для того, чтобы старый меню бар был пересоздан. бары создаются один раз в целях экономии памяти.
         // В противном случае бар его проходы добавления редактирования и удаления
         // привязаны к старому источнику данных и возникает БАГ!!!
         if (MainModule_.instance.getUI().menuBars.containsKey(OptionsLinesSet.class))
             MainModule_.instance.getUI().menuBars.remove(OptionsLinesSet.class);
-
-        optionsLines = new OptionsLinesSet(optionsSetJson);
         //-
         optionsLines.mountUI(optionsLinesPanel);
         optionsLines.ShowUI();