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

---
 .idea/workspace.xml                           |  8 +++----
 properties                                    |  6 +++---
 .../ComponentsServer/BugReportsDatabase.java  | 21 +++++++++++++++++++
 src/_VisualDVM/Global.java                    |  7 +++++--
 .../All/DownloadAllBugReportsArchives.java    |  4 +++-
 .../Passes/All/DownloadBugReport.java         |  1 +
 6 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bfaeafc3..cfdbe620 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,12 +8,10 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <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" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 6251db0b..2f05e210 100644
--- a/properties
+++ b/properties
@@ -33,9 +33,9 @@
   "CompleteRunEnvironments": true,
   "CreateEthalonTasks": true,
   "ErasePackageWorkspace": true,
-  "lastMachineId": 13,
-  "lastUserId": 34,
-  "lastCompilerId": 52,
+  "lastMachineId": -1,
+  "lastUserId": -1,
+  "lastCompilerId": -1,
   "RegisterOn": false,
   "SpacesOn": false,
   "EmptyLinesOn": false,
diff --git a/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
index 8b976ad8..1daee848 100644
--- a/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
+++ b/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
@@ -1,5 +1,6 @@
 package _VisualDVM.ComponentsServer;
 import Common.Database.SQLITE.SQLiteDatabase;
+import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.ComponentsServer.BugReport.BugReportsDBTable;
 import _VisualDVM.ComponentsServer.BugReportRecipient.BugReportRecipient;
@@ -7,8 +8,12 @@ import _VisualDVM.ComponentsServer.BugReportRecipient.BugReportRecipientsDBTable
 import _VisualDVM.ComponentsServer.BugReportSetting.BugReportSetting;
 import _VisualDVM.ComponentsServer.BugReportSetting.BugReportSettingsDBTable;
 import _VisualDVM.ComponentsServer.Recipient.RecipientsDataSet;
+import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
+import _VisualDVM.Utils;
+import org.apache.commons.io.FileUtils;
 
+import java.io.File;
 import java.nio.file.Paths;
 import java.util.Comparator;
 import java.util.Vector;
@@ -89,6 +94,22 @@ public class BugReportsDatabase extends SQLiteDatabase {
                 Update(recipient);
             }
         }
+        //перенос архивов
+        for (BugReport bugReport: sortedBugs){
+            System.out.println("bugreport_id="+bugReport.id+"/"+bugReport.id_);
+            File new_home = new File(Global.BugReportsDirectory,String.valueOf(bugReport.id_));
+            //--
+            if (!new_home.exists())
+                FileUtils.forceMkdir(new_home);
+            //--
+            Utils.CleanDirectory(new_home);
+            //--
+            File old_archive = new File(Global.BugReportsDirectory_OLD, bugReport.id);
+            File new_archive = new File(new_home,String.valueOf(bugReport.id_)+".zip");
+            if (old_archive.exists()) {
+                FileUtils.copyFile(old_archive, new_archive);
+            }
+        }
         //--
     }
 }
diff --git a/src/_VisualDVM/Global.java b/src/_VisualDVM/Global.java
index 9565d409..b9d4caf4 100644
--- a/src/_VisualDVM/Global.java
+++ b/src/_VisualDVM/Global.java
@@ -37,6 +37,7 @@ public class Global {
     public static File ComponentsDirectory;
     public static File KeysDirectory;
     public static File DataDirectory;
+    public static File BugReportsDirectory_OLD;
     public static File BugReportsDirectory;
     public static File BackUpsDirectory; //бекапы компонентов на локальной машине.
     public static File TempDirectory;
@@ -65,7 +66,8 @@ public class Global {
         Utils_.CheckDirectory(DataDirectory = new File(Utils_.getHomeDirectory(), Constants.DataDirectoryName));
         //-
         Utils_.CheckDirectory(RepoDirectory = new File(Utils_.getHomeDirectory(), Constants.RepoDirectoryName));
-        Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
+        Utils_.CheckDirectory(BugReportsDirectory_OLD = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
+        Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), "BugReports"));
         Utils_.CheckDirectory(BackUpsDirectory = new File(Utils_.getHomeDirectory(), Constants.BackUpsDirectoryName));
         Utils_.CheckDirectory(ProjectsDirectory = new File(Utils_.getHomeDirectory(), Constants.ProjectsDirectoryName));
         Utils_.CheckDirectory(CompilationTasksDirectory = new File(Utils_.getHomeDirectory(), Constants.CompilationTasksDirectoryName));
@@ -88,7 +90,8 @@ public class Global {
         Utils_.CheckDirectory(DataDirectory = new File(Utils_.getHomeDirectory(), Constants.DataDirectoryName));
         Utils_.CheckDirectory(DataBackUpsDirectory = new File(Utils_.getHomeDirectory(), Constants.DataBackUpsDirectoryName));
         //--
-        Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
+        Utils_.CheckDirectory(BugReportsDirectory_OLD = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
+        Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), "BugReports"));
         Utils_.CheckDirectory(KeysDirectory = new File(Utils_.getHomeDirectory(), Constants.KeyDirectoryName));
     }
     public static void CheckTestingSystemDirectories() {
diff --git a/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java b/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java
index d3e6e755..486ac606 100644
--- a/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java
+++ b/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java
@@ -1,4 +1,5 @@
 package _VisualDVM.Passes.All;
+import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
@@ -18,6 +19,7 @@ public class DownloadAllBugReportsArchives extends ComponentsServerPass<File> {
     protected void performPreparation() throws Exception {
         Global.mainModule.getPass(PassCode.CloseCurrentProject).Do();
         Global.mainModule.set(Current.Root, null); //чтобы гарантированно не существовало корня.
+        Utils.CleanDirectory(Global.BugReportsDirectory_OLD);
         Utils.CleanDirectory(Global.BugReportsDirectory);
     }
     @Override
@@ -46,7 +48,7 @@ public class DownloadAllBugReportsArchives extends ComponentsServerPass<File> {
         File[] archives = t2.listFiles();
         if (archives != null) {
             for (File file : archives) {
-                FileUtils.moveFile(file, Paths.get(Global.BugReportsDirectory.getAbsolutePath(), file.getName() + ".zip").toFile());
+                FileUtils.moveFile(file, Paths.get(Global.BugReportsDirectory_OLD.getAbsolutePath(), file.getName() + ".zip").toFile());
             }
         }
     }
diff --git a/src/_VisualDVM/Passes/All/DownloadBugReport.java b/src/_VisualDVM/Passes/All/DownloadBugReport.java
index 147861f5..328192cb 100644
--- a/src/_VisualDVM/Passes/All/DownloadBugReport.java
+++ b/src/_VisualDVM/Passes/All/DownloadBugReport.java
@@ -12,6 +12,7 @@ public class DownloadBugReport extends ComponentsServerPass<BugReport> {
     }
     @Override
     protected void performPreparation() throws Exception {
+        Utils_.CheckDirectory(Global.BugReportsDirectory_OLD);
         Utils_.CheckDirectory(Global.BugReportsDirectory);
     }
     @Override