отладочный порт

.idea/workspace.xml

@@ -7,7 +7,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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": "E:\\Tests\\Downloads\\1384\\DIFF3D\\v3",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1765484296",
   "DocumentsDirectory": "C:\\Users\\misha\\Documents\\_testing_system",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
@@ -33,9 +33,9 @@
   "CompleteRunEnvironments": true,
   "CreateEthalonTasks": true,
   "ErasePackageWorkspace": true,
-  "lastMachineId": -1,
+  "lastMachineId": 13,
-  "lastUserId": -1,
+  "lastUserId": 34,
-  "lastCompilerId": -1,
+  "lastCompilerId": 52,
   "RegisterOn": false,
   "SpacesOn": false,
   "EmptyLinesOn": false,

src/_VisualDVM/ComponentsServer/BugReport/BugReport.java

@@ -1,7 +1,6 @@
 package _VisualDVM.ComponentsServer.BugReport;
-import Common.CommonConstants;
 import Common.Database.Objects.DBObject;
-import Common.Database.Objects.riDBObject;
+import Common.Database.Objects.rDBObject;
 import Common.Utils.TextLog;
 import Common.Utils.Utils_;
 import Common.Utils.Vector_;
@@ -18,8 +17,7 @@ import java.io.File;
 import java.nio.file.Paths;
 import java.util.Date;
 import java.util.Vector;
