no message

.idea/workspace.xml

@@ -8,11 +8,9 @@
   <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/Common/Database/Database.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Database/Database.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeBugReports.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/SynchronizeTests.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/BugReportsDatabase.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/ClientPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/Server/RepositoryPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/_VisualDVM/Passes/All/CheckRegistrationOnServer.java

@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Repository.Subscribes.Subscriber;
-public class CheckRegistrationOnServer extends ComponentsRepositoryPass<Subscriber> {
+public class CheckRegistrationOnServer extends ComponentsRepositoryPass_OLD<Subscriber> {
     @Override
     protected void ServerAction() throws Exception {
         Command(new ServerExchangeUnit_2021(ServerCode.CheckSubscriberRole, "", Global.mainModule.getAccount()));

src/_VisualDVM/Passes/All/CheckRemoteWorkspace.java

@@ -3,11 +3,11 @@ import Common.MainModule_;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Machine.Machine;
 import _VisualDVM.GlobalData.User.User;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
-public class CheckRemoteWorkspace extends ComponentsRepositoryPass<SubscriberWorkspace> {
+public class CheckRemoteWorkspace extends ComponentsRepositoryPass_OLD<SubscriberWorkspace> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = null;

src/_VisualDVM/Passes/All/DVMConvertProject.java

@@ -5,7 +5,7 @@ import Common.Visual.UI;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -18,7 +18,7 @@ import java.io.File;
 import java.nio.file.Paths;
 import java.util.Date;
 import java.util.Vector;
-public class DVMConvertProject extends ComponentsRepositoryPass<db_project_info> {
+public class DVMConvertProject extends ComponentsRepositoryPass_OLD<db_project_info> {
     File workspace = null;
     File archive = null;
     Vector<DBProjectFile> programsToConvert = null;

src/_VisualDVM/Passes/All/DeleteBugReportFromServer.java

@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-public class DeleteBugReportFromServer extends ComponentsRepositoryPass<BugReport> {
+public class DeleteBugReportFromServer extends ComponentsRepositoryPass_OLD<BugReport> {
     @Override
     protected boolean canStart(Object... args) {
         target = (BugReport) args[0];

src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java

@@ -2,7 +2,7 @@ package _VisualDVM.Passes.All;
 import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Utils;
@@ -10,7 +10,7 @@ import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 import java.nio.file.Paths;
-public class DownloadAllBugReportsArchives extends ComponentsRepositoryPass<File> {
+public class DownloadAllBugReportsArchives extends ComponentsRepositoryPass_OLD<File> {
     @Override
     public String getIconPath() {
         return "/icons/DownloadAll.png";

src/_VisualDVM/Passes/All/DownloadBugReport.java

@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-public class DownloadBugReport extends ComponentsRepositoryPass<BugReport> {
+public class DownloadBugReport extends ComponentsRepositoryPass_OLD<BugReport> {
     @Override
     protected boolean canStart(Object... args) {
         target = (BugReport) args[0];

src/_VisualDVM/Passes/All/DownloadComponent.java

@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
-public class DownloadComponent extends ComponentsRepositoryPass<Component> {
+public class DownloadComponent extends ComponentsRepositoryPass_OLD<Component> {
     @Override
     protected void ServerAction() throws Exception {
         target = Global.components.getUI().getCurrent();

src/_VisualDVM/Passes/All/Email.java

@@ -1,11 +1,11 @@
 package _VisualDVM.Passes.All;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 
 import java.util.Vector;
-public class Email extends ComponentsRepositoryPass<EmailMessage> {
+public class Email extends ComponentsRepositoryPass_OLD<EmailMessage> {
     Vector<String> recipients;
     @Override
     protected boolean canStart(Object... args) throws Exception {

src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java

@@ -1,12 +1,12 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 
 import java.io.File;
 import java.util.Vector;
-public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass<Vector<File>> {
+public class GetComponentsBackupsFromServer extends ComponentsRepositoryPass_OLD<Vector<File>> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();

src/_VisualDVM/Passes/All/PingComponentsServer.java

@@ -1,10 +1,10 @@
 package _VisualDVM.Passes.All;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 
 import java.net.ConnectException;
-public class PingComponentsServer extends ComponentsRepositoryPass {
+public class PingComponentsServer extends ComponentsRepositoryPass_OLD {
     boolean flag;
     boolean silent;
     @Override

src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java

@@ -1,9 +1,9 @@
 package _VisualDVM.Passes.All;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Repository.SubscriberWorkspace.SubscriberWorkspace;
-public class PublishRemoteWorkspace extends ComponentsRepositoryPass<SubscriberWorkspace> {
+public class PublishRemoteWorkspace extends ComponentsRepositoryPass_OLD<SubscriberWorkspace> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = (SubscriberWorkspace) args[0];

src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java

@@ -9,7 +9,7 @@ import _VisualDVM.Global;
 import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
 import _VisualDVM.Passes.CurrentComponentPass;
 import _VisualDVM.Passes.PassCode;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Utils;
@@ -90,7 +90,7 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
     @Override
     protected void body() throws Exception {
         //1. Скачать файл.
-        Pass receivePass = new ComponentsRepositoryPass() {
+        Pass receivePass = new ComponentsRepositoryPass_OLD() {
             @Override
             public String getDescription() {
                 return "Скачивание файла с сервера";

src/_VisualDVM/Passes/All/ShowComponentChangesLog.java

@@ -1,7 +1,7 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
 import _VisualDVM.Repository.Component.Component;
 import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
@@ -12,7 +12,7 @@ import org.apache.commons.io.FileUtils;
 import java.io.File;
 import java.util.List;
 import java.util.Vector;
-public class ShowComponentChangesLog extends ComponentsRepositoryPass<Component> {
+public class ShowComponentChangesLog extends ComponentsRepositoryPass_OLD<Component> {
     File res;
     @Override
     public String getIconPath() {

src/_VisualDVM/Passes/All/SynchronizeBugReports.java

@@ -1,57 +1,43 @@
 package _VisualDVM.Passes.All;
 import Common.Utils.Utils_;
 import _VisualDVM.Global;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
+import _VisualDVM.Passes.Server.ClientPass;
+import _VisualDVM.Repository.Server.ComponentsServer;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Utils;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
-public class SynchronizeBugReports extends ComponentsRepositoryPass<Object> {
+public class SynchronizeBugReports extends ClientPass<ComponentsServer, Object> {
     File new_db_file;
     @Override
+    protected ComponentsServer getServer() {
+        return Global.componentsServer;
+    }
+    @Override
     public String getIconPath() {
         return "/icons/ComponentsActual.png";
     }
     @Override
-    public String getButtonText() {
-        return "";
-    }
-    @Override
     protected boolean canStart(Object... args) throws Exception {
-        return Global.mainModule.getAccount().CheckRegistered(Log);
+        return Global.mainModule.getAccount().CheckRegistered(Log) && SendRequest(ServerCode.ReceiveBugReportsDatabase);
     }
     @Override
     protected void showPreparation() throws Exception {
-        if (server.db.bugReports.getUI()!=null)
+        getServer().db.DropUI();
-            server.db.bugReports.getUI().SaveLastCurrent();
-        server.db.bugReports.ClearUI();
-        server.db.subscribers.ClearUI();
-        server.db.workspaces.ClearUI();
     }
     @Override
-    protected void ServerAction() throws Exception {
+    protected void body() throws Exception {
-        Command(new ServerExchangeUnit_2021(ServerCode.ReceiveBugReportsDatabase));
+        request.server_response.Unpack(new_db_file = Utils.getTempFileName("bdb"));
-        server_response.Unpack(new_db_file = Utils.getTempFileName("bdb"));
     }
     @Override
     protected void performDone() throws Exception {
         super.performDone();
-        server.db.Disconnect();
+        getServer().db.ReplaceFileAndReconnect(new_db_file);
-        Utils_.forceDeleteWithCheck(server.db.getFile());
-        FileUtils.moveFile(new_db_file, server.db.getFile());
-        server.db.Connect();
-        server.db.prepareTablesStatements();
-        server.db.Synchronize();
     }
     @Override
     protected void showDone() throws Exception {
-        if (Global.mainModule.getUI().hasMainWindow()) {
+        if (Global.mainModule.getUI().hasMainWindow())
-            Global.mainModule.getUI().getMainWindow().getCallbackWindow().ShowBugReports();
+            getServer().db.ResetUI();
-            server.db.bugReports.getUI().RestoreLastCurrent();
-            server.db.subscribers.getUI().RestoreLastCurrent();
-            server.db.workspaces.getUI().RestoreLastCurrent();
-        }
     }
 }

src/_VisualDVM/Passes/All/UpdateBugReportField.java

@@ -3,13 +3,11 @@ import Common.Utils.Utils_;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ClientPass;
-import _VisualDVM.Passes.Server.ComponentsRepositoryPass;
 import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.BugReport.BugReportState;
 import _VisualDVM.Repository.EmailMessage;
 import _VisualDVM.Repository.Server.ComponentsServer;
 import _VisualDVM.Repository.Server.ServerCode;
-import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
 import _VisualDVM.Utils;
 import javafx.util.Pair;
 

src/_VisualDVM/Passes/Server/ComponentsRepositoryPass_OLD.java

@@ -1,8 +1,8 @@
 package _VisualDVM.Passes.Server;
 import _VisualDVM.Global;
 import _VisualDVM.Repository.Server.ComponentsServer;
-public abstract class ComponentsRepositoryPass<T> extends RepositoryPass<ComponentsServer, T> {
+public abstract class ComponentsRepositoryPass_OLD<T> extends RepositoryPass<ComponentsServer, T> {
-    public ComponentsRepositoryPass() {
+    public ComponentsRepositoryPass_OLD() {
         super(Global.componentsServer);
     }
 }

src/_VisualDVM/Repository/BugReportsDatabase.java

@@ -1,6 +1,5 @@
 package _VisualDVM.Repository;
 import Common.Database.SQLITE.SQLiteDatabase;
-import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Repository.BugReport.BugReport;
 import _VisualDVM.Repository.BugReport.BugReportsDBTable;
@@ -35,4 +34,14 @@ public class BugReportsDatabase extends SQLiteDatabase {
         for (BugReport draft : drafts)
             Delete(draft);
     }
+    public void DropUI() {
+        SaveLastSelections();
+        bugReports.ClearUI();
+        subscribers.ClearUI();
+        workspaces.ClearUI();
+    }
+    public void ResetUI() {
+        bugReports.ShowUI();
+        RestoreLastSelections();
+    }
 }

src/_VisualDVM/Repository/Server/ServerCode.java

@@ -54,9 +54,6 @@ public enum ServerCode {
     //--
     CheckURLRegistered,
     DVMConvertProject,
-    SetRole,
-    Patch,
-    EmailSapforAssembly,
     //-
     DeleteObjectByPK,
     //-
@@ -71,7 +68,7 @@ public enum ServerCode {
     ActualizeSAPFORPackages,
     ActualizeDVMPackages,
     GetFirstActiveDVMPackage,
-    DVMPackageNeedsKill,  // не доделано.
+    DVMPackageNeedsKill,
     UpdateActiveDVMPackages,
     GetFirstActiveSapforPackages,
     SapforPackageNeedsKill,
@@ -90,25 +87,24 @@ public enum ServerCode {
     StartNecessaryMachines,
     GetSapforForCompilation,
     GetMaxSapforVersion,
-    PerformAutoSapforTesting,
+    PerformAutoSapforTesting;
-    Email_new;
 
     public String getDescription(){
         switch (this){
             case GetComponentsVersionsInfo:
-                return "Получить версии компонент";
+                return "Получение версий компонент c сервера";
             case UpdateComponent:
-                return "Опубликовать компонент";
+                return "Публикация компонента на сервере";
-            case UpdateComponentMinimalVersion:
-                return "Поднять минимальную версию компонента";
             case PublishObject:
-                return "Публикация объекта";
+                return "Публикация объекта на сервере";
             case SendBugReport:
-                return "Отправка отчета об ошибке";
+                return "Отправка отчета об ошибке на сервер";
-            case UpdateBugReportField:
-                return "Обновить поле отчета об ошибке";
             case AppendBugReportTextField:
-                return "Дополнить описание или комментария отчета об ошибке";
+                return "Дополнение описание или комментария отчета об ошибке на сервере";
+            case ReceiveBugReportsDatabase:
+                return "Скачивание базы данных отчетов об ошибках с сервера";
+            case ReceiveTestsDatabase:
+                return "Скачивание базы тестирования с сервера";
             default:
                 return this.toString();
         }