From 7178ecbc9c2740f8ed0407d5d31aff369db70be7 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 27 Mar 2025 15:31:26 +0300
Subject: [PATCH] =?UTF-8?q?++=20=D1=83=D0=B1=D0=B8=D1=80=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=B4=D0=B6=D1=81=D0=BE=D0=BD=20=D0=B7=D0=B0=D0=BF?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D0=B5=D0=B9=20=D1=83=20=D0=B1=D0=B0=D0=B3=20=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BF=D0=BE=D1=80=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 10 ++--
 src/Common/Database/Objects/rDBObject.java    |  1 -
 src/Common/Properties.java                    |  2 -
 .../ComponentsServer/BugReport/BugReport.java | 13 +----
 .../BugReport/BugReportsDBTable.java          |  9 ----
 .../BugReport/Json/RecipientJson.java         | 11 -----
 .../BugReport/Json/RecipientsJson.java        | 17 -------
 .../BugReport/Json/VisualiserSettingJson.java | 10 ----
 .../Json/VisualiserSettingsJson.java          | 22 ---------
 .../BugReportRecipient.java                   | 23 +++++----
 .../BugReportSetting/BugReportSetting.java    | 20 ++++----
 .../BugReportSettingsDBTable.java             |  1 -
 .../ComponentsServer/BugReportsDatabase.java  | 47 -------------------
 .../Component/Sapfor/Sapfor.java              |  5 --
 .../ComponentsServer/ComponentsServer.java    | 20 +++-----
 src/_VisualDVM/Constants.java                 |  4 +-
 src/_VisualDVM/Passes/All/AddBugReport.java   |  1 -
 .../Passes/All/PublishBugReport.java          |  6 +--
 .../Passes/All/SaveBugReportRecipients.java   | 10 ++--
 19 files changed, 43 insertions(+), 189 deletions(-)
 delete mode 100644 src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java
 delete mode 100644 src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java
 delete mode 100644 src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java
 delete mode 100644 src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 899c1eb5..26bc936f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipientsDBTable.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/ComponentsServer/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/ComponentsServer.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/Passes/All/AddBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/AddBugReport.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishBugReport.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/Common/Database/Objects/rDBObject.java b/src/Common/Database/Objects/rDBObject.java
index ae1b8b89..ccab0f6f 100644
--- a/src/Common/Database/Objects/rDBObject.java
+++ b/src/Common/Database/Objects/rDBObject.java
@@ -29,5 +29,4 @@ public class rDBObject extends nDBObject {
         date = r.date;
         change_date = r.change_date;
     }
-
 }
diff --git a/src/Common/Properties.java b/src/Common/Properties.java
index 55a20b4b..9d9fc264 100644
--- a/src/Common/Properties.java
+++ b/src/Common/Properties.java
@@ -1,7 +1,6 @@
 package Common;
 import Common.Utils.Utils_;
 import Common.Visual.Controls.StableMenuItem;
