промежуточный. перенос настроек в проект. есть баги. завтра доделываю, версия не вполне рабочая

src/_VisualDVM/Repository/BugReport/BugReport.java

@@ -4,10 +4,8 @@ import Common.Database.Objects.rDBObject;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Repository.BugReport.Json.RecipientJson;
 import _VisualDVM.Repository.BugReport.Json.RecipientsJson;
-import _VisualDVM.Repository.BugReport.Json.VisualiserSettingJson;
 import _VisualDVM.Repository.BugReport.Json.VisualiserSettingsJson;
 import _VisualDVM.Repository.Component.ComponentType;
 import _VisualDVM.Repository.Component.ComponentsSet;
@@ -18,7 +16,6 @@ import com.sun.org.glassfish.gmbal.Description;
 import java.io.File;
 import java.nio.file.Paths;
 import java.util.Date;
-import java.util.LinkedHashMap;
 import java.util.Vector;
 public class BugReport extends rDBObject {
     public String project_version = "";
@@ -53,7 +50,7 @@ public class BugReport extends rDBObject {
         project_version = version_in;
         visualiser_version = ComponentsSet.visualiser.version;
         sapfor_version = Global.components.get(ComponentType.Sapfor_F).version;
-        packedSettingsJson = Utils_.gson.toJson(Global.mainModule.getDb().settings.getSapforSettingsJson());
+        packedSettingsJson = ""; //Utils_.gson.toJson(Global.mainModule.getDb().settings.getSapforSettingsJson());
         percentage = 0;
         description = description_in;
         date = new Date().getTime();

src/_VisualDVM/Repository/BugReport/Json/RecipientJson.java

@@ -1,5 +1,4 @@
 package _VisualDVM.Repository.BugReport.Json;
-import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
 import com.google.gson.annotations.Expose;
 public class RecipientJson {
     @Expose

src/_VisualDVM/Repository/BugReport/Json/RecipientsJson.java

@@ -1,7 +1,5 @@
 package _VisualDVM.Repository.BugReport.Json;
 import _VisualDVM.Repository.Subscribes.Subscriber;
-import _VisualDVM.TestingSystem.Common.Configuration.Configuration;
-import _VisualDVM.TestingSystem.Common.Configuration.Json.ConfigurationJson;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;

src/_VisualDVM/Repository/BugReport/Json/VisualiserSettingJson.java

@@ -1,5 +1,4 @@
 package _VisualDVM.Repository.BugReport.Json;
-import _VisualDVM.GlobalData.Settings.DBSetting;
 import com.google.gson.annotations.Expose;
 public class VisualiserSettingJson {
     @Expose
@@ -8,8 +7,10 @@ public class VisualiserSettingJson {
     public String value;
     public VisualiserSettingJson(){
     }
+    /*
     public VisualiserSettingJson(DBSetting dbSetting){
         name = dbSetting.Name.toString();
         value = dbSetting.Value;
     }
+     */
 }

src/_VisualDVM/Repository/BugReport/Json/VisualiserSettingsJson.java

@@ -1,6 +1,4 @@
 package _VisualDVM.Repository.BugReport.Json;
-import _VisualDVM.GlobalData.Settings.DBSetting;
-import _VisualDVM.GlobalData.Settings.SettingName;
 import com.google.gson.annotations.Expose;
 
 import java.util.List;
@@ -10,6 +8,7 @@ public class VisualiserSettingsJson {
     public List<VisualiserSettingJson> array = new Vector<>();
     public String getSummary(){
         Vector<String> res=new Vector<>();
+        /*
         for (VisualiserSettingJson setting: array){
             try {
                 res.add(SettingName.valueOf(setting.name).getDescription() + "=" + setting.value);
@@ -18,6 +17,7 @@ public class VisualiserSettingsJson {
                 ex.printStackTrace();
             }
         }
+         */
         return String.join("\n",res);
     }
 }

src/_VisualDVM/Repository/Component/Sapfor/Sapfor.java

@@ -1,12 +1,10 @@
 package _VisualDVM.Repository.Component.Sapfor;
 import Common.CommonConstants;
-import Common.Passes.Pass;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
@@ -369,7 +367,8 @@ public abstract class Sapfor extends OSDComponent {
         RunAnalysis(
                 "SPF_OpenDvmStatistic",
                 -Global.messagesServer.getPort(),
-                Global.packSapforSettings(),
+                "",
+              //  Global.packSapforSettings(),
                 src);
         return result;
     }
@@ -573,10 +572,13 @@ public abstract class Sapfor extends OSDComponent {
     //--------------------------------------------------------------------------->>
     //временный (?) проход, по тихому получить размерность теста, предварительно выполнив тихий парс.
     //тут все одноразовое. считаем что таблицы бд уже заполнены как надо.
+    /*
     public LanguageStyle getStyle() throws Exception {
         return (Global.mainModule.getDb()).settings.get(SettingName.FREE_FORM).toBoolean() ? LanguageStyle.free : LanguageStyle.fixed;
     }
+     */
     //------------------------------------------------------------------------------------------------------------------
+    /*
     public String getConsoleFlags() throws Exception {
         Vector<String> res = new Vector<>();
         if ((Global.mainModule.getDb()).settings.get(SettingName.FREE_FORM).toBoolean())
@@ -588,4 +590,5 @@ public abstract class Sapfor extends OSDComponent {
             res.add("-keepSPF");
         return String.join(" ", res);
     }
+     */
 }

src/_VisualDVM/Repository/Component/Visualiser.java

@@ -1,6 +1,5 @@
 package _VisualDVM.Repository.Component;
 import _VisualDVM.Global;
-import _VisualDVM.GlobalData.Settings.SettingName;
 import _VisualDVM.Passes.PassCode;
 
 import java.io.File;

src/_VisualDVM/Repository/RepositoryServer.java

@@ -5,7 +5,6 @@ import Common.Utils.InterruptThread;
 import Common.Utils.Utils_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
-import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.Server.DiagnosticSignalHandler;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;

src/_VisualDVM/Repository/Server/ComponentsServer.java

@@ -12,7 +12,6 @@ import _VisualDVM.GlobalData.User.User;
 import _VisualDVM.Passes.All.ArchivesBackupPass;
 import _VisualDVM.Passes.All.UnzipFolderPass;
 import _VisualDVM.Passes.All.ZipFolderPass;
-import _VisualDVM.Passes.Server.TestingSystemPass;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.BugReportsDatabase;