-public class BugReport extends riDBObject {
+public class BugReport extends rDBObject {
-    //---
     public String project_version = "";
     public long visualiser_version = -1;
     public long sapfor_version = -1;
@@ -40,17 +38,13 @@ public class BugReport extends riDBObject {
     public File owner = null;
     @Description("IGNORE")
     public byte[] packed_archive = null;
-    //--
-    public long date = 0;
-    public long change_date;
-    //--
     public BugReport() {
     }
     public BugReport(BugReport src) {
         this.SynchronizeFields(src);
     }
     public BugReport(String sender_name_in, String sender_address_in, String description_in, String version_in) {
-        id = CommonConstants.Nan;
+        genName();
         sender_name = sender_name_in;
         sender_address = sender_address_in;
         project_version = version_in;
@@ -82,16 +76,11 @@ public class BugReport extends riDBObject {
         descriptionAdditionDraft = b.descriptionAdditionDraft;
         commentAdditionDraft = b.commentAdditionDraft;
         owner = b.owner;
-        change_date = b.change_date;
     }
     //--
-    public File getHome() {
-        return Utils_.getFile(System.getProperty("user.dir"), "BugReports", String.valueOf(id));
-    }
     public File getArchiveFile() {
-        return new File(getHome(),id + ".zip");
+        return Paths.get(System.getProperty("user.dir"), "Bugs", id + ".zip").toFile();
     }
-    //--
     public String getDescriptionHeader() {
         if (description != null) {
             String[] data = description.split("\n");

src/_VisualDVM/ComponentsServer/BugReport/Json/BugReportAdditionJson.java

@@ -1,12 +1,11 @@
 package _VisualDVM.ComponentsServer.BugReport.Json;
-import Common.CommonConstants;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import com.google.gson.annotations.Expose;
 
 import java.io.Serializable;
 public class BugReportAdditionJson implements Serializable {
     @Expose
-    public int id = CommonConstants.Nan;
+    public String id = "";
     @Expose
     public String fieldName = "";
     @Expose

src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java

@@ -101,14 +101,6 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
                         return RendererStatusEnum.class;
                     }
                 }
-                /*,
-                new ColumnInfo<BugReport>("id_") {
-                    @Override
-                    public Object getFieldAt(BugReport object) {
-                        return object.id_;
-                    }
-                }
-                 */
         );
     }
     @Override
@@ -151,7 +143,7 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
     public DataMenuBar createMenuBar() {
         return new DataMenuBar(dataSource.getPluralDescription(),
                 PassCode.SynchronizeBugReports,
-              //  PassCode.DownloadAllBugReportsArchives,
+                PassCode.DownloadAllBugReportsArchives,
                 PassCode.AddBugReport,
                 PassCode.PublishBugReport,
                 PassCode.OpenBugReportTestProject,
@@ -162,14 +154,13 @@ public class BugReportsForm extends DataSetControlForm<BugReport> {
     }
     @Override
     protected Comparator<BugReport> getDefaultComparator() {
-
+        return (o1, o2) -> -(o1.getDate().compareTo(o2.getDate()));
-        return (o1, o2) -> -Long.compare(o1.date, o2.date);
     }
     @Override
     public boolean isObjectVisible(BugReport object) {
         return super.isObjectVisible(object) && (
                 object.state.equals(BugReportState.draft) ||
-                        (String.valueOf(object.id)).toUpperCase().contains(filterKey.toUpperCase())
+                        object.id.toUpperCase().contains(filterKey.toUpperCase())
                                 && object.sender_name.toUpperCase().contains(filterSenderName.toUpperCase())
                                 && object.description.toUpperCase().contains(filterDescription.toUpperCase())
                                 && object.comment.toUpperCase().contains(filterComment.toUpperCase())

src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java

@@ -1,13 +1,10 @@
 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) {

src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipientsDBTable.java

@@ -6,6 +6,6 @@ public class BugReportRecipientsDBTable extends iDBTable<BugReportRecipient> {
     }
     @Override
     public boolean isEqual(BugReportRecipient o1, BugReportRecipient o2) {
-        return o1.bugreport_id==o2.bugreport_id && o1.email.equals(o2.email);
+        return o1.bugreport_id.equals(o2.bugreport_id) && o1.email.equals(o2.email);
     }
 }

src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java

@@ -1,14 +1,11 @@
 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) {

src/_VisualDVM/ComponentsServer/BugReportsDatabase.java

@@ -1,21 +1,14 @@
 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;
 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;
 public class BugReportsDatabase extends SQLiteDatabase {
     public BugReportsDBTable bugReports;
@@ -34,8 +27,6 @@ public class BugReportsDatabase extends SQLiteDatabase {
     @Override
     public void Init() throws Exception {
         DeleteDrafts();
-        //--
-        Patch();
     }
     @Override
     public PassCode getSynchronizePassCode() {
@@ -67,72 +58,5 @@ 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);
-            }
-        }
-        //перенос архивов
-        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);
-            }
-        }
-        //--
-        //упоминания других багов.
-        for (BugReport bugReport: sortedBugs){
-            //--
-            Vector<String> mentioned_keys = new Vector<>();
-            for (String id: bugReports.Data.keySet()){
-                if ((bugReport.description.contains(id) || bugReport.comment.contains(id)) && !mentioned_keys.contains(id)){
-                    mentioned_keys.add(id);
-                }
-            }
-            //--
-            for (String id: mentioned_keys){
-                BugReport owner = bugReports.get(id);
-                if (owner!=null) {
-                    bugReport.comment = bugReport.comment.replace(id, String.valueOf(owner.id_));
-                    bugReport.description = bugReport.description.replace(id, String.valueOf(owner.id_));
-                    Update(bugReport);
-                }
-            }
-
-        }
-        */
     }
 }

src/_VisualDVM/ComponentsServer/ComponentsServer.java

@@ -46,7 +46,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     }
     @Override
     protected void extraBackup(File todayBackUp) {
-        zip.Do("BugReports", new File(todayBackUp, "BugReports.zip").getAbsolutePath());
+        zip.Do("Bugs", new File(todayBackUp, "Bugs.zip").getAbsolutePath());
     }
     @Override
     public Database getDb() {
@@ -55,9 +55,18 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         return super.getDb();
     }
     @Override
