M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
02090095
2024-09-27 22:50:47 +03:00
parent 30b51180c4
commit 4547fd10bd
27 changed files with 777 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Visual_DVM_2021/Passes/All/DeleteSapforSettings.java Normal file
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);
}
}

10
src/Visual_DVM_2021/Passes/All/DeleteSapforSettingsCommand.java Normal file
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);
}
}

11
src/Visual_DVM_2021/Passes/All/EditSapforSettings.java Normal file
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);
}
}

11
src/Visual_DVM_2021/Passes/All/EditSapforSettingsCommand.java Normal file
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);
}
}

11
src/Visual_DVM_2021/Passes/All/PublishSapforSettings.java Normal file
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);
}
}

21
src/Visual_DVM_2021/Passes/All/PublishSapforSettingsCommand.java Normal file
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);
}
}

2
src/Visual_DVM_2021/Passes/All/SynchronizeTests.java
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();
}

20
src/Visual_DVM_2021/Passes/PassCode_2021.java
View File

@@ -346,13 +346,31 @@ public enum PassCode_2021 {
SaveCurrentSAPFORConfiguration,
StartSelectedSAPFORConfigurations,
CloneCurrentDVMConfiguration,
CloneCurrentDVMConfiguration, //?
PublishSapforSettings,
EditSapforSettings,
DeleteSapforSettings,
PublishSapforSettingsCommand,
EditSapforSettingsCommand,
DeleteSapforSettingsCommand
;
//--
public String getDescription() {
switch (this) {
case Undefined:
return "?";
case PublishSapforSettingsCommand:
return "Опубликовать команду настроек SAPFOR";
case EditSapforSettingsCommand:
return "Редактировать команду настроек SAPFOR";
case DeleteSapforSettingsCommand:
return "Удалить команду настроек SAPFOR";
case PublishSapforSettings:
return "Опубликовать настройки SAPFOR";
case EditSapforSettings:
return "Редактировать настройки SAPFOR";
case DeleteSapforSettings:
return "Удалить настройки SAPFOR";
case CloneCurrentDVMConfiguration:
return "Дублировать текущую конфигурацию тестирования DVM системы";
case StartSelectedSAPFORConfigurations:

83
src/Visual_DVM_2021/UI/Main/TestingForm.form
View File

@@ -327,24 +327,22 @@
<properties/>
<border type="none"/>
<children>
<splitpane id="7df69" binding="SC59">
<splitpane id="a599d" binding="SC83">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="328"/>
<dividerLocation value="300"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children>
<grid id="53e04" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="aacb9" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties>
<minimumSize width="300" height="100"/>
</properties>
<properties/>
<border type="none"/>
<children>
<grid id="fbd57" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="ded37" binding="sapforSettingsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
@@ -352,16 +350,14 @@
</grid>
</children>
</grid>
<grid id="71fcb" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="e3fd8" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties>
<minimumSize width="300" height="0"/>
</properties>
<properties/>
<border type="none"/>
<children>
<grid id="a3fa0" binding="sapforConfigurationCommandsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="b5055" binding="sapforSettingsCommandsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
@@ -384,12 +380,67 @@
<properties/>
<border type="none"/>
<children>
<grid id="63cbc" binding="sapforPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<splitpane id="df761" binding="SC80">
<constraints border-constraint="Center"/>
<properties/>
<properties>
<dividerLocation value="150"/>
<dividerSize value="3"/>
<orientation value="0"/>
</properties>
<border type="none"/>
<children/>
</grid>
<children>
<grid id="30c24" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<splitpane id="c70f1" binding="SC81">
<constraints border-constraint="Center"/>
<properties>
<dividerLocation value="500"/>
<dividerSize value="3"/>
</properties>
<border type="none"/>
<children>
<grid id="2f93b" binding="sapforConfigurationsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="left"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
<grid id="3f00d" binding="sapforConfigurationCommandsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</splitpane>
</children>
</grid>
<grid id="1ee44" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<splitpane position="right"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<grid id="fd73e" binding="sapforPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
</children>
</splitpane>
</children>
</grid>
</children>

9
src/Visual_DVM_2021/UI/Main/TestingForm.java
View File

@@ -29,12 +29,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public JSplitPane SC64;
public JSplitPane SC70;
public JSplitPane SC63;
public JSplitPane SC59;
public JSplitPane SC71;
public JSplitPane SC72;
public JSplitPane SC74;
public JSplitPane SC18;
public JSplitPane SC19;
public JSplitPane SC80;
public JSplitPane SC81;
public JSplitPane SC83;
//---
private JTabbedPane testingTabs;
private JPanel dvmPackagesTab;
@@ -60,6 +62,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JPanel machinesPanel;
private JPanel usersPanel;
private JPanel credentialsPanel;
private JPanel sapforSettingsPanel;
private JPanel sapforSettingsCommandsPanel;
private JPanel testsRunTasksBackground;
private JCheckBox filterFinished;
private JButton bTest;
@@ -133,6 +137,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
Global.testingServer.db.sapforPackages.mountUI(sapforPackagesPanel);
Global.testingServer.db.sapforSettings.mountUI(sapforSettingsPanel);
Global.testingServer.db.sapforSettingsCommands.mountUI(sapforSettingsCommandsPanel);
//--
if (Global.properties.collapseCredentials)
CollapseCredentials();
@@ -148,6 +154,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.db.serverSapfors.ShowUI();
Global.testingServer.db.sapforConfigurations.ShowUI();
Global.testingServer.db.dvmRunTasks.ShowUI();
Global.testingServer.db.sapforSettings.ShowUI();
//---
RestoreLastCredentials();
//---

11
src/Visual_DVM_2021/UI/Main/buffer_.form
View File

@@ -6,15 +6,6 @@
</constraints>
<properties/>
<border type="none"/>
<children>
<toolbar id="1582f">
<constraints border-constraint="North"/>
<properties>
<orientation value="1"/>
</properties>
<border type="none"/>
<children/>
</toolbar>
</children>
<children/>
</grid>
</form>