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

---
 .idea/workspace.xml                           |  8 +++--
 .../ComponentsServer/BugReport/BugReport.java |  6 ++++
 .../BugReport/UI/BugReportsForm.java          |  6 ++++
 .../BugReportRecipient.java                   |  5 +++
 .../BugReportSetting/BugReportSetting.java    |  5 +++
 .../ComponentsServer/BugReportsDatabase.java  | 32 +++++++++++++++++++
 src/_VisualDVM/Constants.java                 |  2 +-
 7 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f4e8bbb8..bfaeafc3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.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/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java" afterDir="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/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java b/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
index 342acab9..f5e1a35d 100644
--- a/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java
@@ -1,4 +1,5 @@
 package _VisualDVM.ComponentsServer.BugReport;
+import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.rDBObject;
 import Common.Utils.TextLog;
@@ -18,6 +19,10 @@ import java.nio.file.Paths;
 import java.util.Date;
 import java.util.Vector;
 public class BugReport extends rDBObject {
+    //---
+    @Description("DEFAULT '-1'")
+    public int id_ = CommonConstants.Nan;
+    //---
     public String project_version = "";
     public long visualiser_version = -1;
     public long sapfor_version = -1;
@@ -62,6 +67,7 @@ public class BugReport extends rDBObject {
     public void SynchronizeFields(DBObject src) {
         super.SynchronizeFields(src);
         BugReport b = (BugReport) src;
+        id_ = b.id_;
         change_date = b.change_date;
         description = b.description;
         comment = b.comment;
diff --git a/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java b/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java
index 508b8c06..9a16710f 100644
--- a/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java
+++ b/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java
@@ -100,6 +100,12 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
                     public Class getRendererClass() {
                         return RendererStatusEnum.class;
                     }
+                },
+                new ColumnInfo<BugReport>("id_") {
+                    @Override
+                    public Object getFieldAt(BugReport object) {
+                        return object.id_;
+                    }
                 }
         );
     }
diff --git a/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java b/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java
index c68e12d8..4e73e378 100644
--- a/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java
+++ b/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java
@@ -1,10 +1,14 @@
 package _VisualDVM.ComponentsServer.BugReportRecipient;
+import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
+import com.sun.org.glassfish.gmbal.Description;
 public class BugReportRecipient extends iDBObject {
     public String bugreport_id = "";
     public String email = "";
+    @Description("DEFAULT '-1'")
+    public int bugreport_id_ = CommonConstants.Nan;
     public BugReportRecipient() {
     }
     public BugReportRecipient(BugReport bugReport, String email_in) {
@@ -20,5 +24,6 @@ public class BugReportRecipient extends iDBObject {
         BugReportRecipient src_ = (BugReportRecipient) src;
         bugreport_id = src_.bugreport_id;
         email = src_.email;
+        bugreport_id_ = src_.bugreport_id_;
     }
 }
diff --git a/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java b/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java
index 2e07a9f3..325b349c 100644
--- a/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java
+++ b/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java
@@ -1,11 +1,15 @@
 package _VisualDVM.ComponentsServer.BugReportSetting;
+import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.iDBObject;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
+import com.sun.org.glassfish.gmbal.Description;
 public class BugReportSetting extends iDBObject {
     public String bugreport_id = "";
     public String name = "";
     public String value = "";
+    @Description("DEFAULT '-1'")
+    public int bugreport_id_ = CommonConstants.Nan;
     public BugReportSetting() {
     }
     public BugReportSetting(BugReport bugReport, String name_in, Object value_in) {
@@ -23,5 +27,6 @@ public class BugReportSetting extends iDBObject {
         bugreport_id = src_.bugreport_id;
         name = src_.name;
         value = src_.value;
+        bugreport_id_ = src_.bugreport_id_;
     }
 }
diff --git a/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
index 6d703af6..8b976ad8 100644
--- a/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
+++ b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
@@ -4,11 +4,13 @@ import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.ComponentsServer.BugReport.BugReportsDBTable;
 import _VisualDVM.ComponentsServer.BugReportRecipient.BugReportRecipient;
 import _VisualDVM.ComponentsServer.BugReportRecipient.BugReportRecipientsDBTable;
+import _VisualDVM.ComponentsServer.BugReportSetting.BugReportSetting;
 import _VisualDVM.ComponentsServer.BugReportSetting.BugReportSettingsDBTable;
 import _VisualDVM.ComponentsServer.Recipient.RecipientsDataSet;
 import _VisualDVM.Passes.PassCode;
 
 import java.nio.file.Paths;
+import java.util.Comparator;
 import java.util.Vector;
 public class BugReportsDatabase extends SQLiteDatabase {
     public BugReportsDBTable bugReports;
@@ -27,6 +29,8 @@ public class BugReportsDatabase extends SQLiteDatabase {
     @Override
     public void Init() throws Exception {
         DeleteDrafts();
+        //--
+        Patch();
     }
     @Override
     public PassCode getSynchronizePassCode() {
@@ -58,5 +62,33 @@ public class BugReportsDatabase extends SQLiteDatabase {
         }
     }
     public void Patch() throws Exception {
+        int i = 0;
+        Vector<BugReport> sortedBugs = new Vector<>(bugReports.Data.values());
+        sortedBugs.sort(new Comparator<BugReport>() {
+            @Override
+            public int compare(BugReport o1, BugReport o2) {
+                return Long.compare(o1.date,o2.date);
+            }
+        });
+        //--
+        for (BugReport bugReport: sortedBugs){
+            bugReport.id_ = i;
+            ++i;
+            Update(bugReport);
+        }
+        //--
+        for (BugReport bugReport: sortedBugs){
+            Vector<BugReportSetting> bugSettings = getVectorByFK(bugReport, BugReportSetting.class);
+            Vector<BugReportRecipient> bugReportRecipients = getVectorByFK(bugReport, BugReportRecipient.class);
+            for (BugReportSetting setting: bugSettings){
+                setting.bugreport_id_ = bugReport.id_;
+                Update(setting);
+            }
+            for (BugReportRecipient recipient: bugReportRecipients){
+                recipient.bugreport_id_ = bugReport.id_;
+                Update(recipient);
+            }
+        }
+        //--
     }
 }
diff --git a/src/_VisualDVM/Constants.java b/src/_VisualDVM/Constants.java
index 5409715b..cfa08ffc 100644
--- a/src/_VisualDVM/Constants.java
+++ b/src/_VisualDVM/Constants.java
@@ -47,7 +47,7 @@ public class Constants {
     public static final int MailSocketPort = 465;
     //
     //7998 отладочный порт. теперь.
-    public static final int ComponentsServerPort = 7995; //7795
+    public static final int ComponentsServerPort = 7998; //7795
     public static final int TestingServerPort = 7996;    //7996
     public static final int SocketTimeout = 0;
     //-