+    protected void beforePublishAction(DBObject object) throws Exception {
+        if (object instanceof BugReport) {
+            BugReport bugReport = (BugReport) object;
+            if (bugReport.packed_archive != null) {
+                File bugArchive = Utils_.getFile(Utils_.getHomePath(), "Bugs", bugReport.id);
+                Utils_.bytesToFile(bugReport.packed_archive, bugArchive);
+            }
+        }
+    }
+    @Override
     protected void afterPublishAction(DBObject object) throws Exception {
         if (object instanceof BugReport) {
-            //---
             BugReport bugReport = (BugReport) object;
             if (bugReport.settings != null) {
                 for (BugReportSetting setting : bugReport.settings) {
@@ -68,14 +77,6 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
             if (bugReport.recipients != null) {
                 db.saveBugreportRecipients(bugReport);
             }
-            //-->
-            Utils_.CheckAndCleanDirectory(bugReport.getHome());
-            //-->
-            if (bugReport.packed_archive != null) {
-                File bugArchive = bugReport.getArchiveFile();
-                Utils_.bytesToFile(bugReport.packed_archive, bugArchive);
-                bugReport.packed_archive = null;
-            }
         }
     }
     @Override
@@ -93,7 +94,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     protected void afterDeleteAction(DBObject object) throws Exception {
         if (object instanceof BugReport) {
             BugReport bugReport = (BugReport) object;
-            Utils_.forceDeleteWithCheck(bugReport.getHome());
+            if (!bugReport.project_version.isEmpty()) Utils_.forceDeleteWithCheck(bugReport.getArchiveFile());
         } else if (object instanceof UserAccount) {
             UserAccount account = (UserAccount) object;
             Utils_.forceDeleteWithCheck(account.getServerKeyFile());
@@ -169,7 +170,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
     void ReceiveAllArchives() throws Exception {
         ZipFolderPass zip = new ZipFolderPass();
         File archives = new File(Utils_.getDateName("Bugs"));
-        if (zip.Do("BugReports", archives.getAbsolutePath())) {
+        if (zip.Do("Bugs", archives.getAbsolutePath())) {
             response.object = Utils_.fileToBytes(archives);
         } else throw new RepositoryRefuseException("Не удалось запаковать архивы");
     }
@@ -178,7 +179,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
         response.arg = credentials_db.userAccounts.getPackedActiveRecipients();
     }
     void ReceiveBugReport() throws Exception {
-        File bugArchive = Utils_.getFile(Utils_.getHomePath(), "BugReports", request.arg, request.arg + ".zip");
+        File bugArchive = Utils_.getFile(Utils_.getHomePath(), "Bugs", request.arg);
         response.object = Utils_.fileToBytes(bugArchive);
     }
     void UpdateBugReport() throws Exception {

src/_VisualDVM/ComponentsServer/UserAccount/UserAccount.java

@@ -2,6 +2,7 @@ package _VisualDVM.ComponentsServer.UserAccount;
 import Common.Database.Objects.DBObject;
 import Common.Database.Objects.iDBObject;
 import Common.Utils.TextLog;
+import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.Global;
 import com.sun.org.glassfish.gmbal.Description;
 import org.apache.commons.io.FileUtils;
@@ -74,6 +75,20 @@ public class UserAccount extends iDBObject {
     public boolean CheckAccessRights(String address_in, TextLog log) {
         return (CheckRegistered(log) && CheckAuthorship(address_in, log));
     }
+    public boolean ExtendedCheckAccessRights(BugReport bugReport, TextLog log) {
+        if (CheckRegistered(log)) {
+            if (email.equals(bugReport.executor_address)) {
+                //метод вывести как нерабочий.когда будет изменена схема админства.
+                return true;
+            } else {
+                if (!isAdmin() && (!email.equals(bugReport.sender_address))) {
+                    log.Writeln_("Вы не являетесь автором, исполнителем, или администратором");
+                    return false;
+                } else return true;
+            }
+        }
+        return false;
+    }
     public boolean isAdmin() {
         return role.equals(AccountRole.Admin);
     }

src/_VisualDVM/Constants.java

@@ -3,7 +3,7 @@ import Common.Utils.Vector_;
 
 import java.util.Vector;
 public class Constants {
-    public static final int version = 1263;
+    public static final int version = 1261;
     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 = 7995; //7795
+    public static final int ComponentsServerPort = 7998; //7795
     public static final int TestingServerPort = 7996;    //7996
     public static final int SocketTimeout = 0;
     //-

src/_VisualDVM/Global.java

@@ -65,7 +65,7 @@ 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(), "BugReports"));
+        Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
         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 +88,7 @@ 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(), "BugReports"));
+        Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
         Utils_.CheckDirectory(KeysDirectory = new File(Utils_.getHomeDirectory(), Constants.KeyDirectoryName));
     }
     public static void CheckTestingSystemDirectories() {

src/_VisualDVM/Passes/All/AddBugReport.java

@@ -1,5 +1,4 @@
 package _VisualDVM.Passes.All;
-import Common.CommonConstants;
 import Common.Database.Database;
 import Common.Passes.AddObjectPass;
 import Common.Utils.Utils_;
@@ -31,10 +30,6 @@ public class AddBugReport extends AddObjectPass<BugReport> {
             Log.Writeln_("Для создания отчёта требуется регистрация");
             return false;
         }
-        if (getDb().getTable(BugReport.class).containsKey(CommonConstants.Nan)){
-            Log.Writeln_("Может существовать не более одного черновика одновременно!");
-            return false;
-        }
         if (Global.mainModule.HasProject()) {
             String version = Global.mainModule.getProject().Home.getAbsolutePath().substring(Global.mainModule.getRoot().Home.getParent().length());
             if (version.toCharArray()[0] == '\\') version = version.substring(1);
@@ -44,7 +39,7 @@ public class AddBugReport extends AddObjectPass<BugReport> {
         } else {
             if (UI.Warning("Создать отчёт об ошибке без прикрепления проекта.")) {
                 target = new BugReport();
-                target.id = CommonConstants.Nan;
+                target.genName();
                 target.sender_name = Global.mainModule.getAccount().name;
                 target.sender_address = Global.mainModule.getAccount().email;
                 target.project_version = "";
@@ -67,12 +62,10 @@ public class AddBugReport extends AddObjectPass<BugReport> {
     }
     @Override
     protected void body() throws Exception {
-        //--
+        super.body();
-        Utils_.CheckAndCleanDirectory(target.getHome());
-        //--
         if (!target.project_version.isEmpty()) {
             Global.mainModule.getRoot().cleanDepAndGCOVR(); //удаление депов и гкова
-            //логи во вложения. todo переделать в полноценные вложения.
+            //логи во вложения.
             File attachementsDir = Global.mainModule.getProject().getAttachmentsDirectory();
             Vector<File> logs = new Vector<>();
             logs.add(Utils_.MainLog.getLogFile());
@@ -87,7 +80,6 @@ public class AddBugReport extends AddObjectPass<BugReport> {
             Global.mainModule.getPass(PassCode.ZipFolderPass).Do(Global.mainModule.getRoot().Home.getAbsolutePath(),
                     target.getArchiveFile().getAbsolutePath());
         }
-        getDb().getTable(BugReport.class).put(target.id, target);
     }
     @Override
     protected boolean validate() {

src/_VisualDVM/Passes/All/AppendBugReportField.java

@@ -76,7 +76,6 @@ public class AppendBugReportField extends ComponentsServerPass<BugReport> {
                 message_header + " " + Utils_.Brackets(Global.mainModule.getAccount().name),
                 message_text
         );
-
         Global.mainModule.getPass(PassCode.Email).Do(
                 message,
                 Global.componentsServer.db.recipients.getSelectedMails());

src/_VisualDVM/Passes/All/DeleteBugReport.java

@@ -1,7 +1,6 @@
 package _VisualDVM.Passes.All;
 import Common.Database.Database;
 import Common.Passes.DeleteObjectPass;
-import Common.Utils.Utils_;
 import _VisualDVM.ComponentsServer.BugReport.BugReport;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
@@ -16,7 +15,6 @@ public class DeleteBugReport extends DeleteObjectPass<BugReport> {
     @Override
     protected void performDone() throws Exception {
         super.performDone();
-        Utils_.forceDeleteWithCheck(target.getHome());
         Global.mainModule.getPass(PassCode.DeleteBugReportFromServer).Do(target);
     }
     @Override

src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java

@@ -1,5 +1,4 @@
 package _VisualDVM.Passes.All;
-import Common.Utils.Utils_;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
@@ -11,7 +10,6 @@ import org.apache.commons.io.FileUtils;
 import java.io.File;
 import java.nio.file.Paths;
 public class DownloadAllBugReportsArchives extends ComponentsServerPass<File> {
-    //упраздненный временно проход.
     @Override
     public String getIconPath() {
         return "/icons/DownloadAll.png";
@@ -46,12 +44,10 @@ public class DownloadAllBugReportsArchives extends ComponentsServerPass<File> {
         //теперь скопировать это в папку Bugs, с нормальными именами через zip
         File t2 = Paths.get(tempFolder.getAbsolutePath(), "Bugs").toFile();
         File[] archives = t2.listFiles();
-        /*
         if (archives != null) {
             for (File file : archives) {
-                FileUtils.moveFile(file, Paths.get(Global.BugReportsDirectory_OLD.getAbsolutePath(), file.getName() + ".zip").toFile());
+                FileUtils.moveFile(file, Paths.get(Global.BugReportsDirectory.getAbsolutePath(), file.getName() + ".zip").toFile());
             }
         }
-         */
     }
 }

src/_VisualDVM/Passes/All/DownloadBugReport.java

@@ -8,7 +8,7 @@ public class DownloadBugReport extends ComponentsServerPass<BugReport> {
     @Override
     protected boolean canStart(Object... args) {
         target = (BugReport) args[0];
-        return !target.getArchiveFile().exists() && SendRequest(ServerCode.ReceiveBugReport, String.valueOf(target.id));
+        return !target.getArchiveFile().exists() && SendRequest(ServerCode.ReceiveBugReport, target.id);
     }
     @Override
     protected void performPreparation() throws Exception {
@@ -16,7 +16,6 @@ public class DownloadBugReport extends ComponentsServerPass<BugReport> {
     }
     @Override
     protected void body() throws Exception {
-        Utils_.CheckAndCleanDirectory(target.getHome());
         Utils_.bytesToFile((byte[]) request.server_response.object, target.getArchiveFile());
     }
     @Override

src/_VisualDVM/Passes/All/OpenBugReportTestProject.java

@@ -23,7 +23,7 @@ public class OpenBugReportTestProject extends Pass<BugReport> {
         if (Global.componentsServer.db.CheckCurrent(Log, BugReport.class) &&
                 (target = Global.componentsServer.db.bugReports.getUI().getCurrent()).CheckNotDraft(Log)) {
             if (!target.project_version.isEmpty()) {
-                root = new File(Global.visualiser.getDownloadsDirectory(), String.valueOf(target.id));
+                root = new File(Global.visualiser.getDownloadsDirectory(), target.id);
                 project = new File(root,
                         Utils_.isWindows() ? Utils_.toW(target.project_version) : Utils_.toU(target.project_version)
                 );

src/_VisualDVM/Passes/All/PublishBugReport.java

@@ -48,7 +48,7 @@ public class PublishBugReport extends PublishServerObject<ComponentsServer, BugR
     protected void performDone() throws Exception {
         //3- рассылка
         EmailMessage message = new EmailMessage(
-                "Обнаружена ошибка " + Utils_.Brackets(pk),
+                "Обнаружена ошибка " + Utils_.Brackets(target.id),
                 target.getNewMailText()
         );
         Global.mainModule.getPass(PassCode.Email).Do(

src/_VisualDVM/Passes/All/UpdateBugReportField.java

@@ -124,7 +124,6 @@ public class UpdateBugReportField extends ComponentsServerPass<BugReport> {
                     message_header + " " + Utils_.Brackets(Global.mainModule.getAccount().name),
                     message_text
             );
-
             Global.mainModule.getPass(PassCode.Email).Do(
                     message,
                     Global.componentsServer.db.recipients.getSelectedMails());