продолжение рефакторинга клиентских проходов.
This commit is contained in:
@@ -2,10 +2,11 @@ package _VisualDVM.Passes.All;
|
||||
import Common.Utils.Utils_;
|
||||
import Common.Visual.Controls.PassButton;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Passes.Server.TestingSystemPass;
|
||||
import _VisualDVM.Passes.Server.ClientPass;
|
||||
import _VisualDVM.Repository.Server.ServerCode;
|
||||
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
|
||||
import _VisualDVM.ServerObjectsCache.VisualCaches;
|
||||
import _VisualDVM.TestingSystem.Common.TestingServer;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMConfiguration.DVMConfiguration;
|
||||
import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
|
||||
import _VisualDVM.TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
|
||||
@@ -15,19 +16,19 @@ import org.apache.commons.io.FileUtils;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.io.File;
|
||||
public class SynchronizeTests extends TestingSystemPass<Object> {
|
||||
public class SynchronizeTests extends ClientPass<TestingServer,Object> {
|
||||
File new_db_file;
|
||||
@Override
|
||||
protected boolean canStart(Object... args) throws Exception {
|
||||
return Global.mainModule.getAccount().CheckRegistered(Log);
|
||||
return Global.mainModule.getAccount().CheckRegistered(Log)&&SendRequest(ServerCode.ReceiveTestsDatabase);
|
||||
}
|
||||
@Override
|
||||
public String getIconPath() {
|
||||
return "/icons/ComponentsActual.png";
|
||||
}
|
||||
@Override
|
||||
public String getButtonText() {
|
||||
return "";
|
||||
protected TestingServer getServer() {
|
||||
return Global.testingServer;
|
||||
}
|
||||
@Override
|
||||
public JButton createButton() {
|
||||
@@ -35,53 +36,21 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
|
||||
}
|
||||
@Override
|
||||
protected void showPreparation() throws Exception {
|
||||
server.db.SaveLastSelections();
|
||||
//--
|
||||
// server.db.machines _testing_system
|
||||
//--
|
||||
server.db.dvmConfigurations.ClearUI();
|
||||
server.db.groups.ClearUI();
|
||||
server.db.sapforConfigurations.ClearUI();
|
||||
server.db.serverSapfors.ClearUI();
|
||||
server.db.dvmPackages.ClearUI();
|
||||
server.db.sapforPackages.ClearUI();
|
||||
server.db.sapforSettings.ClearUI();
|
||||
server.db.dvmSettings.ClearUI();
|
||||
getServer().db.DropUI();
|
||||
}
|
||||
@Override
|
||||
protected void ServerAction() throws Exception {
|
||||
Command(new ServerExchangeUnit_2021(ServerCode.ReceiveTestsDatabase));
|
||||
server_response.Unpack(new_db_file = Utils.getTempFileName("tdb"));
|
||||
protected void body() throws Exception {
|
||||
request.server_response.Unpack(new_db_file = Utils.getTempFileName("tdb"));
|
||||
}
|
||||
@Override
|
||||
protected void performDone() throws Exception {
|
||||
super.performDone();
|
||||
server.db.Disconnect();
|
||||
Utils_.forceDeleteWithCheck(server.db.getFile());
|
||||
FileUtils.moveFile(new_db_file, server.db.getFile());
|
||||
server.db.Connect();
|
||||
server.db.prepareTablesStatements();
|
||||
server.db.Synchronize();
|
||||
getServer().db.ReplaceFileAndReconnect(new_db_file);
|
||||
}
|
||||
@Override
|
||||
protected void showDone() throws Exception {
|
||||
if (Global.mainModule.getUI().hasMainWindow()) {
|
||||
//--
|
||||
//--
|
||||
VisualCaches.ClearDataForClass(DVMConfiguration.class);
|
||||
VisualCaches.ClearDataForClass(SapforConfiguration.class);
|
||||
VisualCaches.ClearDataForClass(DVMPackage.class);
|
||||
VisualCaches.ClearDataForClass(SapforPackage.class);
|
||||
//server.db.machines
|
||||
server.db.dvmConfigurations.ShowUI();
|
||||
server.db.groups.ShowUI();
|
||||
server.db.sapforConfigurations.ShowUI();
|
||||
server.db.serverSapfors.ShowUI();
|
||||
server.db.dvmPackages.ShowUI();
|
||||
server.db.sapforPackages.ShowUI();
|
||||
server.db.sapforSettings.ShowUI();
|
||||
server.db.dvmSettings.ShowUI();
|
||||
server.db.RestoreLastSelections(); //---- ? объединить с RestoreCredentials
|
||||
getServer().db.ResetUI();
|
||||
Global.mainModule.getUI().getMainWindow().ShowCheckedTestsCount();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,4 +43,7 @@ public abstract class ClientPass <S extends RepositoryServer,T> extends Pass<T>
|
||||
protected boolean SendRequest(ServerCode code_in,String arg_in, Serializable object_in){
|
||||
return SendRequest(code_in,arg_in, object_in, Global.properties.SocketTimeout);
|
||||
}
|
||||
protected boolean SendRequest(ServerCode code_in){
|
||||
return SendRequest(code_in, "", null);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,8 +21,8 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
|
||||
protected ObjectInputStream in = null; // поток чтения из сокета
|
||||
protected ObjectOutputStream out = null; // поток записи в сокет
|
||||
//-
|
||||
protected ServerExchangeUnit_2021 client_request;
|
||||
protected ServerExchangeUnit_2021 server_response;
|
||||
public ServerExchangeUnit_2021 client_request;
|
||||
public ServerExchangeUnit_2021 server_response;
|
||||
//-
|
||||
protected Socket clientSocket = null; //сокет для общения
|
||||
protected ServerCode ExitCode = ServerCode.Undefined;
|
||||
|
||||
Reference in New Issue
Block a user