-import _VisualDVM.ComponentsServer.BugReportSetting.BugReportSetting;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -9,7 +8,6 @@ import java.awt.event.ActionListener;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
-import java.util.Vector;
 public class Properties {
     protected LinkedHashMap<String, JMenuItem> controls = new LinkedHashMap<>();
     private File file = null; //файл где хранятся настройки.
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java b/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
index ea571fa3..342acab9 100644
--- a/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
@@ -4,7 +4,6 @@ import Common.Database.Objects.rDBObject;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import Common.Utils.Vector_;
-import _VisualDVM.ComponentsServer.BugReport.Json.VisualiserSettingsJson;
 import _VisualDVM.ComponentsServer.BugReportRecipient.BugReportRecipient;
 import _VisualDVM.ComponentsServer.BugReportSetting.BugReportSetting;
 import _VisualDVM.ComponentsServer.Component.ComponentType;
@@ -23,10 +22,6 @@ public class BugReport extends rDBObject {
     public long visualiser_version = -1;
     public long sapfor_version = -1;
     public String comment = "";
-    @Description("IGNORE")
-    public String packedRecipientsJson = "";
-    @Description("IGNORE")
-    public String packedSettingsJson = ""; //todo вывести.
     public Vector<BugReportSetting> settings = null;
     public Vector<BugReportRecipient> recipients = null;
     public String executor = "";
@@ -156,19 +151,13 @@ public class BugReport extends rDBObject {
         Global.componentsServer.db.recipients.getUI().SelectAll(false);
         Vector<BugReportRecipient> recipients_ = state.equals(BugReportState.draft) ?
                 recipients : Global.componentsServer.db.getVectorByFK(this, BugReportRecipient.class);
-        if (recipients_!=null) {
+        if (recipients_ != null) {
             for (BugReportRecipient bugReportRecipient : recipients_) {
                 if (Global.componentsServer.db.recipients.containsKey(bugReportRecipient.email))
                     Global.componentsServer.db.recipients.get(bugReportRecipient.email).Select(true);
             }
         }
     }
-    public VisualiserSettingsJson getSettingsJson() {
-        return packedSettingsJson.isEmpty() ? new VisualiserSettingsJson() : Utils_.gson.fromJson(packedSettingsJson, VisualiserSettingsJson.class);
-    }
-    public SapforProperties getPropertiesJson() {
-        return packedSettingsJson.isEmpty() ? new SapforProperties() : Utils_.gson.fromJson(packedSettingsJson, SapforProperties.class);
-    }
     public boolean canAppend(UserAccount account, TextLog log) {
         if (account.CheckRegistered(log)) {
             if (account.email.equals(sender_address) || account.email.equals(executor_address)) {
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java b/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java
index 4bbcc223..a9491703 100644
--- a/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/BugReportsDBTable.java
@@ -8,15 +8,6 @@ import Common.Visual.DataSetControlForm;
 import _VisualDVM.ComponentsServer.BugReport.UI.BugReportsForm;
 import _VisualDVM.ComponentsServer.BugReportRecipient.BugReportRecipient;
 import _VisualDVM.ComponentsServer.BugReportSetting.BugReportSetting;
-import _VisualDVM.GlobalData.Compiler.Compiler;
-import _VisualDVM.GlobalData.DVMParameter.DVMParameter;
-import _VisualDVM.GlobalData.EnvironmentValue.EnvironmentValue;
-import _VisualDVM.GlobalData.Makefile.Makefile;
-import _VisualDVM.GlobalData.Module.Module;
-import _VisualDVM.GlobalData.RunConfiguration.RunConfiguration;
-import _VisualDVM.GlobalData.Tasks.CompilationTask.CompilationTask;
-import _VisualDVM.GlobalData.Tasks.RunTask.RunTask;
-import _VisualDVM.GlobalData.User.User;
 
 import javax.swing.*;
 import java.util.LinkedHashMap;
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java
deleted file mode 100644
index eb0cfe85..00000000
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientJson.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package _VisualDVM.ComponentsServer.BugReport.Json;
-import com.google.gson.annotations.Expose;
-public class RecipientJson {
-    @Expose
-    public String address;
-    public RecipientJson(String addres_in) {
-        address = addres_in;
-    }
-    public RecipientJson() {
-    }
-}
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java
deleted file mode 100644
index 6230a368..00000000
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/RecipientsJson.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package _VisualDVM.ComponentsServer.BugReport.Json;
-import _VisualDVM.ComponentsServer.Recipient.Recipient;
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Vector;
-public class RecipientsJson {
-    @Expose
-    public List<RecipientJson> array = new Vector<>();
-    public RecipientsJson() {
-    }
-    public RecipientsJson(Vector<? extends Recipient> recipients) {
-        array = new Vector<>();
-        for (Recipient recipient : recipients)
-            array.add(new RecipientJson(recipient.email));
-    }
-}
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java
deleted file mode 100644
index e9b49d7d..00000000
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingJson.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package _VisualDVM.ComponentsServer.BugReport.Json;
-import com.google.gson.annotations.Expose;
-public class VisualiserSettingJson {
-    @Expose
-    public String name;
-    @Expose
-    public String value;
-    public VisualiserSettingJson() {
-    }
-}
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java b/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java
deleted file mode 100644
index acabe845..00000000
--- a/src/_VisualDVM/ComponentsServer/BugReport/Json/VisualiserSettingsJson.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package _VisualDVM.ComponentsServer.BugReport.Json;
-import _VisualDVM.ProjectData.SapforData.SapforProperties;
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Vector;
-public class VisualiserSettingsJson {
-    @Expose
-    public List<VisualiserSettingJson> array = new Vector<>();
-    public String getSummary() {
-        SapforProperties properties = new SapforProperties(); //только для извлечения описаний.
-        Vector<String> res = new Vector<>();
-        for (VisualiserSettingJson setting : array) {
-            try {
-                res.add(properties.getFieldDescription(setting.name) + "=" + setting.value);
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-        }
-        return String.join("\n", res);
-    }
-}
diff --git a/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java b/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java
index d9df0726..c68e12d8 100644
--- a/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java
+++ b/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java
@@ -4,22 +4,21 @@ import Common.Database.Objects.iDBObject;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
 public class BugReportRecipient extends iDBObject {
     public String bugreport_id = "";
-    public String email ="";
-    @Override
-    public void SynchronizeFields(DBObject src) {
-        super.SynchronizeFields(src);
-        BugReportRecipient src_= (BugReportRecipient) src;
-        bugreport_id = src_.bugreport_id;
-        email = src_.email;
+    public String email = "";
+    public BugReportRecipient() {
     }
-    public BugReportRecipient(){
-
-    }
-    public BugReportRecipient(BugReport bugReport, String email_in){
+    public BugReportRecipient(BugReport bugReport, String email_in) {
         bugreport_id = bugReport.id;
         email = email_in;
     }
-    public BugReportRecipient(String email_in){
+    public BugReportRecipient(String email_in) {
         email = email_in;
     }
+    @Override
+    public void SynchronizeFields(DBObject src) {
+        super.SynchronizeFields(src);
+        BugReportRecipient src_ = (BugReportRecipient) src;
+        bugreport_id = src_.bugreport_id;
+        email = src_.email;
+    }
 }
diff --git a/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java b/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java
index 6e7becc0..2e07a9f3 100644
--- a/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java
+++ b/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java
@@ -6,6 +6,16 @@ public class BugReportSetting extends iDBObject {
     public String bugreport_id = "";
     public String name = "";
     public String value = "";
+    public BugReportSetting() {
+    }
+    public BugReportSetting(BugReport bugReport, String name_in, Object value_in) {
+        this(name_in, value_in);
+        bugreport_id = bugReport.id;
+    }
+    public BugReportSetting(String name_in, Object value_in) {
+        name = name_in;
+        value = (value_in instanceof Boolean) ? ((boolean) value_in ? "1" : "0") : value_in.toString();
+    }
     @Override
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
@@ -14,14 +24,4 @@ public class BugReportSetting extends iDBObject {
         name = src_.name;
         value = src_.value;
     }
-    public BugReportSetting() {
-    }
-    public BugReportSetting(BugReport bugReport, String name_in, Object value_in) {
-        this(name_in, value_in);
-        bugreport_id = bugReport.id;
-    }
-    public BugReportSetting(String name_in, Object value_in){
-        name = name_in;
-        value = (value_in instanceof Boolean) ? ((boolean) value_in ? "1" : "0"): value_in.toString();
-    }
 }
diff --git a/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSettingsDBTable.java b/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSettingsDBTable.java
index 2fa9865f..04c1b650 100644
--- a/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSettingsDBTable.java
+++ b/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSettingsDBTable.java
@@ -4,5 +4,4 @@ public class BugReportSettingsDBTable extends iDBTable<BugReportSetting> {
     public BugReportSettingsDBTable() {
         super(BugReportSetting.class);
     }
-
 }
diff --git a/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
index 2771807d..6d703af6 100644
--- a/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
+++ b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
@@ -58,52 +58,5 @@ public class BugReportsDatabase extends SQLiteDatabase {
         }
     }
     public void Patch() throws Exception {
-        /*
-        Vector<BugReportSetting> settings = new Vector<>();
-        //--
-        for (BugReport bugReport : bugReports.Data.values()) {
-            //--
-            if (!bugReport.project_version.isEmpty()) {
-                if (bugReport.visualiser_version < 1134) {
-                    VisualiserSettingsJson visualiserSettingsJson = bugReport.getSettingsJson();
-                    for (VisualiserSettingJson visualiserSettingJson : visualiserSettingsJson.array) {
-                        BugReportSetting bugReportSetting = new BugReportSetting();
-                        bugReportSetting.bugreport_id = bugReport.id;
-                        bugReportSetting.name = visualiserSettingJson.name;
-                        bugReportSetting.value = visualiserSettingJson.value;
-                        settings.add(bugReportSetting);
-                    }
-                } else {
-                    SapforProperties sapforProperties = bugReport.getPropertiesJson();
-                    Vector<BugReportSetting> settings_= sapforProperties.toBugReportSettings();
-                    for (BugReportSetting bugReportSetting: settings_)
-                        bugReportSetting.bugreport_id = bugReport.id;
-                    settings.addAll(settings_);
-                }
-            }
-            //--
-        }
-        BeginTransaction();
-        for (BugReportSetting bugReportSetting : settings)
-            Insert(bugReportSetting);
-        Commit();
-         */
-        //---
-        /*
-        Vector<BugReportRecipient> recipients = new Vector<>();
-        for (BugReport bugReport: bugReports.Data.values()){
-            RecipientsJson recipientsJson = Utils_.gson.fromJson(bugReport.packedRecipientsJson, RecipientsJson.class);
-            for (RecipientJson recipientJson: recipientsJson.array){
-                recipients.add(new BugReportRecipient(bugReport, recipientJson.address));
-            }
-        }
-
-        //-
-        BeginTransaction();
-        for (BugReportRecipient recipient: recipients){
-            Insert(recipient);
-        }
-        Commit();
-         */
     }
 }
diff --git a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
index 0461cadb..085032dd 100644
--- a/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
+++ b/src/_VisualDVM/ComponentsServer/Component/Sapfor/Sapfor.java
@@ -3,8 +3,6 @@ import Common.CommonConstants;
 import Common.Passes.PassException;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
-import _VisualDVM.ComponentsServer.BugReport.BugReport;
-import _VisualDVM.ComponentsServer.BugReportSetting.BugReportSetting;
 import _VisualDVM.ComponentsServer.Component.OSDComponent;
 import _VisualDVM.ComponentsServer.Component.Visualizer_2;
 import _VisualDVM.Constants;
@@ -14,14 +12,12 @@ import _VisualDVM.Passes.Sapfor.SapforAnalysis;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Files.UI.Editor.SPFEditor;
 import _VisualDVM.ProjectData.Project.db_project_info;
-import _VisualDVM.ProjectData.SapforData.SapforProperties;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.Utils;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
-import java.lang.reflect.Field;
 import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -645,5 +641,4 @@ public abstract class Sapfor extends OSDComponent {
             Global.mainModule.getUI().getVersionsWindow().BlockVariants();
     }
     //--
-
 }
diff --git a/src/_VisualDVM/ComponentsServer/ComponentsServer.java b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
index 8f286b8e..0b1a851d 100644
--- a/src/_VisualDVM/ComponentsServer/ComponentsServer.java
+++ b/src/_VisualDVM/ComponentsServer/ComponentsServer.java
@@ -19,7 +19,6 @@ import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.ProjectData.LanguageName;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.RepositoryServer;
-import _VisualDVM.TestingSystem.DVM.DVMConfigurationTest.DVMConfigurationTest;
 import _VisualDVM.Utils;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
@@ -67,24 +66,24 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     }
     @Override
     protected void afterPublishAction(DBObject object) throws Exception {
-        if (object instanceof BugReport){
+        if (object instanceof BugReport) {
             BugReport bugReport = (BugReport) object;
-            if (bugReport.settings!=null){
-                for (BugReportSetting setting: bugReport.settings){
-                    setting.bugreport_id=bugReport.id;
+            if (bugReport.settings != null) {
+                for (BugReportSetting setting : bugReport.settings) {
+                    setting.bugreport_id = bugReport.id;
                     db.Insert(setting);
                 }
             }
-            if (bugReport.recipients!=null){
+            if (bugReport.recipients != null) {
                 db.saveBugreportRecipients(bugReport);
             }
         }
     }
     @Override
     protected void afterEditAction(DBObject object) throws Exception {
-        if (object instanceof BugReport){
+        if (object instanceof BugReport) {
             BugReport bugReport = (BugReport) object;
-            if (bugReport.recipients!=null){
+            if (bugReport.recipients != null) {
                 db.bugReportRecipients.ActualizeData(
                         db.getVectorByFK(bugReport, BugReportRecipient.class),
                         bugReport.recipients);
@@ -379,9 +378,4 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
         }
     }
-    @Override
-    public void StartAction() throws Exception {
-        super.StartAction();
-        db.Patch();
-    }
 }
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 2e98d31c..5b7ef2b3 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1230;
+    public static final int version = 1231;
     public static final int planner_version = 24;
     public static final int testingMaxKernels = 64;
     //--
@@ -47,7 +47,7 @@ public class Constants {
     public static final int MailSocketPort = 465;
     //
     //7998 отладочный порт. теперь.
-    public static final int ComponentsServerPort = 7998; //7795
+    public static final int ComponentsServerPort = 7995; //7795
     public static final int TestingServerPort = 7996;    //7996
     public static final int SocketTimeout = 0;
     //-
diff --git a/src/_VisualDVM/Passes/All/AddBugReport.java b/src/_VisualDVM/Passes/All/AddBugReport.java
index 46d18ed4..0128f516 100644
--- a/src/_VisualDVM/Passes/All/AddBugReport.java
+++ b/src/_VisualDVM/Passes/All/AddBugReport.java
@@ -45,7 +45,6 @@ public class AddBugReport extends AddObjectPass<BugReport> {
                 target.project_version = "";
                 target.visualiser_version = Global.visualiser.version;
                 target.sapfor_version = Global.components.get(ComponentType.Sapfor_F).version;
-                target.packedSettingsJson = "";
                 target.percentage = 0;
                 target.description = "Черновик отчёта об ошибке.\nЗаполните описание ошибочной ситуации, и нажмите 'Опубликовать'";
                 target.date = new Date().getTime();
diff --git a/src/_VisualDVM/Passes/All/PublishBugReport.java b/src/_VisualDVM/Passes/All/PublishBugReport.java
index 2e8f72b0..d089302f 100644
--- a/src/_VisualDVM/Passes/All/PublishBugReport.java
+++ b/src/_VisualDVM/Passes/All/PublishBugReport.java
@@ -1,5 +1,4 @@
 package _VisualDVM.Passes.All;
-import Common.Passes.Pass;
 import Common.Utils.Utils_;
 import Common.Visual.UI;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
@@ -10,7 +9,6 @@ import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.PublishServerObject;
 import _VisualDVM.Repository.EmailMessage;
 
-import java.io.File;
 import java.util.Date;
 public class PublishBugReport extends PublishServerObject<ComponentsServer, BugReport> {
     public PublishBugReport() {
@@ -21,7 +19,7 @@ public class PublishBugReport extends PublishServerObject<ComponentsServer, BugR
         return "/Common/icons/Publish.png";
     }
     @Override
-    protected boolean canStart(Object... args) throws Exception{
+    protected boolean canStart(Object... args) throws Exception {
         if (Global.componentsServer.db.bugReports.getUI().CheckCurrent(Log)) {
             target = Global.componentsServer.db.bugReports.getUI().getCurrent();
             if (!target.state.equals(BugReportState.draft)) {
@@ -53,10 +51,8 @@ public class PublishBugReport extends PublishServerObject<ComponentsServer, BugR
                 "Обнаружена ошибка " + Utils_.Brackets(target.id),
                 target.getNewMailText()
         );
-        /*
         Global.mainModule.getPass(PassCode.Email).Do(
                 message,
                 Global.componentsServer.db.recipients.getSelectedMails());
-         */
     }
 }
diff --git a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
index 95baed53..33de7c39 100644
--- a/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
+++ b/src/_VisualDVM/Passes/All/SaveBugReportRecipients.java
@@ -1,7 +1,5 @@
 package _VisualDVM.Passes.All;
-import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
-import _VisualDVM.ComponentsServer.BugReport.Json.RecipientsJson;
 import _VisualDVM.ComponentsServer.BugReportRecipient.BugReportRecipient;
 import _VisualDVM.ComponentsServer.ComponentsServer;
 import _VisualDVM.ComponentsServer.Recipient.Recipient;
@@ -20,17 +18,17 @@ public class SaveBugReportRecipients extends EditServerObject<ComponentsServer,
     }
     @Override
     protected boolean canStart(Object... args) throws Exception {
-        if (server.db.bugReports.getUI().CheckCurrent(Log)){
+        if (server.db.bugReports.getUI().CheckCurrent(Log)) {
             target = server.db.bugReports.getUI().getCurrent();
             target.recipients = new Vector<>();
-            for (Recipient recipient: server.db.recipients.getUI().getSelectedItems()){
+            for (Recipient recipient : server.db.recipients.getUI().getSelectedItems()) {
                 target.recipients.add(new BugReportRecipient(recipient.email));
             }
-            switch (target.state){
+            switch (target.state) {
                 case draft:
                     break;
                 default:
-                    for (BugReportRecipient recipient: target.recipients)
+                    for (BugReportRecipient recipient : target.recipients)
                         recipient.bugreport_id = target.id;
                     target.change_date = new Date().getTime();
                     return true;