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

отображение машины и ползователя на вкладке тестирования.

Browse Source
This commit is contained in:
02090095
2023-12-11 18:29:15 +03:00
parent cb74d629b7
commit 12e963ca1b
20 changed files with 208 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/Visual_DVM_2021/Passes/All/AddDVMPackage.java Normal file
View File

@@ -0,0 +1,63 @@
package Visual_DVM_2021.Passes.All;
import Common.Current;
import Common.Database.Database;
import Common.Global;
import GlobalData.Compiler.CompilerType;
import GlobalData.Machine.MachineType;
import GlobalData.User.UserState;
import TestingSystem.DVM.DVMPackage.DVMPackage;
import TestingSystem.DVM.TasksPackage.TasksPackage;
import Visual_DVM_2021.Passes.AddObjectPass;
import Visual_DVM_2021.Passes.PassCode_2021;
import java.util.Date;
public class AddDVMPackage extends AddObjectPass<DVMPackage> {
public AddDVMPackage() {
super(DVMPackage.class);
}
@Override
protected Database getDb() {
return Global.testingServer.db;
}
@Override
protected boolean canStart(Object... args) throws Exception {
if (!Current.getAccount().CheckRegistered(Log)) {
return false;
}
if (Current.Check(Log, Current.Machine, Current.User, Current.Compiler)) {
if (!Current.getMachine().type.equals(MachineType.Server)) {
Log.Writeln_("Тестирование поддерживается только на одиночном удалённом сервере.");
return false;
}
if (!Current.getUser().state.equals(UserState.ready_to_work)) {
Log.Writeln_("Пользователь не готов к работе. Выполните инициализацию пользователя!");
return false;
}
if (!Current.getCompiler().type.equals(CompilerType.dvm)) {
Log.Writeln_("Тестирование поддерживается только для DVM компиляторов.");
return false;
}
if (!Current.getCompiler().versionLoaded)
passes.get(PassCode_2021.ShowCompilerVersion).Do(Current.getCompiler(), false);
//--
target = new DVMPackage();
//-
target.sender_name=Current.getAccount().name;
target.sender_address = Current.getAccount().email;
//-
target.machine_name = Current.getMachine().name;
target.machine_address = Current.getMachine().address;
target.machine_port = Current.getMachine().port;
//-
target.user_name = Current.getUser().login;
target.user_password = Current.getUser().password;
target.user_workspace = Current.getUser().workspace;
target.drv = Current.getCompiler().call_command;
target.version = Current.getCompiler().getVersionInfo();
target.kernels = Global.properties.TestingKernels;
//--
return true;
}
return false;
}
}

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

@@ -309,11 +309,15 @@ public enum PassCode_2021 {
ActualizeSAPFORPackages,
ActualizePackages,
//->
AddDVMPackage,
//->
TestPass;
public String getDescription() {
switch (this) {
case Undefined:
return "?";
case AddDVMPackage:
return "Добавить пакет тестирования DVM";
case ActualizePackages:
return "Обновить пакеты задач";
case ActualizeDVMPackages:

4
src/Visual_DVM_2021/UI/Main/MainForm.java
View File

@@ -229,6 +229,10 @@ public class MainForm extends Form implements MainWindow {
globalTabs.setSelectedIndex(1);
}
@Override
public void FocusCredentials() {
globalTabs.setSelectedIndex(2);
}
@Override
public void FocusTests() {
globalTabs.setSelectedIndex(3);
}

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

@@ -80,7 +80,7 @@
</properties>
<border type="none"/>
<children>
<grid id="b1fe2" binding="packagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="b1fe2" binding="dvmPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints border-constraint="Center"/>
<properties/>
<border type="none"/>

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

@@ -34,7 +34,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JButton bChangeKernels;
private JTextField filterName;
private JPanel configurationsPanel;
private JPanel packagesPanel;
private JPanel dvmPackagesPanel;
private JButton bCompilationFilter;
private JPanel dvmTestingPanel;
private JPanel sapforTestingPanel;
@@ -85,8 +85,10 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
SC66.setRightComponent(sapforVersionSlave.getContent());
//-
Global.testingServer.db.configurations.mountUI(configurationsPanel);
Global.testingServer.account_db.packages.mountUI(packagesPanel);
Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
Global.testingServer.db.dvmPackages.mountUI(dvmPackagesPanel);
// Global.testingServer.account_db.packages.mountUI(packagesPanel);
// Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
//--
Global.testingServer.db.sapforConfigurations.mountUI(sapforConfigurationsPanel);
Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
@@ -99,7 +101,8 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
@Override
public void ShowAll() {
Global.testingServer.db.configurations.ShowUI();
Global.testingServer.account_db.packages.ShowUI();
// Global.testingServer.account_db.packages.ShowUI();
Global.testingServer.db.dvmPackages.ShowUI();
//--
Global.testingServer.db.serverSapfors.ShowUI();
Global.testingServer.db.sapforConfigurations.ShowUI();
@@ -163,13 +166,13 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
}
@Override
public void RemountTestTable() {
UI.Clear(packagesPanel);
UI.Clear(dvmPackagesPanel);
UI.Clear(testsRunTasksPanel);
UI.Clear(sapforTasksPackagesPanel);
UI.Clear(sapforTasksPanel);
DropSapforComparison();
//-->>
Global.testingServer.account_db.packages.mountUI(packagesPanel);
Global.testingServer.account_db.packages.mountUI(dvmPackagesPanel);
Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);