no message

This commit is contained in:
2023-10-11 18:44:16 +03:00
parent 08e3c87b78
commit 52075bc64c
15 changed files with 71 additions and 674 deletions

View File

@@ -15,16 +15,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public JPanel getContent() {
return content;
}
public JSplitPane SC20;
public JSplitPane SC21;
public JSplitPane SC35;
public JSplitPane SC40;
public JSplitPane SC41;
public JSplitPane SC42;
public JSplitPane SC43;
public JSplitPane SC50;
public JSplitPane SC51;
public JSplitPane SC52;
public JSplitPane SC48;
public JSplitPane SC49;
public JSplitPane SC46;
@@ -36,42 +27,21 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public JSplitPane SC59;
//-
//---
private JPanel machinesPanel;
private JPanel usersPanel;
private JPanel compilersPanel;
private JTabbedPane testingTabs;
private JTabbedPane debugTabs;
private JPanel makefilesPanel;
private JPanel modulesPanel;
private JPanel runConfigurationsPanel;
private JToolBar environmentsTools;
private JPanel environmentsPanel;
private JToolBar parametersTools;
private JPanel dvmParametersPanel;
private JPanel groupsPanel;
private JPanel testsPanel;
private JPanel testsRunTasksPanel;
private JToolBar testsResultsTools;
private JButton bChangeKernels;
private JTextField filterName;
private JLabel testsMatchesLabel;
private JPanel configurationsPanel;
private JLabel configurationsMatchesLabel;
private JLabel packagesMatchesLabel;
private JPanel packagesPanel;
private JButton bCompilationFilter;
private JPanel dvmTestingPanel;
private JPanel projectDebugPanel;
private JPanel runTasksPanel;
private JPanel compilationTasksPanel;
private JPanel sapforTestingPanel;
private JPanel packageVersionsPanel;
private JPanel sapforConfigurationsPanel;
private JLabel sapforConfigurationsLabel;
private JLabel sapforConfigurationsCommandsLabel;
private JPanel sapforConfigurationCommandsPanel;
private JLabel sapforTasksPackagesLabel;
private JLabel sapforTasksLabel;
private JPanel sapforScenariosPanel;
private JPanel serverSapforsPanel;
private JPanel sapforTasksPackagesPanel;
@@ -82,8 +52,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
private JToolBar compilationTasksTools;
private JToolBar runTasksTools;
//-
public RunTasksComparisonForm singleRunTaskMaster; // одиночные запуски
public RunTasksComparisonForm singleRunTaskSlave;
//
public CompilationTasksComparisonForm singleCompilationTaskMaster; // одиночная компиляция
public CompilationTasksComparisonForm singleCompilationTaskSlave;
@@ -99,30 +67,12 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
public TestingForm() {
LoadSplitters();
//-
singleCompilationTaskMaster = new CompilationTasksComparisonForm(singleCompilationTaskSlave = new CompilationTasksComparisonForm(null));
singleRunTaskMaster = new RunTasksComparisonForm(singleRunTaskSlave = new RunTasksComparisonForm(null));
dvmTestingRunMaster = new TestRunTasksComparisonForm(dvmTestingRunSlave = new TestRunTasksComparisonForm(null));
//-
Global.db.makefiles.mountUI(makefilesPanel);
//-----------------------------------------------
Global.db.modules.mountUI(modulesPanel);
Global.db.runConfigurations.mountUI(runConfigurationsPanel);
Global.db.environmentValues.mountUI(environmentsPanel);
Global.db.dvmParameters.mountUI(dvmParametersPanel);
//-
Global.db.compilationTasks.mountUI(compilationTasksPanel);
Global.db.runTasks.mountUI(runTasksPanel);
//--->>>
RefreshTabsNames();
//-
SC41.setLeftComponent(singleCompilationTaskMaster.getContent());
SC41.setRightComponent(singleCompilationTaskSlave.getContent());
SC43.setLeftComponent(singleRunTaskMaster.getContent());
SC43.setRightComponent(singleRunTaskSlave.getContent());
//-
SC50.setLeftComponent(dvmTestingRunMaster.getContent());
SC50.setRightComponent(dvmTestingRunSlave.getContent());
ShowNoProject();
//-
Global.testingServer.db.configurations.mountUI(configurationsPanel);
Global.testingServer.account_db.packages.mountUI(packagesPanel);
@@ -132,25 +82,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.db.sapforConfigurationCommands.mountUI(sapforConfigurationCommandsPanel);
Global.testingServer.db.serverSapfors.mountUI(serverSapforsPanel);
Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
// Global.testingServer.account_db.sapforTasks.mountUI(sapforTasksPanel);
//--------------------------------------------------------------------->>>>
/*
filterName.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
TestRunTaskInterface.filterName = filterName.getText();
Global.testingServer.account_db.testRunTasks.ShowUI();
}
@Override
public void removeUpdate(DocumentEvent e) {
TestRunTaskInterface.filterName = filterName.getText();
Global.testingServer.account_db.testRunTasks.ShowUI();
}
@Override
public void changedUpdate(DocumentEvent e) {
}
});
*/
sapforTestingMaster = new SapforPackagesComparisonForm(sapforTestingSlave = new SapforPackagesComparisonForm(null));
SC57.setLeftComponent(sapforTestingMaster.getContent());
SC57.setRightComponent(sapforTestingSlave.getContent());
@@ -159,22 +91,14 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
@Override
public void ShowAll() {
Global.testingServer.db.configurations.ShowUI();
Global.testingServer.account_db.packages.ShowUI();
//--
Global.testingServer.db.serverSapfors.ShowUI();
Global.testingServer.db.sapforConfigurations.ShowUI();
//----
Global.testingServer.account_db.packages.ShowUI();
Global.testingServer.account_db.sapforTasksPackages.ShowUI();
}
//-
@Override
public void ShowProjectMaxCompilationTime() {
// mCompilationMaxtime.setText(Current.getProject().compilation_maxtime + " сек.");
}
@Override
public void ShowProjectMaxRunTime() {
//mRunMaxtime.setText(Current.getProject().run_maxtime + " сек.");
}
@Override
public void ShowCurrentTestsPackage() {
ShowCurrentTestRunTask();
}
@@ -184,64 +108,6 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
dvmTestingRunSlave.RemoveObject();
}
@Override
public void DropRunTasksComparison() {
singleRunTaskMaster.RemoveObject();
singleRunTaskSlave.RemoveObject();
}
@Override
public void DropCompilationTasksComparison() {
singleCompilationTaskMaster.RemoveObject();
singleCompilationTaskSlave.RemoveObject();
}
@Override
public void ShowProject() {
testingTabs.setEnabledAt(0, true);
//-
ShowSession();
//-
Global.db.compilationTasks.ShowUI(); //их видимость зависит от текущего проекта.
Global.db.runTasks.ShowUI();
}
@Override
public void ShowNoProject() {
Global.db.compilationTasks.ClearUI();
Global.db.runTasks.ClearUI();
//-
if (testingTabs.getSelectedIndex() == 0)
testingTabs.setSelectedIndex(1);
testingTabs.setEnabledAt(0, false);
}
@Override
public void SaveSplitters() {
FormWithSplitters.super.SaveSplitters();
try {
Global.db.SaveCredentials();
} catch (Exception ex) {
Global.Log.PrintException(ex);
}
}
//-
@Override
public void ShowCurrentCompilationTask() {
// if (singleCompilationTaskMaster.isActive()) singleCompilationTaskMaster.ShowTask();
// else singleCompilationTaskSlave.ShowTask();
}
@Override
public void ShowNoCurrentCompilationTask() {
// if (singleCompilationTaskMaster.isActive()) singleCompilationTaskMaster.Clear();
// else singleCompilationTaskSlave.Clear();
}
@Override
public void ShowCurrentRunTask() {
// if (singleRunTaskMaster.isActive()) singleRunTaskMaster.ShowTask();
// else singleRunTaskSlave.ShowTask();
}
@Override
public void ShowNoCurrentRunTask() {
// if (singleRunTaskMaster.isActive()) singleRunTaskMaster.Clear();
// else singleRunTaskSlave.Clear();
}
@Override
public void ShowCurrentTestRunTask() {
// if (dvmTestingRunMaster.isActive()) dvmTestingRunMaster.ShowTask();
// else dvmTestingRunSlave.ShowTask();
@@ -284,77 +150,7 @@ public class TestingForm implements FormWithSplitters, TestingWindow {
Global.testingServer.account_db.testRunTasks.mountUI(testsRunTasksPanel);
Global.testingServer.account_db.sapforTasksPackages.mountUI(sapforTasksPackagesPanel);
}
@Override
public void setUserRights() {
// testingTabs.removeTabAt(2);
}
@Override
public void setAdminRights() {
/*
testingTabs.insertTab("DVM система",
Utils.getIcon("/icons/DVM.png"),
dvmTestingPanel,
"DVM система", 2);
*/
}
@Override
public void setDeveloperRights() {
/*
testingTabs.insertTab("DVM система",
Utils.getIcon("/icons/DVM.png"),
dvmTestingPanel,
"DVM система", 2);
*/
}
@Override
public void FocusScenarios() {
testingTabs.setSelectedIndex(3);
}
@Override
public void FocusSapforTasksPackages() {
}
@Override
public void ShowCurrentSapforTasksPackage() {
}
@Override
public void ShowNoSapforTasksPackage() {
UI.Clear(packageVersionsPanel);
}
//--->>>
/*
@Override
public void ShowCheckedTestsCount() {
int res = 0;
for (Group group : Global.testingServer.db.groups.getCheckedItems()) {
Vector<Test> selected_tests = new Vector<>();
Vector<Test> group_tests = new Vector<>();
for (Test test : Global.testingServer.db.tests.Data.values()) {
if (test.group_id.equals(group.id)) {
if (test.isSelected())
selected_tests.add(test);
else
group_tests.add(test);
}
}
//-
if (selected_tests.isEmpty())
res += group_tests.size();
else
res += selected_tests.size();
}
//--
testingTabs.setTitleAt(2, "Тесты: " + res);
}
*/
@Override
public void ShowLastCompilationTask() {
singleCompilationTaskMaster.ApplyObject();
}
@Override
public void ShowLastRunTask() {
singleRunTaskMaster.ApplyObject();
}
@Override
public void DropSapforTasksComparison() {
sapforTestingMaster.RemoveObject();