промежуточный. вариант с разбитием конфигурации сапфора и настройки как отдельный объект

This commit is contained in:
2024-09-27 22:50:47 +03:00
parent 30b51180c4
commit 4547fd10bd
27 changed files with 777 additions and 69 deletions

View File

@@ -0,0 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import Visual_DVM_2021.Passes.Server.DeleteServerObjects;
public class DeleteSapforSettings extends DeleteServerObjects<TestingServer, SapforSettings> {
public DeleteSapforSettings() {
super(Global.testingServer, SapforSettings.class);
}
}

View File

@@ -0,0 +1,10 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import Visual_DVM_2021.Passes.Server.DeleteServerObjects;
public class DeleteSapforSettingsCommand extends DeleteServerObjects<TestingServer, SapforSettingsCommand> {
public DeleteSapforSettingsCommand() {
super(Global.testingServer, SapforSettingsCommand.class);
}
}

View File

@@ -0,0 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfiguration.SapforConfiguration;
import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import Visual_DVM_2021.Passes.Server.EditServerObject;
public class EditSapforSettings extends EditServerObject<TestingServer, SapforSettings> {
public EditSapforSettings() {
super(Global.testingServer, SapforSettings.class);
}
}

View File

@@ -0,0 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import Visual_DVM_2021.Passes.Server.EditServerObject;
public class EditSapforSettingsCommand extends EditServerObject<TestingServer, SapforSettingsCommand> {
public EditSapforSettingsCommand() {
super(Global.testingServer,SapforSettingsCommand.class);
}
}

View File

@@ -0,0 +1,11 @@
package Visual_DVM_2021.Passes.All;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforSettings.SapforSettings;
import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public class PublishSapforSettings extends PublishServerObject<TestingServer, SapforSettings> {
public PublishSapforSettings() {
super(Global.testingServer, SapforSettings.class);
}
}

View File

@@ -0,0 +1,21 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Global;
import TestingSystem.Common.TestingServer;
import TestingSystem.SAPFOR.SapforConfigurationCommand.SapforConfigurationCommand;
import TestingSystem.SAPFOR.SapforSettingsCommand.SapforSettingsCommand;
import Visual_DVM_2021.Passes.Server.PublishServerObject;
public class PublishSapforSettingsCommand extends PublishServerObject<TestingServer, SapforSettingsCommand> {
public PublishSapforSettingsCommand() {
super(Global.testingServer, SapforSettingsCommand.class);
}
@Override
public boolean fillObjectFields() throws Exception {
target.sapforsettings_id = Current.getSapforSettings().id;
return super.fillObjectFields();
}
@Override
protected boolean canStart(Object... args) throws Exception {
return Current.Check(Log, Current.SapforSettings)&&super.canStart(args);
}
}

View File

@@ -40,6 +40,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
server.db.serverSapfors.ClearUI();
server.db.dvmPackages.ClearUI();
server.db.sapforPackages.ClearUI();
server.db.sapforSettings.ClearUI();
}
@Override
protected void ServerAction() throws Exception {
@@ -66,6 +67,7 @@ public class SynchronizeTests extends TestingSystemPass<Object> {
server.db.serverSapfors.ShowUI();
server.db.dvmPackages.ShowUI();
server.db.sapforPackages.ShowUI();
server.db.sapforSettings.ShowUI();
server.db.RestoreLastSelections(); //---- ? объединить с RestoreCredentials
UI.getMainWindow().ShowCheckedTestsCount();
}